tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-10-22 08:05:56 +02:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/3.1' into 3

Browse Source 
Conflicts:
	code/reports/Report.php
This commit is contained in:
Damian Mooyman 2015-02-20 10:16:37 +13:00
commit 21e2bc7258
6 changed files with 238 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
code/controllers/CMSMain.php
View File

@ -227,13 +227,22 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
return $link;
}
/**
* @return string
*/
public function LinkPreview() {
$record = $this->getRecord($this->currentPageID());
$baseLink = ($record && $record instanceof Page) ? $record->Link('?stage=Stage') : Director::absoluteBaseURL();
$baseLink = Director::absoluteBaseURL();
if ($record && $record instanceof Page) {
// if we are an external redirector don't show a link
if ($record instanceof RedirectorPage && $record->RedirectionType == 'External') {
$baseLink = false;
}
else {
$baseLink = $record->Link('?stage=Stage');
}
}
return $baseLink;
}

2
code/model/VirtualPage.php
View File

@ -198,7 +198,7 @@ class VirtualPage extends Page {
'VirtualPage.HEADERWITHLINK',
"This is a virtual page copying content from \"{title}\" ({link})",
array(
'title' => $this->CopyContentFrom()->Title,
'title' => $this->CopyContentFrom()->obj('Title'),
'link' => $link
)
);

45
javascript/lang/id.js Normal file
View File

@ -0,0 +1,45 @@
// This file was generated by GenerateJavaScriptI18nTask from javascript/lang/src/id.js.
// See https://github.com/silverstripe/silverstripe-buildtools for details
if(typeof(ss) == 'undefined' || typeof(ss.i18n) == 'undefined') {
if(typeof(console) != 'undefined') console.error('Class ss.i18n not defined');
} else {
ss.i18n.addDictionary('id', {
"CMSMAIN.WARNINGSAVEPAGESBEFOREADDING": "You have to save a page before adding children underneath it",
"CMSMAIN.CANTADDCHILDREN": "You can't add children to the selected node",
"CMSMAIN.ERRORADDINGPAGE": "Error adding page",
"CMSMAIN.FILTEREDTREE": "Filtered tree to only show changed pages",
"CMSMAIN.ERRORFILTERPAGES": "Could not filter tree to only show changed pages<br />%s",
"CMSMAIN.ERRORUNFILTER": "Unfiltered tree",
"CMSMAIN.PUBLISHINGPAGES": "Publishing pages...",
"CMSMAIN.SELECTONEPAGE": "Mohon pilih minimal 1 halaman.",
"CMSMAIN.ERRORPUBLISHING": "Error publishing pages",
"CMSMAIN.REALLYDELETEPAGES": "Do you really want to delete the %s marked pages?",
"CMSMAIN.DELETINGPAGES": "Sedang menghapus halaman...",
"CMSMAIN.ERRORDELETINGPAGES": "Error deleting pages",
"CMSMAIN.PUBLISHING": "Publishing...",
"CMSMAIN.RESTORING": "Sedang pemulihan",
"CMSMAIN.ERRORREVERTING": "Error reverting to live content",
"CMSMAIN.SAVING": "Sedang menyimpan...",
"CMSMAIN.SELECTMOREPAGES": "You have %s pages selected.\n\nDo you really want to perform this action?",
"CMSMAIN.ALERTCLASSNAME": "The page type will be updated after the page is saved",
"CMSMAIN.URLSEGMENTVALIDATION": "URLs can only be made up of letters, digits and hyphens.",
"AssetAdmin.BATCHACTIONSDELETECONFIRM": "Apakah kamu yakin akan menghapus %s map?",
"AssetTableField.REALLYDELETE": "Do you really want to delete the marked files?",
"AssetTableField.MOVING": "Memindahkan %s berkas(s)",
"CMSMAIN.AddSearchCriteria": "Tambah kriteria",
"WidgetAreaEditor.TOOMANY": "Sorry, you have reached the maximum number of widgets in this area",
"AssetAdmin.ConfirmDelete": "Do you really want to delete this folder and all contained files?",
"Folder.Name": "Nama map",
"Tree.AddSubPage": "Tambah halaman baru di sini",
"Tree.Duplicate": "Duplikasi",
"Tree.EditPage": "Ubah",
"Tree.ThisPageOnly": "Hanya halaman ini",
"Tree.ThisPageAndSubpages": "This page and subpages",
"Tree.ShowAsList": "Show children as list",
"CMSMain.ConfirmRestoreFromLive": "Do you really want to copy the published content to the draft site?",
"CMSMain.RollbackToVersion": "Do you really want to roll back to version #%s of this page?",
"URLSEGMENT.Edit": "Ubah",
"URLSEGMENT.OK": "Oke",
"URLSEGMENT.Cancel": "Batal"
});
}

39
javascript/lang/src/id.js Normal file
View File

@ -0,0 +1,39 @@
{
"CMSMAIN.WARNINGSAVEPAGESBEFOREADDING": "You have to save a page before adding children underneath it",
"CMSMAIN.CANTADDCHILDREN": "You can't add children to the selected node",
"CMSMAIN.ERRORADDINGPAGE": "Error adding page",
"CMSMAIN.FILTEREDTREE": "Filtered tree to only show changed pages",
"CMSMAIN.ERRORFILTERPAGES": "Could not filter tree to only show changed pages<br />%s",
"CMSMAIN.ERRORUNFILTER": "Unfiltered tree",
"CMSMAIN.PUBLISHINGPAGES": "Publishing pages...",
"CMSMAIN.SELECTONEPAGE": "Mohon pilih minimal 1 halaman.",
"CMSMAIN.ERRORPUBLISHING": "Error publishing pages",
"CMSMAIN.REALLYDELETEPAGES": "Do you really want to delete the %s marked pages?",
"CMSMAIN.DELETINGPAGES": "Sedang menghapus halaman...",
"CMSMAIN.ERRORDELETINGPAGES": "Error deleting pages",
"CMSMAIN.PUBLISHING": "Publishing...",
"CMSMAIN.RESTORING": "Sedang pemulihan",
"CMSMAIN.ERRORREVERTING": "Error reverting to live content",
"CMSMAIN.SAVING": "Sedang menyimpan...",
"CMSMAIN.SELECTMOREPAGES": "You have %s pages selected.\n\nDo you really want to perform this action?",
"CMSMAIN.ALERTCLASSNAME": "The page type will be updated after the page is saved",
"CMSMAIN.URLSEGMENTVALIDATION": "URLs can only be made up of letters, digits and hyphens.",
"AssetAdmin.BATCHACTIONSDELETECONFIRM": "Apakah kamu yakin akan menghapus %s map?",
"AssetTableField.REALLYDELETE": "Do you really want to delete the marked files?",
"AssetTableField.MOVING": "Memindahkan %s berkas(s)",
"CMSMAIN.AddSearchCriteria": "Tambah kriteria",
"WidgetAreaEditor.TOOMANY": "Sorry, you have reached the maximum number of widgets in this area",
"AssetAdmin.ConfirmDelete": "Do you really want to delete this folder and all contained files?",
"Folder.Name": "Nama map",
"Tree.AddSubPage": "Tambah halaman baru di sini",
"Tree.Duplicate": "Duplikasi",
"Tree.EditPage": "Ubah",
"Tree.ThisPageOnly": "Hanya halaman ini",
"Tree.ThisPageAndSubpages": "This page and subpages",
"Tree.ShowAsList": "Show children as list",
"CMSMain.ConfirmRestoreFromLive": "Do you really want to copy the published content to the draft site?",
"CMSMain.RollbackToVersion": "Do you really want to roll back to version #%s of this page?",
"URLSEGMENT.Edit": "Ubah",
"URLSEGMENT.OK": "Oke",
"URLSEGMENT.Cancel": "Batal"
}

135
lang/id.yml
View File

@ -1,9 +1,116 @@
id:
AssetAdmin:
ADDFILES: 'Tambah Berkas'
ActionAdd: 'Tambah map'
AppCategoryArchive: Arsip
AppCategoryAudio: Suara
AppCategoryDocument: Dokumen
AppCategoryFlash: Flash
AppCategoryImage: Gambar
AppCategoryVideo: Video
BackToFolder: 'Kembali ke map'
CREATED: Tanggal
CurrentFolderOnly: 'Batas pada map sekarang?'
DetailsView: Perincian
FILES: Berkas-berkas
FROMTHEINTERNET: 'Dari internet'
FROMYOURCOMPUTER: 'Dari komputer kamu'
Filetype: 'Jenis berkas'
ListView: 'Tampilan daftar'
NEWFOLDER: Map baru
SIZE: Ukuran
TreeView: 'Tampilan menurun'
MENUTITLE: Berkas-berkas
AssetAdmin_DeleteBatchAction:
TITLE: 'Hapus map'
AssetAdmin_Tools:
FILTER: Saring
AssetAdmin_left_ss:
GO: Lanjut
BackLink_Button_ss:
Back: Kembali
BrokenLinksReport:
Any: Lain
BROKENLINKS: 'Laporan tautan rusak'
CheckSite: 'Cek situs'
CheckSiteDropdownDraft: 'Draf situs'
CheckSiteDropdownPublished: 'Publikasi situs'
ColumnDateLastModified: 'Tanggal terakhir modifikasi'
ColumnDateLastPublished: 'Tanggal terakhir terbit'
ColumnProblemType: 'Jenis masalah'
ColumnURL: URL
HoverTitleEditPage: 'Edit halaman '
PageName: 'Nama halaman'
ReasonDropdown: 'Masalah yang diperiksa'
ReasonDropdownBROKENFILE: 'Berkas rusak'
ReasonDropdownBROKENLINK: 'Tautan rusak'
CMSAddPageController:
Title: 'Tambah halaman'
CMSBatchActions:
DELETE_DRAFT_PAGES: 'Hapus dari draf situs'
DELETE_PAGES: 'Hapus dari publikasi situs'
PUBLISHED_PAGES: 'Menerbitkan %d halaman, %d gagal'
PUBLISH_PAGES: Terbitkan
UNPUBLISH_PAGES: Tidak terbit
CMSMain:
AddNew: 'Tambah halaman baru'
AddNewButton: 'Tambah baru'
Cancel: Batal
ChoosePageType: 'Pilih jenis halaman'
Create: Buat
DELETE: 'Hapus dari situs draft'
DELETEFP: Hapus dari situs yang telah diterbitkan
EMAIL: Surel
NEWPAGE: 'Baru {pagetype}'
PAGENOTEXISTS: 'Halaman tidak ada'
PAGES: Halaman
PAGETYPEANYOPT: Lain
PAGETYPEOPT: 'Jenis Halaman'
PUBPAGES: 'Selesai: Diterbitkan {count} halaman'
PageAdded: 'Berhasil buat halaman'
REMOVED: 'Dihapus ''{title}''{description} dari situs langsung'
REMOVEDPAGE: 'Menghapus ''{title}'' dari terbitan situs '
REMOVEDPAGEFROMDRAFT: 'Menghapus ''%s'' dari draf situs'
RESTORE: Pulihkan
RESTORED: 'Pemulihan ''{title}'' sukses'
ROLLBACK: 'Kembali ke versi ini'
SAVE: Simpan
SAVEDRAFT: 'Simpan draf'
TabContent: Konten
TabHistory: Sejarah
TabSettings: Pengaturan
TreeFilteredClear: 'Bersihkan saring'
CMSPageHistoryController_versions_ss:
PUBLISHER: Penerbit
UNKNOWN: Tidak diketahui
WHEN: Ketika
CMSPagesController:
GalleryView: 'Tampilan Galeri'
ListView: 'Tampilan daftar'
MENUTITLE: Halaman
CMSPagesController_Tools_ss:
FILTER: Saring
CMSSearch:
FILTERDATEFROM: Dari
FILTERDATEHEADING: Tanggal
FILTERDATETO: Ke
FILTERLABELTEXT: Isi
CMSSiteTreeFilter_ChangedPages:
Title: 'Perubahan halaman'
CMSSiteTreeFilter_Search:
Title: 'Semua halaman'
ContentController:
CMS: CMS
DRAFT: Draf
DRAFTSITE: 'Draf situs'
Email: Surel
INSTALL_SUCCESS: 'Pemasangan sukses'
InstallFilesDeleted: 'Berkas pemasangan telah berhasil dihapus'
InstallSuccessCongratulations: 'SilverStripe telah sukses dipasang!'
LOGGEDINAS: 'Masuk sebagai'
LOGIN: Masuk
LOGOUT: 'Keluar'
NOTLOGGEDIN: 'Tidak masuk'
ErrorPage:
400: '400 - Permintaan buruk'
401: '401 - Tidak ada otorisasi'
@ -30,10 +137,16 @@ id:
CODE: 'Kode yang salah'
DEFAULTERRORPAGECONTENT: '<p>Maaf, sepertinya anda berusha mengakses halaman yang tidak ada.</p><p>Mohon periksa ejaan URL yang ingin anda akses dan coba lagi.</p>'
DEFAULTERRORPAGETITLE: 'Halaman tidak ditemukan'
DEFAULTSERVERERRORPAGETITLE: 'Server mengalami kesalahan'
Folder:
AddFolderButton: 'Tambah map'
DELETEUNUSEDTHUMBNAILS: 'Hapus thumbnail-thumbnail yang tidal dipakai'
UNUSEDFILESTITLE: 'File-file yang tidak dipakai'
UNUSEDTHUMBNAILSTITLE: 'Thumbnail-thumbnail yang tidak dipakai'
LeftAndMain:
DELETED: Hapus
SAVEDUP: Disimpan
SearchResults: 'Hasil pencarian'
RedirectorPage:
HASBEENSETUP: 'halaman yang mengirim user ke alamat lain dibuat tanpa tujuan dari pengiriman itu sendiri'
HEADER: 'Halaman ini akan mengarahkan user ke halaman lain'
@ -42,10 +155,17 @@ id:
REDIRECTTOEXTERNAL: 'Situs web yang lain'
REDIRECTTOPAGE: 'Sebuah halaman pada situs web Anda'
YOURPAGE: 'Halaman pada situs web Anda'
ReportAdmin:
ReportTitle: Judul
MENUTITLE: Laporan
ReportAdminForm:
FILTERBY: 'Saring dengan'
SearchForm:
GO: Pergi
SEARCH: Cari
SearchResults: 'Hasil Pencarian'
SideReport:
ContentGroupTitle: 'Isi laporan'
SilverStripeNavigatorLinkl:
CloseLink: Tutup
SiteConfig:
@ -72,17 +192,22 @@ id:
DEFAULTCONTACTCONTENT: '<p>Anda dapat mengisi halaman ini dengan isi anda sendiri, atau hapus dan buat halaman-halaman anda sendiri.<br /></p>'
DEFAULTCONTACTTITLE: 'Hubungi Kami'
DEFAULTHOMECONTENT: '<p>Selamat datang di SilverStripe! Ini adalah homepage default anda. Anda dapat mengedit halaman ini dengan membuka <a href="admin/">CMS ini</a>. Sekarang anda dapat mengakses <a href="http://doc.silverstripe.com">dokumentasi developer</a>, atau memulai <a href="http://doc.silverstripe.com/doku.php?id=tutorials">tutorial-tutorial yang tersedia.</a></p>'
DELETEDPAGESHORT: Hapus
EDITANYONE: 'Siapa saja yang dapat masuk ke dalam CMS'
EDITHEADER: 'Siapa yang dapat mengedit ini dari dalam CMS?'
EDITONLYTHESE: 'Hanya orang ini saja (pilih dari daftar)'
EDITORGROUPS: 'Editor Grup'
HASBROKENLINKS: 'Halaman ini mempunyai link yang rusak'
HTMLEDITORTITLE: Konten
MENUTITLE: 'Label navigasi'
METADESC: 'Deskripsi'
MetadataToggle: Metadata
MoreOptions: 'Pilihan lain'
PAGELOCATION: 'Lokasi halaman'
PAGETITLE: 'Nama Halaman'
PAGETYPE: 'Tipe halaman'
PARENTTYPE: 'Lokasi halaman'
REORGANISE_DESCRIPTION: 'Ubah stuktur situs'
SHOWINMENUS: 'Perlihatkan dalam menu?'
SHOWINSEARCH: 'Perlihatkan dalam pencarian'
TABBEHAVIOUR: Perilaku
@ -94,3 +219,13 @@ id:
HEADER: 'Ini adalah halaman virtual'
PLURALNAME: 'Halaman-halaman Virtual'
SINGULARNAME: 'Halaman Virtual'
CMSFileAddController:
MENUTITLE: Berkas
CMSPageEditController:
MENUTITLE: 'Ubah halaman'
CMSPageSettingsController:
MENUTITLE: 'Ubah halaman'
CMSSettingsController:
MENUTITLE: Pengaturan
CMSSiteTreeFilter_StatusDeletedPages:
Title: 'Halaman yang dihapus'

14
lang/lt.yml
View File

@ -73,7 +73,7 @@ lt:
ACCESS: 'Priėjimas prie ''{title}'' dalies'
ACCESS_HELP: 'Leisti peržiūrėti svetainės medžio ir turinio skiltį. Peržiūros, bei redagavimo leidimai gali būti pakeisti per iškrentančius pasirinkimus ir per atskirus "Turinio leidimai".'
AddNew: 'Pridėti naują puslapį'
AddNewButton: 'Pridėti naują'
AddNewButton: 'Sukurti naują'
AddPageRestriction: 'Pastaba: kai kurie puslapių tipai šioje vietoje neleidžiami'
Cancel: Atšaukti
ChoosePageParentMode: 'Pasirinkite kur sukurti šį puslapį'
@ -114,7 +114,7 @@ lt:
TreeFilteredClear: 'Išvalyti filtrą'
MENUTITLE: 'Redaguoti puslapį'
CMSMain_left_ss:
APPLY_FILTER: 'Pritaikyti filtrą'
APPLY_FILTER: 'Vykdyti'
RESET: Atstatyti
CMSPageAddController:
ParentMode_child: 'Po kitu puslapiu'
@ -154,7 +154,7 @@ lt:
CMSSiteTreeFilter_ChangedPages:
Title: 'Pakeisti puslapiai'
CMSSiteTreeFilter_DeletedPages:
Title: 'Visus puslapius, kartu su ištrintais'
Title: 'Visi puslapiai (ir ištrinti)'
CMSSiteTreeFilter_Search:
Title: 'Visi puslapiai'
ContentControl:
@ -351,15 +351,15 @@ lt:
PAGELOCATION: 'Puslapio vieta'
PAGETITLE: 'Puslapio pavadinimas'
PAGETYPE: 'Puslapio tipas'
PARENTID: 'Tėvinis puslapis'
PARENTID: 'Po puslapiu'
PARENTTYPE: 'Puslapio vieta'
PARENTTYPE_ROOT: 'Aukščiausio lygio puslapis'
PARENTTYPE_SUBPAGE: 'Puslapis po tėviniu puslapiu'
PARENTTYPE_SUBPAGE: 'Po kitu puslapiu'
PERMISSION_GRANTACCESS_DESCRIPTION: 'Valdyti turinio redagavimo teises'
PERMISSION_GRANTACCESS_HELP: 'Leisti nustatyti puslapiui galiojančias specifines teises, "Puslapiai" skiltyje.'
PLURALNAME: Puslapiai
PageTypNotAllowedOnRoot: 'Puslapio tipas "{type}" neleidžiamas šakniniame lygmenyje'
PageTypeNotAllowed: 'Puslapio tipas "{type}" neleidžiamas tėviniame puslapyje'
PageTypeNotAllowed: 'Puslapio tipas "{type}" neleidžiamas po pasirinktu puslapiu'
REMOVEDFROMDRAFTHELP: 'Puslapis buvo publikuotas, tačiau buvo ištrintas iš juodraščių.'
REMOVEDFROMDRAFTSHORT: 'Pašalinta iš juodraščių'
REMOVE_INSTALL_WARNING: 'Perspėjimas: Saugumo sumetimais Jūs turėtumėte pašalinti install.php bylą iš SilverStripe.'
@ -381,7 +381,7 @@ lt:
VIEW_DRAFT_CONTENT_HELP: 'Pritaikoma puslapių peržiūrai be TVS pagalbos juodraščio režime. Naudinga bendradarbiaujant su redaktoriais be TVS prieigos.'
Viewers: 'Lankytojų grupės'
Visibility: Matomumas
has_one_Parent: 'Tėvinis puslapis'
has_one_Parent: 'Po puslapiu'
many_many_BackLinkTracking: 'Atgalinis stebėjimas'
many_many_ImageTracking: 'Paveikslėlių sekimas'
many_many_LinkTracking: 'Nuorodos sekimas'