From a6087f1d4eccc8cdf795a215d32472b66258d889 Mon Sep 17 00:00:00 2001 From: Damian Mooyman Date: Wed, 8 Aug 2012 17:04:17 +1200 Subject: [PATCH 1/8] FIXED: Issue where links within the CMS page list view would not be correctly generated. E.g. when the translatable module is used, page links for the "show children" action would come up as admin/pages/?locale=en_NZ?ParentID=21&view=list when they should be shows as admin/pages/?locale=en_NZ&ParentID=21&view=list. Uses Controller::join_links to perform the necessary sanity check on urls. --- code/controllers/CMSMain.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/code/controllers/CMSMain.php b/code/controllers/CMSMain.php index 9c00727d..e01e0175 100644 --- a/code/controllers/CMSMain.php +++ b/code/controllers/CMSMain.php @@ -710,9 +710,8 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr $num = $item ? $item->numChildren() : null; if($num) { return sprintf( - '%s', - $controller->Link(), - $item->ID, + '%s', + Controller::join_links($controller->Link(), "?ParentID={$item->ID}&view=list"), $num ); } From e6e2ab4774b960764fd3ac40d89ab140ffd88d29 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Mon, 20 Aug 2012 22:01:46 +0200 Subject: [PATCH 2/8] Updated translations --- lang/ar.yml | 58 ++++++++++---------- lang/de.yml | 16 +++--- lang/fa_IR.yml | 8 +-- lang/fi.yml | 6 +-- lang/fr.yml | 46 ++++++++-------- lang/lt.yml | 2 +- lang/pl.yml | 16 +++--- lang/sv.yml | 142 ++++++++++++++++++++++++------------------------- lang/tr.yml | 16 +++--- 9 files changed, 155 insertions(+), 155 deletions(-) diff --git a/lang/ar.yml b/lang/ar.yml index e5c0b725..0895352d 100644 --- a/lang/ar.yml +++ b/lang/ar.yml @@ -120,46 +120,46 @@ ar: CMSPageEditController: MENUTITLE: 'Edit Page' CMSPageHistoryController: - COMPAREMODE: 'Compare mode (select two)' - COMPAREVERSIONS: 'Compare Versions' + COMPAREMODE: 'وضع المقارنة (أختر أثنين)ـ' + COMPAREVERSIONS: 'مقارنة النسخ' COMPARINGVERSION: 'Comparing versions {version1} and {version2}.' - MENUTITLE: History - REVERTTOTHISVERSION: 'Revert to this version' - SHOWUNPUBLISHED: 'Show unpublished versions' - SHOWVERSION: 'Show Version' + MENUTITLE: السجل + REVERTTOTHISVERSION: 'العودة الى هذة النسخة' + SHOWUNPUBLISHED: 'عرض النسخ الغير منشورة' + SHOWVERSION: 'عرض النسخ' VIEW: view VIEWINGVERSION: 'Currently viewing version {version}.' CMSPageHistoryController_versions.ss: - AUTHOR: Author - NOTPUBLISHED: 'Not published' - PUBLISHER: Publisher - UNKNOWN: Unknown - WHEN: When + AUTHOR: الكاتب + NOTPUBLISHED: 'غير منشور' + PUBLISHER: الناشر + UNKNOWN: 'غير معروف' + WHEN: متى CMSPageSettingsController: - MENUTITLE: 'Edit Page' + MENUTITLE: 'تحرير صفحة' CMSPagesController: GalleryView: 'Gallery View' - ListView: 'List View' - MENUTITLE: Pages - TreeView: 'Tree View' + ListView: 'قائمة العرض' + MENUTITLE: الصفحات + TreeView: 'شجرة العرض' CMSPagesController_ContentToolbar.ss: ENABLEDRAGGING: 'Drag''n''drop' MULTISELECT: Multi-selection CMSPagesController_Tools.ss: FILTER: Filter CMSSearch: - FILTERDATEFROM: From - FILTERDATEHEADING: Date - FILTERDATETO: To - FILTERLABELTEXT: Content + FILTERDATEFROM: من + FILTERDATEHEADING: التاريخ + FILTERDATETO: إلى + FILTERLABELTEXT: المحتوى CMSSettingsController: - MENUTITLE: Settings + MENUTITLE: الإعدادات CMSSiteTreeFilter_ChangedPages: Title: 'Changed pages' CMSSiteTreeFilter_DeletedPages: Title: 'All pages, including deleted' CMSSiteTreeFilter_Search: - Title: 'All pages' + Title: 'كل الصفحات' ContentControl: NOTEWONTBESHOWN: 'تنبيه: هذه الرسالة لن يتم عرضها لزوار موقعك' ContentController: @@ -223,18 +223,18 @@ ar: UploadFilesButton: Upload LeftAndMain: DELETED: Deleted. - PreviewButton: Preview + PreviewButton: عرض SAVEDUP: Saved. STATUSPUBLISHEDSUCCESS: 'Published ''{title}'' successfully' - SearchResults: 'Search Results' - VersionUnknown: Unknown + SearchResults: 'نتائج البحث' + VersionUnknown: 'غير معروف' Permission: CMS_ACCESS_CATEGORY: 'الوصل لنظام إدارة المحتوى' Permissions: CONTENT_CATEGORY: 'تصاريح المحتوى' PERMISSIONS_CATEGORY: 'تصريح الدخول والقواعد' RedirectorPage: - DESCRIPTION: 'Redirects to a different internal page' + DESCRIPTION: 'إعادة توجية الى صفحة داخلية مختلفة ' HASBEENSETUP: 'صفحة التحويل تم تهيئتها بدون تحديد وجهة التحويل' HEADER: 'هذه الصفحة سوف تقوم بتحويل الأعضاء إلى صفحة أخرى' OTHERURL: 'رابط موقع آخر' @@ -324,7 +324,7 @@ ar: HASBROKENLINKS: 'هذه الصفحة تحتوي على روابط معطوبة' HTMLEDITORTITLE: محتوى INHERIT: 'استيراد من الصفحة المرجعية' - LASTUPDATED: 'Last Updated' + LASTUPDATED: 'أخر تحديث' LINKCHANGENOTE: 'تغيير هذا وصلة رابط الصفحة سوف تؤثر أيضًا على الوصلات لجميع صفحات الفرعية.' MENUTITLE: القائمة METADESC: الوصف @@ -332,7 +332,7 @@ ar: METAKEYWORDS: 'الكلمات المفتاحية' METATITLE: العنوان MODIFIEDONDRAFTHELP: 'Page has unpublished changes' - MODIFIEDONDRAFTSHORT: Modified + MODIFIEDONDRAFTSHORT: معدل MetadataToggle: Metadata PAGELOCATION: 'موقع الضفحة' PAGETITLE: 'اسم الصفحة' @@ -348,7 +348,7 @@ ar: PageTypeNotAllowed: 'Page type "{type}" not allowed as child of this parent page' REMOVEDFROMDRAFTHELP: 'Page is published, but has been deleted from draft' REMOVEDFROMDRAFTSHORT: 'Removed from draft' - REMOVE_INSTALL_WARNING: 'Warning: You should remove install.php from this SilverStripe install for security reasons.' + REMOVE_INSTALL_WARNING: 'تحذير : يجب حذف الملف install.php من SilverStripe لاسباب أمنية ' REORGANISE_DESCRIPTION: 'Can reorganise the site tree' REORGANISE_HELP: 'إعادة ترتيب الصفحات في شجرة الموقع من خلال السحب والإسقاط.' SHOWINMENUS: 'عرض في قوائم ؟' @@ -398,7 +398,7 @@ ar: HAVEASKED: 'تم طلب مشاهدة محتوى الموقع في' VirtualPage: CHOOSE: 'اختر صفحة ليتم ربطها في' - DESCRIPTION: 'Displays the content of another page' + DESCRIPTION: 'أعرض محتويات الصفحة الأخرى' EDITCONTENT: 'اضغط هنا لتعديل المحتوى' HEADER: 'هذه صفحة افتراضية' PLURALNAME: 'الصفحات الافتراضية' diff --git a/lang/de.yml b/lang/de.yml index bdc73898..49f941ee 100644 --- a/lang/de.yml +++ b/lang/de.yml @@ -27,7 +27,7 @@ de: AssetAdmin_DeleteBatchAction: TITLE: 'Ordner löschen' AssetAdmin_Tools: - FILTER: Filter + FILTER: Filtern AssetAdmin_left.ss: GO: Los AssetTableField: @@ -163,7 +163,7 @@ de: ContentControl: NOTEWONTBESHOWN: 'Achtung: Diese Nachricht wird Ihren Besuchern nicht gezeigt.' ContentController: - ARCHIVEDSITE: 'Preview version' + ARCHIVEDSITE: Vorschauversion ARCHIVEDSITEFROM: 'Site archiviert von' CMS: CMS DRAFTSITE: Vorschau-Site @@ -190,8 +190,8 @@ de: DEFAULTSERVERERRORPAGETITLE: Serverfehler DESCRIPTION: 'Spezieller Inhalt für andere Fehlerfälle (z.B. "Seite nicht gefunden")' ERRORFILEPROBLEM: 'Die Datei "{filename}" konnte nicht zum Schreiben geöffnet werden. Bitte überprüfen Sie die Dateiberechtigungen.' - PLURALNAME: 'Error Pags' - SINGULARNAME: 'Error Page' + PLURALNAME: Fehlerseiten + SINGULARNAME: Fehlerseite 400: '400 - Fehlerhafter Zugriff' 401: '401 - Unerlaubter Zugriff' 403: '403 - Verbotener Zugriff' @@ -238,11 +238,11 @@ de: HASBEENSETUP: 'Eine Weiterleitungsseite wurde erstellt ohne das eine Weiterleitung definiert wurde.' HEADER: 'Diese Seite wird Nutzer auf eine andere Seite weiterleiten' OTHERURL: 'Andere Webseiten URL' - PLURALNAME: 'Redirector Pags' + PLURALNAME: Umleitungsseite REDIRECTTO: 'Weiterleiten zu' REDIRECTTOEXTERNAL: 'Andere Website' REDIRECTTOPAGE: 'Eine Seite auf Ihrer Website' - SINGULARNAME: 'Redirector Page' + SINGULARNAME: Weiterleitungsseite YOURPAGE: 'Seite auf Ihrer Website' ReportAdmin: MENUTITLE: Berichte @@ -274,8 +274,8 @@ de: EDITHEADER: 'Wer kann Seiten auf dieser Website bearbeiten?' EDIT_PERMISSION: 'Websiteeinstellungen editieren' EDIT_PERMISSION_HELP: 'Möglichkeit, die globalen Zugrifsseinstellungen sowie die Berechtigungen für die Hauptebene zu editieren.' - PLURALNAME: 'Site Configs' - SINGULARNAME: 'Site Config' + PLURALNAME: Seitenkonfigurationen + SINGULARNAME: Seitenkonfiguration SITENAMEDEFAULT: 'Name Ihrer Website' SITETAGLINE: 'Ihr Websiteslogan' SITETITLE: 'Titel der Site' diff --git a/lang/fa_IR.yml b/lang/fa_IR.yml index 6e98caf4..67432e64 100644 --- a/lang/fa_IR.yml +++ b/lang/fa_IR.yml @@ -303,8 +303,8 @@ fa_IR: Comments: Comments Content: 'درون مایه' DEFAULTABOUTCONTENT: '

You can fill this page out with your own content, or delete it and create your own pages.

' - DEFAULTABOUTTITLE: 'About Us' - DEFAULTCONTACTCONTENT: '

You can fill this page out with your own content, or delete it and create your own pages.

' + DEFAULTABOUTTITLE: 'درباره ما' + DEFAULTCONTACTCONTENT: '

می‌توانید محتوی این صفحه را به دلخواه تغییر دهید یا کلا آن را حذف کرده و خودتان صفخات جدیدی ایجاد کنید.

' DEFAULTCONTACTTITLE: 'تماس با ما' DEFAULTHOMECONTENT: '

Welcome to SilverStripe! This is the default homepage. You can edit this page by opening the CMS. You can now access the developer documentation, or begin the tutorials.

' DEFAULTHOMETITLE: خانه @@ -349,14 +349,14 @@ fa_IR: REMOVEDFROMDRAFTHELP: 'Page is published, but has been deleted from draft' REMOVEDFROMDRAFTSHORT: 'Removed from draft' REMOVE_INSTALL_WARNING: 'Warning: You should remove install.php from this SilverStripe install for security reasons.' - REORGANISE_DESCRIPTION: 'Change site structure' + REORGANISE_DESCRIPTION: 'تغییر ساختار سایت' REORGANISE_HELP: 'Rearrange pages in the site tree through drag&drop.' SHOWINMENUS: 'Show in menus?' SHOWINSEARCH: 'نمایش در جستجو ؟' SINGULARNAME: 'لینک سایت' TABBEHAVIOUR: Behavior TABCONTENT: مطلب - TABDEPENDENT: 'Dependent pages' + TABDEPENDENT: 'صفحات مرتبط' TOPLEVEL: 'Site Content (Top Level)' TOPLEVELCREATORGROUPS: 'Top level creators' URLSegment: 'بخش آدرس URL' diff --git a/lang/fi.yml b/lang/fi.yml index 5179566d..9f6546cf 100644 --- a/lang/fi.yml +++ b/lang/fi.yml @@ -194,7 +194,7 @@ fi: SINGULARNAME: Virhesivu 400: '400 - Virheellinen Pyyntö' 401: '401 - Luvaton' - 403: '403 . Kielletty' + 403: '403 - Kielletty' 404: '404 - Ei löytynyt' 405: '405 - Menetelmä ei sallittu' 406: '406 - Ei hyväksyttävä' @@ -279,8 +279,8 @@ fi: SITENAMEDEFAULT: 'Sivustosi nimi' SITETAGLINE: 'Sivuston mainoslause/slogan' SITETITLE: 'Sivuston otsikko' - TABACCESS: Pääsy - TABMAIN: Pää + TABACCESS: Oikeudet + TABMAIN: 'Yleiset asetukset' TAGLINEDEFAULT: 'sinun mainoslauseesi tähän' THEME: Teema TOPLEVELCREATE: 'Kuka voi luoda sivuja sivuston juureen?' diff --git a/lang/fr.yml b/lang/fr.yml index 94fe6c84..86236a03 100644 --- a/lang/fr.yml +++ b/lang/fr.yml @@ -3,7 +3,7 @@ fr: ADDFILES: 'Ajouter des fichiers' ALLOWEDEXTS: 'Extensions autorisées' ActionAdd: 'Ajouter un dossier' - AppCategoryArchive: Archiver + AppCategoryArchive: Archive AppCategoryAudio: Audio AppCategoryFlash: Flash AppCategoryImage: Image @@ -27,7 +27,7 @@ fr: AssetAdmin_DeleteBatchAction: TITLE: 'Supprimer dossiers' AssetAdmin_Tools: - FILTER: Filter + FILTER: Filtrer AssetAdmin_left.ss: GO: Go AssetTableField: @@ -82,8 +82,8 @@ fr: DELETEFP: 'Retirer du site publié' DESCREMOVED: 'et {count} descendants' EMAIL: Email - EditTree: 'Éditer l''abre' - ListFiltered: 'Liste filtrée.' + EditTree: 'Ağacı düzenle' + ListFiltered: 'Filtrelenmiş liste.' MENUTITLE: 'Éditer la page' NEW: Nouveau PAGENOTEXISTS: 'Cette page n''existe pas' @@ -108,8 +108,8 @@ fr: TabContent: Contenu TabHistory: Historique TabSettings: Paramètres - TreeFiltered: 'Abre filtré.' - TreeFilteredClear: 'Annuler le filtre' + TreeFiltered: 'Filtrelenmiş ağaç liste.' + TreeFilteredClear: 'Filtreyi temizle' CMSMain_left.ss: 'APPLY FILTER': 'Appliquer le filtre' RESET: Réinitialiser @@ -132,7 +132,7 @@ fr: CMSPageHistoryController_versions.ss: AUTHOR: Auteur NOTPUBLISHED: 'Non publiée' - PUBLISHER: Éditeur + PUBLISHER: Yayınlayan UNKNOWN: Inconnu WHEN: Date CMSPageSettingsController: @@ -140,7 +140,7 @@ fr: CMSPagesController: GalleryView: Galerie ListView: Liste - MENUTITLE: Sayfalar + MENUTITLE: Pages TreeView: Arbre CMSPagesController_ContentToolbar.ss: ENABLEDRAGGING: Glisser-déposer @@ -151,9 +151,9 @@ fr: FILTERDATEFROM: De FILTERDATEHEADING: Date FILTERDATETO: à - FILTERLABELTEXT: Contenu + FILTERLABELTEXT: Terme CMSSettingsController: - MENUTITLE: Paramètres + MENUTITLE: Ayarlar CMSSiteTreeFilter_ChangedPages: Title: 'Pages modifiées' CMSSiteTreeFilter_DeletedPages: @@ -163,7 +163,7 @@ fr: ContentControl: NOTEWONTBESHOWN: 'Note : ce message ne sera pas visible de vos visiteurs.' ContentController: - ARCHIVEDSITE: 'Preview version' + ARCHIVEDSITE: 'Version de l’aperçu' ARCHIVEDSITEFROM: 'Site archivé depuis' CMS: CMS DRAFTSITE: 'Site Brouillon' @@ -190,8 +190,8 @@ fr: DEFAULTSERVERERRORPAGETITLE: 'Erreur du serveur' DESCRIPTION: 'Contenu personnalisé pour diverses erreurs (p. ex. « Page introuvable »)' ERRORFILEPROBLEM: ' L’ouverture du fichier « {filename} » afin de le modifier a provoqué une erreur ; vérifiez les droits d’accès au fichier. ' - PLURALNAME: 'Error Pags' - SINGULARNAME: 'Error Page' + PLURALNAME: 'Pages d’erreur' + SINGULARNAME: 'Page d’erreur' 400: '400 - Mauvaise demande' 401: '401 - Non autorisé' 403: '403 - Interdit' @@ -223,11 +223,11 @@ fr: UploadFilesButton: Télécharger LeftAndMain: DELETED: Supprimée. - PreviewButton: Aperçu + PreviewButton: Önizleme SAVEDUP: Sauvegardée. STATUSPUBLISHEDSUCCESS: '« {title} » publiée avec succès' - SearchResults: 'Résultats de la recherche' - VersionUnknown: Inconnu + SearchResults: 'Arama Sonuçları' + VersionUnknown: Bilinmeyen Permission: CMS_ACCESS_CATEGORY: 'Accès au CMS' Permissions: @@ -238,11 +238,11 @@ fr: HASBEENSETUP: 'Une page de redirection sans adresse de redirection a été créée.' HEADER: 'Cette page va rediriger les utilisateurs vers une autre page' OTHERURL: 'Autre URL de site web' - PLURALNAME: 'Redirector Pags' + PLURALNAME: 'Pages de redirection' REDIRECTTO: 'Rediriger vers' REDIRECTTOEXTERNAL: 'Autre site web' REDIRECTTOPAGE: 'Une page de votre site web' - SINGULARNAME: 'Redirector Page' + SINGULARNAME: 'Page de redirection' YOURPAGE: 'Page de votre site web' ReportAdmin: MENUTITLE: Rapports @@ -274,8 +274,8 @@ fr: EDITHEADER: 'Qui peut modifier les pages sur ce site?' EDIT_PERMISSION: 'Configuration du site' EDIT_PERMISSION_HELP: 'Capacité d''édition des accès globales et permission des pages de premier niveau.' - PLURALNAME: 'Site Configs' - SINGULARNAME: 'Site Config' + PLURALNAME: 'Configurations du site' + SINGULARNAME: 'Configuration du site' SITENAMEDEFAULT: 'Nom du site' SITETAGLINE: 'Slogan ou devise du site' SITETITLE: 'Titre du site' @@ -384,9 +384,9 @@ fr: SORTASC: 'Classer en ordre ascendant' SORTDESC: 'Classer en ordre descendant' TableListField_PageControls.ss: - DISPLAYING: Affichage + DISPLAYING: Gösterilen OF: de - TO: à + TO: kime VIEWFIRST: 'Voir le(s) premier(s)' VIEWLAST: 'Voir le(s) dernier(s)' VIEWNEXT: 'Voir le(s) suivant(s)' @@ -405,4 +405,4 @@ fr: PageTypNotAllowedOnRoot: 'Le type de page d’origine « {type} » n’est pas autorisé au niveau racine pour cette page virtuelle' SINGULARNAME: 'Page virtuelle' cms: - FILESYSTEMSYNC: 'Synchroniser fichiers' + FILESYSTEMSYNC: 'Mettre à jour' diff --git a/lang/lt.yml b/lang/lt.yml index 18b1e73f..fa2be84c 100644 --- a/lang/lt.yml +++ b/lang/lt.yml @@ -72,7 +72,7 @@ lt: MENUTITLE: Bylos CMSMain: ACCESS: 'Priėjimas prie ''{title}'' dalies' - ACCESS_HELP: 'Allow viewing of the section containing page tree and content. View and edit permissions can be handled through page specific dropdowns, as well as the separate "Content permissions".' + 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ą' ChoosePageParentMode: 'Pasirinkite kur sukurti šį puslapį' diff --git a/lang/pl.yml b/lang/pl.yml index 897f8caa..11558d45 100644 --- a/lang/pl.yml +++ b/lang/pl.yml @@ -27,7 +27,7 @@ pl: AssetAdmin_DeleteBatchAction: TITLE: 'Usuń foldery' AssetAdmin_Tools: - FILTER: Filter + FILTER: Filtruj AssetAdmin_left.ss: GO: Przejdź AssetTableField: @@ -163,7 +163,7 @@ pl: ContentControl: NOTEWONTBESHOWN: 'Uwaga: ta strona nie będzie widoczna dla twoich odwiedzających ' ContentController: - ARCHIVEDSITE: 'Preview version' + ARCHIVEDSITE: 'Podgląd wersji' ARCHIVEDSITEFROM: 'Zarchiwizowana witryna od' CMS: 'System Zarządzania Treścią' DRAFTSITE: 'Szkic witryny' @@ -190,8 +190,8 @@ pl: DEFAULTSERVERERRORPAGETITLE: 'Błąd serwera' DESCRIPTION: 'Własna zawartość dla różnych błędów (np. "Strona nie została znaleziona")' ERRORFILEPROBLEM: 'Błąd podczas otwierania pliku "{filename}". Proszę sprawdzić uprawnienia do plików.' - PLURALNAME: 'Error Pags' - SINGULARNAME: 'Error Page' + PLURALNAME: 'Strony błędów' + SINGULARNAME: 'Strona błędu' 400: '400 - Nieprawidłowe zapytanie' 401: '401 - Nieautoryzowany Dostęp' 403: '403 - Zabroniony' @@ -238,11 +238,11 @@ pl: HASBEENSETUP: 'Strona przekierowująca została ustawiona bez celu, do którego ma przekierowywać.' HEADER: 'Ta strona przeniesie użytkowników na inną stronę' OTHERURL: 'Adres URL innej strony' - PLURALNAME: 'Redirector Pags' + PLURALNAME: 'Strony przekierowujące' REDIRECTTO: 'Przenieś do' REDIRECTTOEXTERNAL: 'Inna strona' REDIRECTTOPAGE: 'Strona na Twojej witrynie' - SINGULARNAME: 'Redirector Page' + SINGULARNAME: 'Strona przekierowująca' YOURPAGE: 'Strona na Twojej witrynie' ReportAdmin: MENUTITLE: Raporty @@ -274,8 +274,8 @@ pl: EDITHEADER: 'Kto może edytować strony tego serwisu?' EDIT_PERMISSION: 'Zarządzanie konfiguracją serwisu' EDIT_PERMISSION_HELP: 'Możliwość edycji globalnych ustawień bezpieczeństwa/uprawnień do stron pierwszego poziomu.' - PLURALNAME: 'Site Configs' - SINGULARNAME: 'Site Config' + PLURALNAME: 'Konfiguracje strony' + SINGULARNAME: 'Konfiguracja strony' SITENAMEDEFAULT: 'Nazwa twojego serwisu' SITETAGLINE: 'Slogan serwisu' SITETITLE: 'Tytuł serwisu' diff --git a/lang/sv.yml b/lang/sv.yml index 47afe043..46e1571c 100644 --- a/lang/sv.yml +++ b/lang/sv.yml @@ -2,7 +2,7 @@ sv: AssetAdmin: ADDFILES: 'Lägg till filer' ALLOWEDEXTS: 'Tillåtna filändelser' - ActionAdd: 'Lägg till mapp' + ActionAdd: 'Skapa mapp' AppCategoryArchive: Arkivera AppCategoryAudio: Ljud AppCategoryFlash: Flash @@ -13,7 +13,7 @@ sv: CurrentFolderOnly: 'Begränsa till aktuell mapp?' DetailsView: Detaljer FILES: Filer - FILESYSTEMSYNCTITLE: 'Uppdatera CMS databasposter av filer på filsystemet. Användbar när nya filer har laddats upp utanför CMS, t.ex. via FTP.' + FILESYSTEMSYNCTITLE: 'Uppdatera CMS:ets databasposter för filer i filsystemet. Användbart när nya filer har laddats upp utanför CMS:et, t.ex. via FTP.' FROMTHEINTERNET: 'Från internet' FROMYOURCOMPUTER: 'Från din dator' Filetype: Filtyp @@ -37,7 +37,7 @@ sv: Back: Tillbaka BrokenLinksReport: Any: Alla - BROKENLINKS: 'Rapport för trasiga länkar' + BROKENLINKS: 'Rapport för brutna länkar' CheckSite: 'Kontrollera sajt' CheckSiteDropdownDraft: Utkast CheckSiteDropdownPublished: 'Publicerad Sajt' @@ -50,30 +50,30 @@ sv: HasBrokenLinkAndFile: 'har trasig länk och fil' HoverTitleEditPage: 'Redigera sida' PageName: Sidnamn - ReasonDropdown: 'Problem med kontroll' + ReasonDropdown: 'Problem att kontrollera' ReasonDropdownBROKENFILE: 'Trasig fil' ReasonDropdownBROKENLINK: 'Bruten länk' - ReasonDropdownRPBROKENLINK: 'Omdirigerings sida pekar till en icke-existerande sida' - ReasonDropdownVPBROKENLINK: 'virtuell sida pekar till icke-existerande sida' + ReasonDropdownRPBROKENLINK: 'Omdirigeringssida pekar på en icke-existerande sida' + ReasonDropdownVPBROKENLINK: 'Virtuell sida pekar på icke-existerande sida' RedirectorNonExistent: 'omdirigeringssida pekar på en icke-existerande sida' - VirtualPageNonExistent: 'virtuell sida pekar till icke-existerande sida' + VirtualPageNonExistent: 'virtuell sida pekar på icke-existerande sida' CMSAddPageController: Title: 'Skapa sida' CMSBatchActions: DELETED_DRAFT_PAGES: 'Raderade %d sidor från utkastsajten, %d misslyckades' DELETED_PAGES: 'Raderade %d sidor från den publiserade sajten, %d misslyckades' - DELETE_DRAFT_PAGES: 'Radera från sajt utkast' - DELETE_PAGES: 'radera från publicerad site' - PUBLISHED_PAGES: 'Publicerat %d sidor, %d misslyckades' + DELETE_DRAFT_PAGES: 'Radera från utkast' + DELETE_PAGES: 'Radera från publicerade sajten' + PUBLISHED_PAGES: 'Publicerade %d sidor, %d misslyckades' PUBLISH_PAGES: Publicera - UNPUBLISHED_PAGES: 'Un-publicerade % d sidor' - UNPUBLISH_PAGES: 'Dölj publicerad' + UNPUBLISHED_PAGES: 'Avpublicerade %d sidor' + UNPUBLISH_PAGES: Avpublicera CMSFileAddController: MENUTITLE: Filer CMSMain: ACCESS: 'Tillgång till sektionen ''{title}''' - ACCESS_HELP: 'Tillåt visning av det sektionen innehållande sidträdet och dess innehåll. Rättigheter visa och redigera kan hanteras i sidans dropdownmenyer, liksom i "Innehållsbehörigheter".' - AddNew: 'Lägg till ny sida' + ACCESS_HELP: 'Tillåt visning av sektionen innehållande sidträdet och dess innehåll. Rättigheter att visa och redigera sidan kan hanteras i dess rullgardinsmenyer, liksom i "Innehållsbehörigheter".' + AddNew: 'Skapa ny sida' AddNewButton: 'Skapa ny' ChoosePageParentMode: 'Välj var du vill skapa denna sida' ChoosePageType: 'Välj sidtyp' @@ -120,8 +120,8 @@ sv: CMSPageEditController: MENUTITLE: 'Redigera sidan' CMSPageHistoryController: - COMPAREMODE: 'Jämför läge (välj två)' - COMPAREVERSIONS: 'Jämnför versioner' + COMPAREMODE: 'Jämföringsläge (välj två)' + COMPAREVERSIONS: 'Jämför versioner' COMPARINGVERSION: 'Jämför version {version1} och {version2}.' MENUTITLE: Historia REVERTTOTHISVERSION: 'Ändra till denna version' @@ -136,7 +136,7 @@ sv: UNKNOWN: Okänd WHEN: När CMSPageSettingsController: - MENUTITLE: 'Ändra sidan' + MENUTITLE: 'Redigera sida' CMSPagesController: GalleryView: Gallerivy ListView: Listvy @@ -163,7 +163,7 @@ sv: ContentControl: NOTEWONTBESHOWN: 'Observera: Detta meddelande kommer inte att visas för besökarna' ContentController: - ARCHIVEDSITE: 'Preview version' + ARCHIVEDSITE: 'Förhandsgranska version' ARCHIVEDSITEFROM: 'Arkiverad sajt från' CMS: CMS DRAFTSITE: Utkast @@ -181,35 +181,35 @@ sv: PostInstallTutorialIntro: 'Denna sajt är en enkel version av en SilverStripe 2 sajt. För att vidareutveckla den se {link}.' StartEditing: 'Du kan ändra din sajts innehåll genom publiceringsverktyget.' UnableDeleteInstall: 'Lyckades inte radera installationsfilerna. Radera följande filer manuellt.' - VIEWPAGEIN: 'Titta på sidan i:' + VIEWPAGEIN: 'titta på sidan i:' ErrorPage: CODE: Felkod DEFAULTERRORPAGECONTENT: '

Det verkar som om du försökter komma åt en sida som inte finns.

Var god kontrollera stavningen på adressen som du försökte nå och försök igen.' DEFAULTERRORPAGETITLE: 'Sidan hittades inte' - DEFAULTSERVERERRORPAGECONTENT: '

Tyvärr, det blev ett problem med hanteringen av din förfrågan.

' - DEFAULTSERVERERRORPAGETITLE: Server-fel - DESCRIPTION: 'Anpassat innehåll för olika fel ärenden (t.ex. "Sidan kan inte hittas")' + DEFAULTSERVERERRORPAGECONTENT: '

Ursäkta, ett fel uppstod vid hanteringen av din förfrågan.

' + DEFAULTSERVERERRORPAGETITLE: Serverfel + DESCRIPTION: 'Anpassat innehåll för olika felärenden (t.ex. "Sidan kan inte hittas")' ERRORFILEPROBLEM: 'Kunde inte skriva filen "{filename}". Var vänlig kontrollera skrivrättigheterna.' - PLURALNAME: 'Error Pags' - SINGULARNAME: 'Error Page' + PLURALNAME: Felsidor + SINGULARNAME: Felsida 400: '400 - Felaktig förfrågan' 401: '401 - Obehörig' 403: '403 - Förbjuden' 404: '404 - Hittades inte' 405: '405 - Metoden inte tillåten' 406: '406 - Inte acceptabelt' - 407: '407 - Proxy-autensiering krävs' + 407: '407 - Proxyautentisering krävs' 408: '408 - Begäran tog för lång tid' 409: '409 - Konflikt' 410: '410 - Borta' 411: '411 - Längd krävs' 412: '412 - Ett villkor är inte uppfyllt' 413: '413 - Den efterfrågade entiteten är för stor' - 414: '414 - URIn för begäran är för lång' + 414: '414 - URI:n för begäran är för lång' 415: '415 - Mediatypen stöds inte' - 416: 'Det efterfrågade intervallet går inte att leverera' - 417: 'Förväntningen gick inte att infria' - 500: '500 - Internt server-fel' + 416: '416 - Det efterfrågade intervallet går inte att leverera' + 417: '417 - Förväntningen gick inte att infria' + 500: '500 - Internt serverfel' 501: '501 - Inte implementerad' 502: '502 - Felaktig gateway' 503: '503 - Tjänsten otillgänglig' @@ -222,34 +222,34 @@ sv: UNUSEDTHUMBNAILSTITLE: 'Oanvända tumnaglar' UploadFilesButton: 'Ladda upp' LeftAndMain: - DELETED: Raderad + DELETED: Raderad. PreviewButton: Förhandsgranska - SAVEDUP: Sparad + SAVEDUP: Sparad. STATUSPUBLISHEDSUCCESS: 'Publiseringen av ''{title}'' lyckades' SearchResults: Sökresultat VersionUnknown: Okänd Permission: CMS_ACCESS_CATEGORY: CMS-tillgång Permissions: - CONTENT_CATEGORY: 'Innehålls tillgång' - PERMISSIONS_CATEGORY: 'Roller och tillgång' + CONTENT_CATEGORY: Innehållsåtkomst + PERMISSIONS_CATEGORY: 'Roller och åtkomst' RedirectorPage: - DESCRIPTION: 'Omdirigera till en annnan intern sida' + DESCRIPTION: 'Omdirigerar till en annan intern sida' HASBEENSETUP: 'En omdirigeringssida har skapats utan att ha något mål.' HEADER: 'Den här sidan omdirigerar användare till en annan sida' - OTHERURL: 'En annan url' - PLURALNAME: 'Redirector Pags' - REDIRECTTO: 'Dirigera till' + OTHERURL: 'Andra sidans URL' + PLURALNAME: Omdirigeringssidor + REDIRECTTO: 'Omdirigera till' REDIRECTTOEXTERNAL: 'En annan sajt' REDIRECTTOPAGE: 'En sida på din sajt' - SINGULARNAME: 'Redirector Page' + SINGULARNAME: Omdirigeringssida YOURPAGE: 'Sida på din sajt' ReportAdmin: MENUTITLE: Rapporter ReportAdminForm: FILTERBY: 'Filtrera på' SearchForm: - GO: Gå + GO: Kör SEARCH: Sök SearchResults: Sökresultat SideReport: @@ -274,8 +274,8 @@ sv: EDITHEADER: 'Vem kan redigera sidor på den här sajten?' EDIT_PERMISSION: 'Redigera sajtkonfiguration' EDIT_PERMISSION_HELP: 'Möjlighet att ändra den globala åtkomstinställningar / toppnivåbehörigheter.' - PLURALNAME: 'Site Configs' - SINGULARNAME: 'Site Config' + PLURALNAME: Sajtinställningar + SINGULARNAME: Sajtinställning SITENAMEDEFAULT: 'Din Sajts Namn' SITETAGLINE: 'Din sajts Slogan' SITETITLE: Sajttitel @@ -289,12 +289,12 @@ sv: ACCESSANYONE: Alla ACCESSHEADER: 'Vem kan se den här sidan?' ACCESSLOGGEDIN: 'Inloggade användare' - ACCESSONLYTHESE: 'Bara de här (välj från listan)' + ACCESSONLYTHESE: 'Bara dessa (välj från listan)' ADDEDTODRAFTHELP: 'Sidan har inte publicerats än' ADDEDTODRAFTSHORT: Utkast - ALLOWCOMMENTS: 'Acceptera kommentar på den här sidan' + ALLOWCOMMENTS: 'Tillåt kommentar på den här sidan?' APPEARSVIRTUALPAGES: 'Detta innehåll förekommer även på en virtuell sida i sektionen {title}.' - BUTTONCANCELDRAFT: 'Upphäv utkast-ändringar' + BUTTONCANCELDRAFT: 'Ångra utkaständringar' BUTTONCANCELDRAFTDESC: 'Radera ditt utkast och återgå till den publicerade sidan' BUTTONSAVEPUBLISH: 'Spara och publicera' BUTTONUNPUBLISH: Avpublicera @@ -310,64 +310,64 @@ sv: DEFAULTHOMETITLE: Hem DELETEDPAGEHELP: 'Sidan är inte längre publicerad' DELETEDPAGESHORT: Raderad - DEPENDENT_NOTE: 'Följande sidor berörs av den här sidan. Inklusive virtuella sidor, omdirigerings sidor, och sidor med innehålls länkar.' + DEPENDENT_NOTE: 'Följande sidor berörs av den här sidan. Inklusive virtuella sidor, omdirigeringssidor, och sidor med innehållslänkar.' DESCRIPTION: 'Generisk innehållssida' DependtPageColumnLinkType: Länktyp DependtPageColumnURL: URL EDITANYONE: 'Alla som kan logga in' EDITHEADER: 'Vem kan redigera den här sidan?' EDITONLYTHESE: 'Bara de här (välj från listan)' - EDITORGROUPS: 'Redaktör Grupper' - EDIT_ALL_DESCRIPTION: 'Kan redigera alla sidor på webbplatsen' - EDIT_ALL_HELP: 'Möjlighet att redigera alla sidor på webbplatsen, oavsett inställningarna på fliken Åtkomst. Kräver "Tillgång till Sidor delen" tillåtelse' - Editors: Redigerargrupper + EDITORGROUPS: Redaktörsgrupper + EDIT_ALL_DESCRIPTION: 'Redigera alla sidor' + EDIT_ALL_HELP: 'Möjlighet att redigera alla sidor på sajten, oavsett inställningarna under Åtkomstfliken. Kräver "Tillgång till ''Sidor''-delen"' + Editors: Redaktörsgrupper HASBROKENLINKS: 'Den här sidan har trasiga länkar.' HTMLEDITORTITLE: Innehåll - INHERIT: 'Ärv från föräldrasida' - LASTUPDATED: 'Senast uppdaterade' - LINKCHANGENOTE: 'Om du ändrar sidans länkadress så kommer den också påverka länkarna på underliggande sidor' + INHERIT: 'Ärv från överordnad sida' + LASTUPDATED: 'Senast uppdaterad' + LINKCHANGENOTE: 'Om du ändrar sidans länkadress så kommer det också påverka länkarna på underliggande sidor' MENUTITLE: Navigationsetikett - METADESC: Beskrivning - METAEXTRA: 'Egna meta-taggar' - METAKEYWORDS: Nyckelord - METATITLE: Titel + METADESC: Metabeskrivning + METAEXTRA: 'Egna metataggar' + METAKEYWORDS: Metanyckelord + METATITLE: Metatitel MODIFIEDONDRAFTHELP: 'Sidan har ej publicerade ändringar' MODIFIEDONDRAFTSHORT: Ändrad MetadataToggle: Metadata - PAGELOCATION: 'Sidans adress' + PAGELOCATION: 'Sidans position' PAGETITLE: Sidnamn PAGETYPE: Sidtyp PARENTID: 'Överordnad sida' - PARENTTYPE: 'Sidans adress' + PARENTTYPE: 'Sidans position' PARENTTYPE_ROOT: 'Översta nivån' - PARENTTYPE_SUBPAGE: 'Sub-sida under en förälder sida (välj nedan)' - PERMISSION_GRANTACCESS_DESCRIPTION: 'Bestäm vilka grupper som kan redigera vissa sidor' - PERMISSION_GRANTACCESS_HELP: 'Tillåt inställning av sidspecifika åtkomstbegränsningar i "Sidor"-avsnittet.' + PARENTTYPE_SUBPAGE: 'Undersida under en överordnad sida (välj nedan)' + PERMISSION_GRANTACCESS_DESCRIPTION: 'Administrera åtkomsträttigheter för innehåll' + PERMISSION_GRANTACCESS_HELP: 'Tillåt inställning av sidspecifika åtkomstbegränsningar i "Sidor"-sektionen.' PLURALNAME: Sidträd PageTypNotAllowedOnRoot: 'Sidtypen "{type}" tillåts inte på rotnivå' PageTypeNotAllowed: 'Sidtypen "{type}" tillåts inte som barn till förälderns sida' REMOVEDFROMDRAFTHELP: 'Sidan är publicerad men har raderats från utkastet' REMOVEDFROMDRAFTSHORT: 'Radera från utkast' - REMOVE_INSTALL_WARNING: 'Varning: Du måste tabort install.php från denna SilverStripe installation p.g.a säkerhetsskäl.' + REMOVE_INSTALL_WARNING: 'Varning: Du bör radera install.php från SilverStripe-installationen p.g.a säkerhetsskäl.' REORGANISE_DESCRIPTION: 'Ändra sidstrukturen' - REORGANISE_HELP: 'Flytta om sidorna in sidträdet med drag & släpp.' + REORGANISE_HELP: 'Flytta om sidorna i sidträdet genom att dra och släppa.' SHOWINMENUS: 'Visa i menyer?' - SHOWINSEARCH: 'Visa i sökningar' + SHOWINSEARCH: 'Visa i sökningar?' SINGULARNAME: Sidträd TABBEHAVIOUR: Beteende - TABCONTENT: Innehåll + TABCONTENT: Huvudinnehåll TABDEPENDENT: 'Beroende sidor' - TOPLEVEL: 'Sajt-innehåll (Topp-nivå)' + TOPLEVEL: 'Sajtinnehåll (toppnivå)' TOPLEVELCREATORGROUPS: 'Topp-nivå skapare' URLSegment: URL-segment - VIEWERGROUPS: 'Innehålss grupp' + VIEWERGROUPS: Åtkomstgrupper VIEW_ALL_DESCRIPTION: 'Visa alla sidor' - VIEW_ALL_HELP: 'Möjlighet att visa vilken sida som helst på webbplatsen, oavsett inställningarna på fliken Åtkomst. Kräver "Tillgång till Webbplatsinnehåll" tillåtelse' + VIEW_ALL_HELP: 'Möjlighet att se alla sidor på sajten, oavsett inställningarna under Åtkomstfliken. Kräver "Tillgång till webbplatsinnehåll"' VIEW_DRAFT_CONTENT: 'Se utkast' - VIEW_DRAFT_CONTENT_HELP: 'Gäller att visa sidor i utkast läge. Användbart för externa samarbetspartners utan CMS åtkomst.' + VIEW_DRAFT_CONTENT_HELP: 'Gäller sidor visade i utkastläge utanför CMS:et. Användbart för medarbetare utan CMS-åtkomst.' Viewers: Åskådargrupper Visibility: Synlighet - has_one_Parent: Föräldrasida + has_one_Parent: 'Överordnad sida' many_many_BackLinkTracking: 'Spåra inlänkar' many_many_ImageTracking: 'Spåra bild' many_many_LinkTracking: 'Spåra länk' @@ -398,7 +398,7 @@ sv: HAVEASKED: 'Du har efterfrågat att se innehållet på vår sajt på' VirtualPage: CHOOSE: 'Välj en sida att länka till' - DESCRIPTION: 'Visa innehåll för en annan sida' + DESCRIPTION: 'Visar innehåll från en annan sida' EDITCONTENT: 'klicka här för att redigera innehållet' HEADER: 'Det här är en virutell sida' PLURALNAME: 'Virtuella sidor' diff --git a/lang/tr.yml b/lang/tr.yml index 5beb75ac..2a3b14c3 100644 --- a/lang/tr.yml +++ b/lang/tr.yml @@ -234,7 +234,7 @@ tr: CONTENT_CATEGORY: 'Content permissions' PERMISSIONS_CATEGORY: 'Roles and access permissions' RedirectorPage: - DESCRIPTION: 'Redirects to a different internal page' + DESCRIPTION: 'Başka iç sayfaya yönlendir' HASBEENSETUP: 'Yönlendirilecek yeri olmayan bir yönlendirme sayfası ayarlandı.' HEADER: 'Bu sayfa, kullanıcıları başka bir sayfaya yönlendirir' OTHERURL: 'Başka bir siteye ait URL' @@ -312,7 +312,7 @@ tr: DELETEDPAGESHORT: Deleted DEPENDENT_NOTE: 'The following pages depend on this page. This includes virtual pages, redirector pages, and pages with content links.' DESCRIPTION: 'Generic content page' - DependtPageColumnLinkType: 'Link type' + DependtPageColumnLinkType: 'Link tipi' DependtPageColumnURL: URL EDITANYONE: 'CMS''e giriş yapabilen herkes' EDITHEADER: 'Bu sayfayı kimler düzenleyebilir?' @@ -324,7 +324,7 @@ tr: HASBROKENLINKS: 'Bu sayfada hatalı linkler var.' HTMLEDITORTITLE: İçerik INHERIT: 'Üst sayfadan kalan' - LASTUPDATED: 'Last Updated' + LASTUPDATED: 'Son Güncellenen' LINKCHANGENOTE: 'Changing this page''s link will also affect the links of all child pages.' MENUTITLE: 'Navigasyon etiketi' METADESC: Tanım @@ -332,14 +332,14 @@ tr: METAKEYWORDS: 'Anahtar kelimeler' METATITLE: Başlık MODIFIEDONDRAFTHELP: 'Page has unpublished changes' - MODIFIEDONDRAFTSHORT: Modified + MODIFIEDONDRAFTSHORT: Değiştirilmiş MetadataToggle: Metadata PAGELOCATION: 'Sayfa yeri' PAGETITLE: 'Sayfa ismi' PAGETYPE: 'Sayfa tipi' PARENTID: 'Ana sayfa' PARENTTYPE: 'Sayfa konumu' - PARENTTYPE_ROOT: 'Top-level page' + PARENTTYPE_ROOT: 'Üst seviye sayfa' PARENTTYPE_SUBPAGE: 'Sub-page underneath a parent page' PERMISSION_GRANTACCESS_DESCRIPTION: 'Grupların işlem ve düzenlemelerinin kontrolü' PERMISSION_GRANTACCESS_HELP: 'Allow setting of page-specific access restrictions in the "Pages" section.' @@ -349,8 +349,8 @@ tr: REMOVEDFROMDRAFTHELP: 'Page is published, but has been deleted from draft' REMOVEDFROMDRAFTSHORT: 'Removed from draft' REMOVE_INSTALL_WARNING: 'Warning: You should remove install.php from this SilverStripe install for security reasons.' - REORGANISE_DESCRIPTION: 'Change site structure' - REORGANISE_HELP: 'Rearrange pages in the site tree through drag&drop.' + REORGANISE_DESCRIPTION: 'Site yapısını değiştir' + REORGANISE_HELP: 'Site ağacının sürükle&bırak şeklinde tekrardan düzenle' SHOWINMENUS: 'Menülerde gösterilsin mi?' SHOWINSEARCH: 'Aramalarda gösterilsin mi?' SINGULARNAME: 'Site Ağacı' @@ -366,7 +366,7 @@ tr: VIEW_DRAFT_CONTENT: 'View draft content' VIEW_DRAFT_CONTENT_HELP: 'Applies to viewing pages outside of the CMS in draft mode. Useful for external collaborators without CMS access.' Viewers: 'Görüntüleyici Grupları' - Visibility: Visibility + Visibility: Görünürlük has_one_Parent: 'Üst Sayfa' many_many_BackLinkTracking: 'Geri bağlantı izi' many_many_ImageTracking: 'İmaj izi' From 2e791abad2edf665792bebcfbcd8fcda1387ad4a Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Mon, 20 Aug 2012 22:25:18 +0200 Subject: [PATCH 3/8] Better i18n for "new page" label (fixes #7796) Also using better standard name for auto generated page names ("Page" instead of "Site Tree", "Pages" instead of "Site Tres" [sic]) --- code/controllers/CMSMain.php | 7 +++++-- code/model/SiteTree.php | 7 +++++-- lang/en.yml | 6 +++--- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/code/controllers/CMSMain.php b/code/controllers/CMSMain.php index 45cfcdb7..25db14d2 100644 --- a/code/controllers/CMSMain.php +++ b/code/controllers/CMSMain.php @@ -845,8 +845,11 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr $id = $id . $suffix; } - $newItem->Title = _t('CMSMain.NEW',"New ",'"New " followed by a className').$className; - $newItem->URLSegment = "new-" . strtolower($className); + $newItem->Title = _t( + 'CMSMain.NEWPAGE', + "New {pagetype}",'followed by a page type title', + array('pagetype' => singleton($className)->i18n_singular_name()) + ); $newItem->ClassName = $className; $newItem->ParentID = $parentID; diff --git a/code/model/SiteTree.php b/code/model/SiteTree.php index d10a1079..84e770b0 100644 --- a/code/model/SiteTree.php +++ b/code/model/SiteTree.php @@ -2709,14 +2709,17 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid function provideI18nEntities() { $entities = parent::provideI18nEntities(); - if(isset($entities['Page.SINGULARNAME'])) $entities['Page.SINGULARNAME'][3] = FRAMEWORK_DIR; - if(isset($entities['Page.PLURALNAME'])) $entities['Page.PLURALNAME'][3] = FRAMEWORK_DIR; + if(isset($entities['Page.SINGULARNAME'])) $entities['Page.SINGULARNAME'][3] = CMS_DIR; + if(isset($entities['Page.PLURALNAME'])) $entities['Page.PLURALNAME'][3] = CMS_DIR; $entities[$this->class . '.DESCRIPTION'] = array( $this->stat('description'), 'Description of the page type (shown in the "add page" dialog)' ); + $entities['SiteTree.SINGULARNAME'][0] = 'Page'; + $entities['SiteTree.PLURALNAME'][0] = 'Pages'; + return $entities; } diff --git a/lang/en.yml b/lang/en.yml index c7a41723..f0e7c730 100644 --- a/lang/en.yml +++ b/lang/en.yml @@ -82,7 +82,7 @@ en: EMAIL: Email EditTree: 'Edit Tree' ListFiltered: 'Filtered list.' - NEW: 'New ' + NEWPAGE: 'New {pagetype}' PAGENOTEXISTS: 'This page doesn''t exist' PAGES: Pages PAGETYPEANYOPT: Any @@ -333,7 +333,7 @@ en: PARENTTYPE_SUBPAGE: 'Sub-page underneath a parent page' PERMISSION_GRANTACCESS_DESCRIPTION: 'Manage access rights for content' PERMISSION_GRANTACCESS_HELP: 'Allow setting of page-specific access restrictions in the "Pages" section.' - PLURALNAME: 'Site Tres' + PLURALNAME: Pages PageTypNotAllowedOnRoot: 'Page type "{type}" is not allowed on the root level' PageTypeNotAllowed: 'Page type "{type}" not allowed as child of this parent page' REMOVEDFROMDRAFTHELP: 'Page is published, but has been deleted from draft' @@ -343,7 +343,7 @@ en: REORGANISE_HELP: 'Rearrange pages in the site tree through drag&drop.' SHOWINMENUS: 'Show in menus?' SHOWINSEARCH: 'Show in search?' - SINGULARNAME: 'Site Tree' + SINGULARNAME: Page TABBEHAVIOUR: Behavior TABCONTENT: 'Main Content' TABDEPENDENT: 'Dependent pages' From 7807842eb185f7c875a1957106f5764f32c2c487 Mon Sep 17 00:00:00 2001 From: Damian Mooyman Date: Tue, 21 Aug 2012 15:50:03 +1200 Subject: [PATCH 4/8] FIXED: Additional issue where the add-page ajax parameters wouldu incorrectly concatenate additional query parameters into the add action url. Resolved by moving URL concatenation from view to controller where Controller::join_links is available --- code/controllers/CMSMain.php | 8 ++++++-- templates/Includes/CMSMain_TreeView.ss | 2 +- .../Includes/CMSPagesController_ContentToolActions.ss | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/code/controllers/CMSMain.php b/code/controllers/CMSMain.php index e01e0175..ef9ff9ec 100644 --- a/code/controllers/CMSMain.php +++ b/code/controllers/CMSMain.php @@ -202,8 +202,12 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr return $link; } - function LinkPageAdd() { - return singleton("CMSPageAddController")->Link(); + function LinkPageAdd($extraArguments = null) { + $link = singleton("CMSPageAddController")->Link(); + $this->extend('updateLinkPageAdd', $link); + if($extraArguments) + $link = Controller::join_links ($link, $extraArguments); + return $link; } /** diff --git a/templates/Includes/CMSMain_TreeView.ss b/templates/Includes/CMSMain_TreeView.ss index 9c54d888..141c5c46 100644 --- a/templates/Includes/CMSMain_TreeView.ss +++ b/templates/Includes/CMSMain_TreeView.ss @@ -22,7 +22,7 @@ $ExtraTreeTools <% end_if %> -
+
$SiteTreeAsUL
diff --git a/templates/Includes/CMSPagesController_ContentToolActions.ss b/templates/Includes/CMSPagesController_ContentToolActions.ss index 62052846..da3eba41 100644 --- a/templates/Includes/CMSPagesController_ContentToolActions.ss +++ b/templates/Includes/CMSPagesController_ContentToolActions.ss @@ -1,5 +1,5 @@
- <% _t('CMSMain.AddNewButton', 'Add new') %> + <% _t('CMSMain.AddNewButton', 'Add new') %>
From d20eae4a50d9f5d8b8d79a45ce9c21927bc9f96d Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Thu, 23 Aug 2012 23:34:37 +0200 Subject: [PATCH 5/8] Updated translations --- lang/ru.yml | 122 ++++++++++++++++++++++++++-------------------------- lang/th.yml | 6 +-- 2 files changed, 64 insertions(+), 64 deletions(-) diff --git a/lang/ru.yml b/lang/ru.yml index 50c0357f..58b49a94 100644 --- a/lang/ru.yml +++ b/lang/ru.yml @@ -1,33 +1,33 @@ ru: AssetAdmin: - ADDFILES: 'Add Files' - ALLOWEDEXTS: 'Allowed extensions' - ActionAdd: 'Add folder' - AppCategoryArchive: Archive + ADDFILES: 'Добавить файлы' + ALLOWEDEXTS: 'Допустимые расширения' + ActionAdd: 'Добавить папку' + AppCategoryArchive: Архив AppCategoryAudio: Audio AppCategoryFlash: Flash - AppCategoryImage: Image + AppCategoryImage: Изображение AppCategoryVideo: Video - BackToFolder: 'Back to folder' + BackToFolder: 'Вернуться к папке' CREATED: Date CurrentFolderOnly: 'Limit to current folder?' DetailsView: Details FILES: Files FILESYSTEMSYNCTITLE: 'Update the CMS database entries of files on the filesystem. Useful when new files have been uploaded outside of the CMS, e.g. through FTP.' FROMTHEINTERNET: 'From the internet' - FROMYOURCOMPUTER: 'From your computer' + FROMYOURCOMPUTER: 'С компьютера' Filetype: 'File type' ListView: 'List View' - MENUTITLE: Files + MENUTITLE: Файлы NEWFOLDER: 'Новая папка' - SIZE: Size + SIZE: Размер THUMBSDELETED: '{count} unused thumbnails have been deleted' TreeView: 'Tree View' Upload: Upload AssetAdmin_DeleteBatchAction: TITLE: 'Delete folders' AssetAdmin_Tools: - FILTER: Filter + FILTER: Фильтр AssetAdmin_left.ss: GO: Перейти AssetTableField: @@ -58,25 +58,25 @@ ru: RedirectorNonExistent: 'redirector page pointing to non-existent page' VirtualPageNonExistent: 'virtual page pointing to non-existent page' CMSAddPageController: - Title: 'Add page' + Title: 'Добавить страницу' CMSBatchActions: DELETED_DRAFT_PAGES: 'Deleted %d pages from draft site, %d failures' DELETED_PAGES: 'Deleted %d pages from published site, %d failures' DELETE_DRAFT_PAGES: 'Удалить из чернового сайта' - DELETE_PAGES: 'Delete from published site' + DELETE_PAGES: 'Удалить из опубликованной версии сайта' PUBLISHED_PAGES: 'Published %d pages, %d failures' - PUBLISH_PAGES: Publish - UNPUBLISHED_PAGES: 'Un-published %d pages' + PUBLISH_PAGES: Опубликовать + UNPUBLISHED_PAGES: 'Публикация %d страниц отменена' UNPUBLISH_PAGES: Un-publish CMSFileAddController: MENUTITLE: Files CMSMain: ACCESS: 'Access to ''{title}'' section' ACCESS_HELP: 'Allow viewing of the section containing page tree and content. View and edit permissions can be handled through page specific dropdowns, as well as the separate "Content permissions".' - AddNew: 'Add new page' - AddNewButton: 'Add new' - ChoosePageParentMode: 'Choose where to create this page' - ChoosePageType: 'Choose page type' + AddNew: 'Добавить новую страницу' + AddNewButton: Добавить + ChoosePageParentMode: 'Выберите, где создать страницу' + ChoosePageType: 'Выберите тип страницы' Create: Create DELETE: 'Удалить с тестового сайта' DELETEFP: 'Удалить с опубликованного сайта' @@ -104,7 +104,7 @@ ru: ROLLEDBACKPUB: 'Rolled back to published version. New version number is #{version}' ROLLEDBACKVERSION: 'Произведен откат до версии #%d. Номер новой версии #%d' SAVE: Сохранить - SAVEDRAFT: 'Save Draft' + SAVEDRAFT: 'Сохранить черновик' TabContent: Content TabHistory: History TabSettings: Settings @@ -114,11 +114,11 @@ ru: 'APPLY FILTER': 'Apply Filter' RESET: Reset CMSPageAddController: - MENUTITLE: 'Add page' - ParentMode_child: 'Under another page' - ParentMode_top: 'Top level' + MENUTITLE: 'Добавить страницу' + ParentMode_child: 'Под другой страницей' + ParentMode_top: 'Верхний уровень' CMSPageEditController: - MENUTITLE: 'Edit Page' + MENUTITLE: 'Редактировать страницу' CMSPageHistoryController: COMPAREMODE: 'Режим сравнения (выбрать две)' COMPAREVERSIONS: 'Сравнить версии' @@ -146,7 +146,7 @@ ru: ENABLEDRAGGING: 'Drag''n''drop' MULTISELECT: Multi-selection CMSPagesController_Tools.ss: - FILTER: Filter + FILTER: Фильтр CMSSearch: FILTERDATEFROM: От FILTERDATEHEADING: Дата @@ -157,37 +157,37 @@ ru: CMSSiteTreeFilter_ChangedPages: Title: 'Changed pages' CMSSiteTreeFilter_DeletedPages: - Title: 'All pages, including deleted' + Title: 'Все страницы, включая удаленные' CMSSiteTreeFilter_Search: Title: 'Все страницы' ContentControl: - NOTEWONTBESHOWN: 'Note: this message will not be shown to your visitors' + NOTEWONTBESHOWN: 'Примечание: это сообщение не будет отображаться для посетителей' ContentController: - ARCHIVEDSITE: 'Preview version' - ARCHIVEDSITEFROM: 'Archived site from' + ARCHIVEDSITE: 'Версия для просмотра' + ARCHIVEDSITEFROM: 'Архив сайта от' CMS: CMS - DRAFTSITE: 'Draft Site' + DRAFTSITE: 'Черновой сайт' DRAFT_SITE_ACCESS_RESTRICTION: 'Вы должны войти с паролем для Системы Управления (CMS), чтобы увидеть черновое или архивное содержимое. Нажмите сюда, чтобы вернуться на опубликованный сайт.' Email: Email InstallFilesDeleted: 'Installation files have been successfully deleted.' InstallSecurityWarning: 'For security reasons you should now delete the install files, unless you are planning to reinstall later (requires admin login, see above). The web server also now only needs write access to the "assets" folder, you can remove write access from all other folders. Click here to delete the install files.' InstallSuccessCongratulations: 'SilverStripe has been successfully installed.' - LOGGEDINAS: 'Logged in as' + LOGGEDINAS: 'Залогинен как' LOGIN: Login - LOGOUT: 'Log out' + LOGOUT: Выйти NOTLOGGEDIN: 'Not logged in' - PUBLISHEDSITE: 'Published Site' + PUBLISHEDSITE: 'Опубликованный сайт' Password: Password PostInstallTutorialIntro: 'This website is a simplistic version of a SilverStripe 2 site. To extend this, please take a look at {link}.' StartEditing: 'You can start editing your site\\''s content by opening the CMS.' UnableDeleteInstall: 'Unable to delete installation files. Please delete the files below manually' - VIEWPAGEIN: 'View Page in:' + VIEWPAGEIN: 'Просмотреть страницу в:' ErrorPage: CODE: 'Код ошибки' DEFAULTERRORPAGECONTENT: '

Извините, страница, к которой вы пытаетесь получить доступ, не существует.

Пожалуйста, проверьте правильность написания ссылки и попытайтесь снова.

' DEFAULTERRORPAGETITLE: 'Страница не найдена' - DEFAULTSERVERERRORPAGECONTENT: '

Sorry, there was a problem with handling your request.

' - DEFAULTSERVERERRORPAGETITLE: 'Server error' + DEFAULTSERVERERRORPAGECONTENT: '

Не удалось обработать запрос.

' + DEFAULTSERVERERRORPAGETITLE: 'Ошибка сервера' DESCRIPTION: 'Custom content for different error cases (e.g. "Page not found")' ERRORFILEPROBLEM: 'Error opening file "{filename}" for writing. Please check file permissions.' PLURALNAME: 'Error Pags' @@ -216,11 +216,11 @@ ru: 504: '504 - Шлюз не отвечает' 505: '505 - Версия HTTP не поддерживается' Folder: - AddFolderButton: 'Add folder' + AddFolderButton: 'Добавить папку' DELETEUNUSEDTHUMBNAILS: 'Удалить неиспользуемые миниатюры' UNUSEDFILESTITLE: 'Неиспользуемые файлы' UNUSEDTHUMBNAILSTITLE: 'Неиспользуемые миниатюры' - UploadFilesButton: Upload + UploadFilesButton: Загрузить LeftAndMain: DELETED: Deleted. PreviewButton: Просмотр @@ -234,7 +234,7 @@ ru: CONTENT_CATEGORY: 'Content permissions' PERMISSIONS_CATEGORY: 'Roles and access permissions' RedirectorPage: - DESCRIPTION: 'Redirects to a different internal page' + DESCRIPTION: 'Перенаправление на другую внутреннюю страницу' HASBEENSETUP: 'Страница перенаправления установлена без указания места перенаправления.' HEADER: 'Эта страница будет перенаправлять пользователей на другую страницу' OTHERURL: 'URL другого сайта' @@ -247,7 +247,7 @@ ru: ReportAdmin: MENUTITLE: Reports ReportAdminForm: - FILTERBY: 'Filter by' + FILTERBY: 'Фильтровать по' SearchForm: GO: Выполн. SEARCH: Поиск @@ -265,32 +265,32 @@ ru: ParameterLiveCheckbox: 'Check live site' REPEMPTY: 'The {title} report is empty.' SilverStripeNavigatorLink: - ShareInstructions: 'To share a this to this page, copy and paste the link below.' - ShareLink: 'Share link' + ShareInstructions: 'Чтобы поделиться ссылкой на эту страницу, скопируйте URL ниже.' + ShareLink: 'Поделиться ссылкой' SilverStripeNavigatorLinkl: - CloseLink: Close + CloseLink: Закрыть SiteConfig: - DEFAULTTHEME: '(Use default theme)' + DEFAULTTHEME: '(Использовать тему по умолчанию)' EDITHEADER: 'Who can edit pages on this site?' EDIT_PERMISSION: 'Manage site configuration' EDIT_PERMISSION_HELP: 'Ability to edit global access settings/top-level page permissions.' PLURALNAME: 'Site Configs' SINGULARNAME: 'Site Config' - SITENAMEDEFAULT: 'Your Site Name' - SITETAGLINE: 'Site Tagline/Slogan' - SITETITLE: 'Site title' + SITENAMEDEFAULT: 'Название сайта' + SITETAGLINE: 'Подзаголовок сайта / слоган' + SITETITLE: 'Заголовок сайта' TABACCESS: Доступ TABMAIN: Главная TAGLINEDEFAULT: 'your tagline here' THEME: Theme - TOPLEVELCREATE: 'Who can create pages in the root of the site?' - VIEWHEADER: 'Who can view pages on this site?' + TOPLEVELCREATE: 'Кто может создавать страницы верхнего уровня на этом сайте?' + VIEWHEADER: 'Кто может просматривать страницы на этом сайте?' SiteTree: ACCESSANYONE: Все ACCESSHEADER: 'Кто может просматривать эту страницу на моем сайте?' ACCESSLOGGEDIN: 'Авторизованные пользователи' ACCESSONLYTHESE: 'Только эти пользователи (выберите из списка)' - ADDEDTODRAFTHELP: 'Page has not been published yet' + ADDEDTODRAFTHELP: 'Эта страница еще не опубликована' ADDEDTODRAFTSHORT: Draft ALLOWCOMMENTS: 'Разрешить комментарии для этой страницы?' APPEARSVIRTUALPAGES: 'This content also appears on the virtual pages in the {title} sections.' @@ -299,7 +299,7 @@ ru: BUTTONSAVEPUBLISH: 'Сохр. и опублик.' BUTTONUNPUBLISH: 'Отмена публикации' BUTTONUNPUBLISHDESC: 'Удалить эту страницу с опубликованного сайта' - CREATED: 'Date Created' + CREATED: 'Дата создания' Comments: Комментарии Content: 'Наполнение сайта' DEFAULTABOUTCONTENT: '

Вы можете заполнить эту страницу собственным содержимым или удалить ее и создать новые страницы.

' @@ -324,7 +324,7 @@ ru: HASBROKENLINKS: 'Эта страница содержит неверные ссылки.' HTMLEDITORTITLE: Содержимое INHERIT: 'Такие же как у родительской страницы' - LASTUPDATED: 'Last Updated' + LASTUPDATED: 'Последнее обновление' LINKCHANGENOTE: 'Changing this page''s link will also affect the links of all child pages.' MENUTITLE: 'Метка в навигации' METADESC: Описание @@ -334,22 +334,22 @@ ru: MODIFIEDONDRAFTHELP: 'Page has unpublished changes' MODIFIEDONDRAFTSHORT: Modified MetadataToggle: Metadata - PAGELOCATION: 'Page location' + PAGELOCATION: 'Расположение страницы' PAGETITLE: 'Название страницы' PAGETYPE: 'Тип страницы' - PARENTID: 'Parent page' - PARENTTYPE: 'Page location' - PARENTTYPE_ROOT: 'Top-level page' - PARENTTYPE_SUBPAGE: 'Sub-page underneath a parent page' + PARENTID: 'Родительская страница' + PARENTTYPE: 'Расположение страницы' + PARENTTYPE_ROOT: 'Страница верхнего уровня' + PARENTTYPE_SUBPAGE: 'Подстраница под родительской страницей' PERMISSION_GRANTACCESS_DESCRIPTION: 'Manage access rights for content' PERMISSION_GRANTACCESS_HELP: 'Allow setting of page-specific access restrictions in the "Pages" section.' PLURALNAME: 'Дерево сайта' PageTypNotAllowedOnRoot: 'Page type "{type}" is not allowed on the root level' PageTypeNotAllowed: 'Page type "{type}" not allowed as child of this parent page' REMOVEDFROMDRAFTHELP: 'Page is published, but has been deleted from draft' - REMOVEDFROMDRAFTSHORT: 'Removed from draft' + REMOVEDFROMDRAFTSHORT: 'Удалено из черновика' REMOVE_INSTALL_WARNING: 'Warning: You should remove install.php from this SilverStripe install for security reasons.' - REORGANISE_DESCRIPTION: 'Change site structure' + REORGANISE_DESCRIPTION: 'Изменить структуру сайта' REORGANISE_HELP: 'Rearrange pages in the site tree through drag&drop.' SHOWINMENUS: 'Показывать в меню?' SHOWINSEARCH: 'Показывать в поиске?' @@ -363,7 +363,7 @@ ru: VIEWERGROUPS: 'Viewer Groups' VIEW_ALL_DESCRIPTION: 'View any page' VIEW_ALL_HELP: 'Ability to view any page on the site, regardless of the settings on the Access tab. Requires the "Access to Site Content" permission' - VIEW_DRAFT_CONTENT: 'View draft content' + VIEW_DRAFT_CONTENT: 'Просмотреть содержимое черновика' VIEW_DRAFT_CONTENT_HELP: 'Applies to viewing pages outside of the CMS in draft mode. Useful for external collaborators without CMS access.' Viewers: 'Группы чтения' Visibility: Visibility @@ -378,7 +378,7 @@ ru: EXPORTTO: 'Экспорт в эту папку' NAME: 'Статический экспорт' TableListField: - SELECT: 'Select:' + SELECT: 'Выбрать:' TableListField.ss: NOITEMSFOUND: 'No items found' SORTASC: 'По возрастанию' @@ -392,7 +392,7 @@ ru: VIEWNEXT: 'См. следующ.' VIEWPREVIOUS: 'См. предыдущ.' TreeTools: - DisplayLabel: 'Display:' + DisplayLabel: 'Отображать:' ViewArchivedEmail.ss: CANACCESS: 'Вы можете посмотреть архивную версию сайта по этой ссылке:' HAVEASKED: 'Вы запросили просмотр содержимого нашего сайта за' diff --git a/lang/th.yml b/lang/th.yml index 86571a44..1b76b491 100644 --- a/lang/th.yml +++ b/lang/th.yml @@ -120,12 +120,12 @@ th: CMSPageEditController: MENUTITLE: แก้ไขหน้าเว็บ CMSPageHistoryController: - COMPAREMODE: 'Compare mode (select two)' + COMPAREMODE: 'โหมดเปรียบเทียบ (เลือกสองรายการ)' COMPAREVERSIONS: เปรียบเทียบรุ่น COMPARINGVERSION: 'Comparing versions {version1} and {version2}.' - MENUTITLE: History + MENUTITLE: ประวัติย้อนหลัง REVERTTOTHISVERSION: ย้อนกลับไปที่รุ่นนี้ - SHOWUNPUBLISHED: 'Show unpublished versions' + SHOWUNPUBLISHED: แสดงรุ่นที่ระงับการเผยแพร่ไว้ SHOWVERSION: แสดงข้อมูลรุ่น VIEW: view VIEWINGVERSION: 'Currently viewing version {version}.' From 6b6dfaed7b04a0b456333ab81ca92f479f8f33a3 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Sun, 26 Aug 2012 23:04:17 +0200 Subject: [PATCH 6/8] Fixed i18n namespace for "Sync Files" --- code/controllers/AssetAdmin.php | 2 +- lang/en.yml | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/code/controllers/AssetAdmin.php b/code/controllers/AssetAdmin.php index c215c299..e71e6498 100644 --- a/code/controllers/AssetAdmin.php +++ b/code/controllers/AssetAdmin.php @@ -206,7 +206,7 @@ JS '%s', _t('AssetAdmin.FILESYSTEMSYNCTITLE', 'Update the CMS database entries of files on the filesystem. Useful when new files have been uploaded outside of the CMS, e.g. through FTP.'), $this->Link('doSync'), - _t('FILESYSTEMSYNC','Sync files') + _t('AssetAdmin.FILESYSTEMSYNC','Sync files') ) ); } else { diff --git a/lang/en.yml b/lang/en.yml index f0e7c730..8179cff9 100644 --- a/lang/en.yml +++ b/lang/en.yml @@ -13,6 +13,7 @@ en: CurrentFolderOnly: 'Limit to current folder?' DetailsView: Details FILES: Files + FILESYSTEMSYNC: 'Sync files' FILESYSTEMSYNCTITLE: 'Update the CMS database entries of files on the filesystem. Useful when new files have been uploaded outside of the CMS, e.g. through FTP.' FROMTHEINTERNET: 'From the internet' FROMYOURCOMPUTER: 'From your computer' @@ -394,8 +395,6 @@ en: PLURALNAME: 'Virtual Pags' PageTypNotAllowedOnRoot: 'Original page type "{type}" is not allowed on the root level for this virtual page' SINGULARNAME: 'Virtual Page' - cms: - FILESYSTEMSYNC: 'Sync files' CMSFileAddController: MENUTITLE: Files CMSPageEditController: From 59546ccf118ba8998e312de963a38d224017398d Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Sun, 26 Aug 2012 23:05:13 +0200 Subject: [PATCH 7/8] Localized page name in "add page" dialog and dropdowns (see #7798) --- code/controllers/CMSMain.php | 7 ++++--- code/controllers/CMSPageAddController.php | 2 +- code/model/SiteTree.php | 4 +++- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/code/controllers/CMSMain.php b/code/controllers/CMSMain.php index 272898ca..8672db4b 100644 --- a/code/controllers/CMSMain.php +++ b/code/controllers/CMSMain.php @@ -468,8 +468,8 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr $addAction = $instance->i18n_singular_name(); - // Get description - $description = _t($class . '.DESCRIPTION'); + // Get description (convert 'Page' to 'SiteTree' for correct localization lookups) + $description = _t((($class == 'Page') ? 'SiteTree' : $class) . '.DESCRIPTION'); if(!$description) { $description = $instance->uninherited('description'); @@ -484,7 +484,8 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr 'AddAction' => $addAction, 'Description' => $description, // TODO Sprite support - 'IconURL' => $instance->stat('icon') + 'IconURL' => $instance->stat('icon'), + 'Title' => singleton($class)->i18n_singular_name(), ))); } diff --git a/code/controllers/CMSPageAddController.php b/code/controllers/CMSPageAddController.php index 81b17292..a16f6609 100644 --- a/code/controllers/CMSPageAddController.php +++ b/code/controllers/CMSPageAddController.php @@ -21,7 +21,7 @@ class CMSPageAddController extends CMSPageEditController { $pageTypes = array(); foreach($this->PageTypes() as $type) { $html = sprintf('%s%s', - $type->getField('ClassName'), + $type->getField('Title'), $type->getField('AddAction'), $type->getField('Description') ); diff --git a/code/model/SiteTree.php b/code/model/SiteTree.php index 84e770b0..b4a25ef7 100644 --- a/code/model/SiteTree.php +++ b/code/model/SiteTree.php @@ -2699,7 +2699,9 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid * @return String */ function i18n_singular_name() { - return _t($this->class.'.SINGULARNAME', $this->singular_name()); + // Convert 'Page' to 'SiteTree' for correct localization lookups + $class = ($this->class == 'Page') ? 'SiteTree' : $this->class; + return _t($class.'.SINGULARNAME', $this->singular_name()); } /** From 8442ed0ecdbee17c714a36e11116d5b0d93d538c Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Sun, 26 Aug 2012 23:17:07 +0200 Subject: [PATCH 8/8] i18n for report table title (see #7798) --- code/controllers/ReportAdmin.php | 2 +- lang/en.yml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/code/controllers/ReportAdmin.php b/code/controllers/ReportAdmin.php index 18a5cfb2..0eeb6439 100644 --- a/code/controllers/ReportAdmin.php +++ b/code/controllers/ReportAdmin.php @@ -163,7 +163,7 @@ class ReportAdmin extends LeftAndMain implements PermissionProvider { $gridField = new GridField('Reports',false, $this->Reports(), $gridFieldConfig); $columns = $gridField->getConfig()->getComponentByType('GridFieldDataColumns'); $columns->setDisplayFields(array( - 'title' => 'Title', + 'title' => _t('ReportAdmin.ReportTitle', 'Title'), )); $columns->setFieldFormatting(array( 'title' => '$value' diff --git a/lang/en.yml b/lang/en.yml index 8179cff9..2843f388 100644 --- a/lang/en.yml +++ b/lang/en.yml @@ -237,6 +237,8 @@ en: REDIRECTTOPAGE: 'A page on your website' SINGULARNAME: 'Redirector Page' YOURPAGE: 'Page on your website' + ReportAdmin: + ReportTitle: Title ReportAdminForm: FILTERBY: 'Filter by' SearchForm: