From ebea43ebd83ec00b5eb99df0a4167a5c3d9fd5f2 Mon Sep 17 00:00:00 2001 From: Carlos Barberis Date: Wed, 14 Apr 2010 22:04:06 +0000 Subject: [PATCH] ENHANCEMENT: added language (Ticket #5390) git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@102899 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- code/CMSMain.php | 4 ++-- code/CMSSiteTreeFilter.php | 6 +++--- lang/en_US.php | 5 +++++ lang/pl_PL.php | 27 +++++++++++++++++++++------ templates/Includes/CMSMain_left.ss | 2 +- 5 files changed, 32 insertions(+), 12 deletions(-) diff --git a/code/CMSMain.php b/code/CMSMain.php index 53144431..dfdbe164 100755 --- a/code/CMSMain.php +++ b/code/CMSMain.php @@ -193,7 +193,7 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr $doSet = new DataObjectSet(); $doSet->push(new ArrayData(array( 'ClassName' => 'all', - 'Title' => 'All items' + 'Title' => _t('CMSSiteTreeFilter.ALL', 'All items') ))); foreach($filters as $filter) { if (call_user_func(array($filter, 'showInList'))) { @@ -595,7 +595,7 @@ JS; $id = $_REQUEST['ID']; Versioned::reading_stage('Live'); $record = DataObject::get_by_id("SiteTree", $id); - if($record && !($record->canDelete() && $record->canDeleteFromLive())) return Security::permissionFailure($this); + if($record && !$record->canDelete()) return Security::permissionFailure($this); $descRemoved = ''; $descendantsRemoved = 0; diff --git a/code/CMSSiteTreeFilter.php b/code/CMSSiteTreeFilter.php index e4d58360..d6a06609 100644 --- a/code/CMSSiteTreeFilter.php +++ b/code/CMSSiteTreeFilter.php @@ -75,7 +75,7 @@ abstract class CMSSiteTreeFilter extends Object { class CMSSiteTreeFilter_DeletedPages extends CMSSiteTreeFilter { static function title() { - return "All pages, including deleted"; + return _t('CMSSiteTreeFilter.DELETEDPAGES', "All pages, including deleted"); } function getTree() { @@ -92,7 +92,7 @@ class CMSSiteTreeFilter_DeletedPages extends CMSSiteTreeFilter { class CMSSiteTreeFilter_ChangedPages extends CMSSiteTreeFilter { static function title() { - return "Changed pages"; + return _t('CMSSiteTreeFilter.CHANGEDPAGES', "Changed pages"); } function pagesIncluded() { @@ -111,7 +111,7 @@ class CMSSiteTreeFilter_Search extends CMSSiteTreeFilter { static function showInList() { return false; } static function title() { - return "Search"; + return _t('CMSSiteTreeFilter.SEARCH', 'Search'); } /** diff --git a/lang/en_US.php b/lang/en_US.php index 86f803a6..cc657347 100755 --- a/lang/en_US.php +++ b/lang/en_US.php @@ -173,6 +173,7 @@ $lang['en_US']['CMSMain_left.ss']['DELETECONFIRM'] = 'Delete the selected pages' $lang['en_US']['CMSMain_left.ss']['DELETEDSTILLLIVE'] = 'Deleted from the draft site but still on the live site'; $lang['en_US']['CMSMain_left.ss']['EDITEDNOTPUB'] = 'Edited on the draft site and not published yet'; $lang['en_US']['CMSMain_left.ss']['EDITEDSINCE'] = 'Edited Since'; +$lang['en_US']['CMSMain_left.ss']['SHOWITEMS'] = 'Show:'; $lang['en_US']['CMSMain_left.ss']['ENABLEDRAGGING'] = array( 'Allow drag & drop reordering', PR_HIGH @@ -202,6 +203,10 @@ $lang['en_US']['CMSMain_versions.ss']['NOTPUB'] = 'Not published'; $lang['en_US']['CMSMain_versions.ss']['PUBR'] = 'Publisher'; $lang['en_US']['CMSMain_versions.ss']['UNKNOWN'] = 'Unknown'; $lang['en_US']['CMSMain_versions.ss']['WHEN'] = 'When'; +$lang['en_US']['CMSSiteTreeFilter']['ALL'] = 'All items'; +$lang['en_US']['CMSSiteTreeFilter']['DELETEDPAGES'] = 'All pages, including deleted'; +$lang['en_US']['CMSSiteTreeFilter']['CHANGEDPAGES'] = "Changed pages"; +$lang['en_US']['CMSSiteTreeFilter']['SEARCH'] = "Search"; $lang['en_US']['CommentAdmin']['ACCEPT'] = 'Accept'; $lang['en_US']['CommentAdmin']['APPROVED'] = 'Accepted %s comments.'; $lang['en_US']['CommentAdmin']['APPROVEDCOMMENTS'] = 'Approved Comments'; diff --git a/lang/pl_PL.php b/lang/pl_PL.php index 409b17c6..6a471473 100644 --- a/lang/pl_PL.php +++ b/lang/pl_PL.php @@ -39,7 +39,9 @@ $lang['pl_PL']['AssetAdmin_left.ss']['DELETE'] = 'Usuń ...'; $lang['pl_PL']['AssetAdmin_left.ss']['DELFOLDERS'] = 'Usuń zaznaczone foldery'; $lang['pl_PL']['AssetAdmin_left.ss']['ENABLEDRAGGING'] = 'Zezwól na przeciąganie elementów'; $lang['pl_PL']['AssetAdmin_left.ss']['FOLDERS'] = 'Foldery'; -$lang['pl_PL']['AssetAdmin_left.ss']['GO'] = 'Idź'; +$lang['pl_PL']['AssetAdmin_left.ss']['FILESYSTEMSYNC'] = 'Rozejrzyj się za nowymi plikami'; +$lang['pl_PL']['AssetAdmin_left.ss']['FILESYSTEMSYNC_DESC'] = 'SilverStripe utrzymuje własną baze danych plików przechowywanych w katalogu assets/ . Kliknij na ten przycisk aby dodać do tej bazy danych informację o plikach dodanych do katalogu assets/ przez inne programy, jak np. FTP'; +$lang['pl_PL']['AssetAdmin_left.ss']['GO'] = 'Ok'; $lang['pl_PL']['AssetAdmin_left.ss']['SELECTTODEL'] = 'Wybierz foldery, które chcesz usunąć i kliknij przycisk poniżej'; $lang['pl_PL']['AssetAdmin_left.ss']['TOREORG'] = 'Aby zreorganizować twoje foldery, przenieś je w wybrane miejsca'; $lang['pl_PL']['AssetAdmin_right.ss']['CHOOSEPAGE'] = 'Proszę wybrać stronę po lewej'; @@ -70,6 +72,14 @@ $lang['pl_PL']['AssetTableField']['SWFFILEOPTIONS'] = 'Opcje Pliku SWF'; $lang['pl_PL']['AssetTableField']['TITLE'] = 'Tytuł'; $lang['pl_PL']['AssetTableField']['TYPE'] = 'Rodzaj'; $lang['pl_PL']['AssetTableField']['URL'] = 'URL'; +$lang['pl_PL']['CMSBatchActions']['DELETED_DRAFT_PAGES'] = 'Usunięto %d stron z wersji roboczej serwisu, %d nieudanych usunięć'; +$lang['pl_PL']['CMSBatchActions']['DELETED_PAGES'] = 'Usunięto %d stron z opublikowanej wersji serwisu, %d nieudanych usunięć'; +$lang['pl_PL']['CMSBatchActions']['DELETE_DRAFT_PAGES'] = 'Usuń z wersji roboczej serwisu'; +$lang['pl_PL']['CMSBatchActions']['DELETE_PAGES'] = 'Usuń z wersji opublikowanej serwisu'; +$lang['pl_PL']['CMSBatchActions']['DELETING_DRAFT_PAGES'] = 'Usuwanie wybranych stron z wersji roboczej serwisu'; +$lang['pl_PL']['CMSBatchActions']['DELETING_PAGES'] = 'Usuwanie wybranych stron z wersji opublikowanej serwisu'; +$lang['pl_PL']['CMSBatchActions']['PUBLISHED_PAGES'] = 'Opublikowano %d stron, %d nieudanych publikacji'; +$lang['pl_PL']['CMSBatchActions']['PUBLISHING_PAGES'] = 'Publikowanie stron'; $lang['pl_PL']['CMSBatchActions']['PUBLISH_PAGES'] = 'Opublikuj'; $lang['pl_PL']['CMSLeft.ss']['DELPAGE'] = 'Usuń strony ...'; $lang['pl_PL']['CMSLeft.ss']['DELPAGES'] = 'Usuń zaznaczone strony'; @@ -85,7 +95,7 @@ $lang['pl_PL']['CMSMain']['COPYPUBTOSTAGE'] = 'Naprawdę chcesz skopiować publi $lang['pl_PL']['CMSMain']['DELETE'] = 'Usuń ze strony roboczej'; $lang['pl_PL']['CMSMain']['DESCREMOVED'] = 'i %s potomków'; $lang['pl_PL']['CMSMain']['EMAIL'] = 'E-mail'; -$lang['pl_PL']['CMSMain']['GO'] = 'Idź'; +$lang['pl_PL']['CMSMain']['GO'] = 'Ok'; $lang['pl_PL']['CMSMain']['MENUTITLE'] = 'Zawartość strony'; $lang['pl_PL']['CMSMain']['MENUTITLE'] = 'Zawartość Strony'; $lang['pl_PL']['CMSMain']['METADESCOPT'] = 'Opis'; @@ -131,7 +141,7 @@ $lang['pl_PL']['CMSMain_dialog.ss']['BUTTONNOTFOUND'] = 'Nie znaleziono nazwy pr $lang['pl_PL']['CMSMain_dialog.ss']['NOLINKED'] = 'Nie odnaleziono window.linkedObject aby wysłać sygnał przyciśnięcia przycisku z powrotem do głównego okna'; $lang['pl_PL']['CMSMain_left.ss']['ADDEDNOTPUB'] = 'Dodałeś do oczekujących i jeszcze nie opublikowanych stron'; $lang['pl_PL']['CMSMain_left.ss']['ADDSEARCHCRITERIA'] = 'Dodaj kryterium ...'; -$lang['pl_PL']['CMSMain_left.ss']['BATCHACTIONS'] = 'Akcja pliku'; +$lang['pl_PL']['CMSMain_left.ss']['BATCHACTIONS'] = 'Wykonaj na wielu'; $lang['pl_PL']['CMSMain_left.ss']['CHANGED'] = 'zmienione'; $lang['pl_PL']['CMSMain_left.ss']['CLOSEBOX'] = 'kliknij aby zamknąć'; $lang['pl_PL']['CMSMain_left.ss']['COMPAREMODE'] = 'Tryb porównania (wybierz 2 poniżej)'; @@ -141,8 +151,9 @@ $lang['pl_PL']['CMSMain_left.ss']['DELETECONFIRM'] = 'Usuń zaznaczone strony'; $lang['pl_PL']['CMSMain_left.ss']['DELETEDSTILLLIVE'] = 'Usunąłeś z oczekujących stron ale ciągle jest aktywna'; $lang['pl_PL']['CMSMain_left.ss']['EDITEDNOTPUB'] = 'Zmieniłeś oczekującą stronę ale jeszcze nie opublikowałeś '; $lang['pl_PL']['CMSMain_left.ss']['EDITEDSINCE'] = 'Edytowane od'; +$lang['pl_PL']['CMSMain_left.ss']['SHOWITEMS'] = 'Pokaż:'; $lang['pl_PL']['CMSMain_left.ss']['ENABLEDRAGGING'] = 'Zezwól na zmianę przenieś i puść '; -$lang['pl_PL']['CMSMain_left.ss']['GO'] = 'idź'; +$lang['pl_PL']['CMSMain_left.ss']['GO'] = 'Ok'; $lang['pl_PL']['CMSMain_left.ss']['HIDDEN'] = 'ukryte'; $lang['pl_PL']['CMSMain_left.ss']['KEY'] = 'Klucz:'; $lang['pl_PL']['CMSMain_left.ss']['NEW'] = 'nowy'; @@ -171,6 +182,10 @@ $lang['pl_PL']['CMSMain_versions.ss']['NOTPUB'] = 'Nie opublikowany'; $lang['pl_PL']['CMSMain_versions.ss']['PUBR'] = 'Publikujący'; $lang['pl_PL']['CMSMain_versions.ss']['UNKNOWN'] = 'Nieznany'; $lang['pl_PL']['CMSMain_versions.ss']['WHEN'] = 'Kiedy'; +$lang['pl_PL']['CMSSiteTreeFilter']['ALL'] = 'Wszystko'; +$lang['pl_PL']['CMSSiteTreeFilter']['DELETEDPAGES'] = 'Wszystkie strony, także te usunięte'; +$lang['pl_PL']['CMSSiteTreeFilter']['CHANGEDPAGES'] = "Strony, które uległy zmianie"; +$lang['pl_PL']['CMSSiteTreeFilter']['SEARCH'] = "Szukaj"; $lang['pl_PL']['CMSRight.ss']['CHOOSEPAGE'] = 'Proszę wybrać stronę po lewej'; $lang['pl_PL']['CMSRight.ss']['ECONTENT'] = 'Edytuj zawartość'; $lang['pl_PL']['CMSRight.ss']['WELCOMETO'] = 'Witamy w'; @@ -346,7 +361,7 @@ $lang['pl_PL']['PageComment']['NeedsModeration'] = 'Wymaga Moderacji?'; $lang['pl_PL']['PageComment']['PLURALNAME'] = 'Komentarze do strony'; $lang['pl_PL']['PageComment']['SINGULARNAME'] = 'Komentarz do strony'; $lang['pl_PL']['PageCommentInterface']['COMMENTERURL'] = 'Adres URL strony'; -$lang['pl_PL']['PageCommentInterface']['POST'] = 'Post'; +$lang['pl_PL']['PageCommentInterface']['POST'] = 'Wystaw'; $lang['pl_PL']['PageCommentInterface']['SPAMQUESTION'] = 'Pytanie anty-spamowe: %s'; $lang['pl_PL']['PageCommentInterface.ss']['COMMENTS'] = 'Komentarze'; $lang['pl_PL']['PageCommentInterface.ss']['NEXT'] = 'następny'; @@ -383,7 +398,7 @@ $lang['pl_PL']['SecurityAdmin_left.ss']['CREATE'] = 'Stwórz'; $lang['pl_PL']['SecurityAdmin_left.ss']['DEL'] = 'Usuń ...'; $lang['pl_PL']['SecurityAdmin_left.ss']['DELGROUPS'] = 'Usuń zaznaczone grupy'; $lang['pl_PL']['SecurityAdmin_left.ss']['ENABLEDRAGGING'] = 'Zezwól na przeciąganie elementów'; -$lang['pl_PL']['SecurityAdmin_left.ss']['GO'] = 'Idź'; +$lang['pl_PL']['SecurityAdmin_left.ss']['GO'] = 'Ok'; $lang['pl_PL']['SecurityAdmin_left.ss']['SECGROUPS'] = 'Grupa bezpieczeństwa'; $lang['pl_PL']['SecurityAdmin_left.ss']['SELECT'] = 'Zaznacz strony które chcesz usunąć i kliknij przycisk poniżej'; $lang['pl_PL']['SecurityAdmin_left.ss']['TOREORG'] = 'Aby zmienić układ witryny, przeciągnij strony w odpowiadające Ci miejsca.'; diff --git a/templates/Includes/CMSMain_left.ss b/templates/Includes/CMSMain_left.ss index 31845425..4dc93cff 100755 --- a/templates/Includes/CMSMain_left.ss +++ b/templates/Includes/CMSMain_left.ss @@ -84,7 +84,7 @@
- Show: <% control SiteTreeFilters %> <% end_control %>