From 8c40e6f4a34627697dabac5d7ad246f6e5d97813 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Mon, 17 May 2010 02:44:25 +0000 Subject: [PATCH] MINOR Added translations for BrokenLinksReport, ReportAdminForm.ss, AssetTableField.ss (fixes #5527, thanks Martimiz) git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@104980 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- code/reports/BrokenLinksReport.php | 6 +++--- lang/en_US.php | 15 +++++++++------ templates/Includes/AssetTableField.ss | 2 +- templates/ReportAdminForm.ss | 2 +- 4 files changed, 14 insertions(+), 11 deletions(-) diff --git a/code/reports/BrokenLinksReport.php b/code/reports/BrokenLinksReport.php index af20c5a6..a4ed908b 100644 --- a/code/reports/BrokenLinksReport.php +++ b/code/reports/BrokenLinksReport.php @@ -82,7 +82,7 @@ class BrokenLinksReport extends SS_Report { $fields = array( "Title" => array( - "title" => "Page name", + "title" => _t('BrokenLinksReport.PageName', 'Page name'), 'formatting' => sprintf( '$value', _t('BrokenLinksReport.HoverTitleEditPage', 'Edit page') @@ -105,7 +105,7 @@ class BrokenLinksReport extends SS_Report { } function parameterFields() { return new FieldSet( - new DropdownField('CheckSite', 'Check site', array( + new DropdownField('CheckSite', _t('BrokenLinksReport.CheckSite','Check site'), array( 'Published' => _t('BrokenLinksReport.CheckSiteDropdownPublished', 'Published Site'), 'Draft' => _t('BrokenLinksReport.CheckSiteDropdownDraft', 'Draft Site') )), @@ -113,7 +113,7 @@ class BrokenLinksReport extends SS_Report { 'Reason', _t('BrokenLinksReport.ReasonDropdown', 'Problem to check'), array( - '' => 'Any', + '' => _t('BrokenLinksReport.Any', 'Any'), 'BROKENFILE' => _t('BrokenLinksReport.ReasonDropdownBROKENFILE', 'Broken file'), 'BROKENLINK' => _t('BrokenLinksReport.ReasonDropdownBROKENLINK', 'Broken link'), 'VPBROKENLINK' => _t('BrokenLinksReport.ReasonDropdownVPBROKENLINK', 'Virtual page pointing to non-existent page'), diff --git a/lang/en_US.php b/lang/en_US.php index db2f845c..fd7d1f20 100755 --- a/lang/en_US.php +++ b/lang/en_US.php @@ -17,8 +17,7 @@ $lang['en_US']['AssetAdmin']['MOVEDX'] = 'Moved %s files'; $lang['en_US']['AssetAdmin']['NEWFOLDER'] = 'NewFolder'; $lang['en_US']['AssetAdmin']['NOTEMP'] = 'There is no temporary folder for uploads. Please set upload_tmp_dir in php.ini.'; $lang['en_US']['AssetAdmin']['NOTHINGTOUPLOAD'] = 'There was nothing to upload'; -$lang['en_US']['AssetAdmin']['NOWBROKEN'] = 'The following pages now have broken links:'; -$lang['en_US']['AssetAdmin']['NOWBROKEN2'] = 'Their owners have been emailed and they will fix up those pages.'; +$lang['en_US']['AssetAdmin']['NOWBROKEN'] = 'These pages now have broken links:'; $lang['en_US']['AssetAdmin']['SAVEDFILE'] = 'Saved file %s'; $lang['en_US']['AssetAdmin']['SAVEFOLDERNAME'] = 'Save folder name'; $lang['en_US']['AssetAdmin']['THUMBSDELETED'] = '%s unused thumbnails have been deleted'; @@ -47,6 +46,7 @@ $lang['en_US']['AssetTableField']['FILENAME'] = 'Filename'; $lang['en_US']['AssetTableField']['IMAGE'] = 'Image'; $lang['en_US']['AssetTableField']['LASTEDIT'] = 'Last changed'; $lang['en_US']['AssetTableField']['MAIN'] = 'Main'; +$lang['en_US']['AssetTableField']['NODATAFOUND'] = 'No %s found'; $lang['en_US']['AssetTableField']['NOLINKS'] = 'This file hasn\'t been linked to from any pages.'; $lang['en_US']['AssetTableField']['OWNER'] = 'Owner'; $lang['en_US']['AssetTableField']['PAGESLINKING'] = 'The following pages link to this file:'; @@ -58,7 +58,9 @@ $lang['en_US']['AssetTableField.ss']['DELFILE'] = 'Delete this file'; $lang['en_US']['AssetTableField.ss']['DRAGTOFOLDER'] = 'Drag to folder on left to move file'; $lang['en_US']['AssetTableField.ss']['EDIT'] = 'Edit asset'; $lang['en_US']['AssetTableField.ss']['SHOW'] = 'Show asset'; +$lang['en_US']['BrokenLinksReport']['Any'] = 'Any'; $lang['en_US']['BrokenLinksReport']['BROKENLINKS'] = 'Broken links report'; +$lang['en_US']['BrokenLinksReport']['CheckSite'] = 'Check site'; $lang['en_US']['BrokenLinksReport']['CheckSiteDropdownDraft'] = 'Draft Site'; $lang['en_US']['BrokenLinksReport']['CheckSiteDropdownPublished'] = 'Published Site'; $lang['en_US']['BrokenLinksReport']['ColumnDateLastModified'] = 'Date last modified'; @@ -69,6 +71,7 @@ $lang['en_US']['BrokenLinksReport']['HasBrokenFile'] = 'has broken file'; $lang['en_US']['BrokenLinksReport']['HasBrokenLink'] = 'has broken link'; $lang['en_US']['BrokenLinksReport']['HasBrokenLinkAndFile'] = 'has broken link and file'; $lang['en_US']['BrokenLinksReport']['HoverTitleEditPage'] = 'Edit page'; +$lang['en_US']['BrokenLinksReport']['PageName'] = 'Page name'; $lang['en_US']['BrokenLinksReport']['ReasonDropdown'] = 'Problem to check'; $lang['en_US']['BrokenLinksReport']['ReasonDropdownBROKENFILE'] = 'Broken file'; $lang['en_US']['BrokenLinksReport']['ReasonDropdownBROKENLINK'] = 'Broken link'; @@ -173,7 +176,6 @@ $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 @@ -189,6 +191,7 @@ $lang['en_US']['CMSMain_left.ss']['PUBLISHCONFIRM'] = 'Publish the selected page $lang['en_US']['CMSMain_left.ss']['SEARCH'] = 'Search'; $lang['en_US']['CMSMain_left.ss']['SEARCHTITLE'] = 'Search through URL, Title, Menu Title, & Content'; $lang['en_US']['CMSMain_left.ss']['SELECTPAGESACTIONS'] = 'Select the pages that you want to change & then click an action:'; +$lang['en_US']['CMSMain_left.ss']['SHOWITEMS'] = 'Show:'; $lang['en_US']['CMSMain_left.ss']['SHOWONLYCHANGED'] = 'Show only changed pages'; $lang['en_US']['CMSMain_left.ss']['SHOWUNPUB'] = 'Show unpublished versions'; $lang['en_US']['CMSMain_left.ss']['SITECONTENT TITLE'] = array( @@ -204,9 +207,9 @@ $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']['CHANGEDPAGES'] = 'Changed pages'; $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']['CMSSiteTreeFilter']['SEARCH'] = 'Search'; $lang['en_US']['CommentAdmin']['ACCEPT'] = 'Accept'; $lang['en_US']['CommentAdmin']['APPROVED'] = 'Accepted %s comments.'; $lang['en_US']['CommentAdmin']['APPROVEDCOMMENTS'] = 'Approved Comments'; @@ -456,7 +459,6 @@ $lang['en_US']['PageComment']['SINGULARNAME'] = array( 'Singular name of the object, used in dropdowns and to generally identify a single object in the interface' ); $lang['en_US']['PageCommentInterface']['COMMENTERURL'] = 'Your website URL'; -$lang['en_US']['PageCommentInterface']['DELETEALLCOMMENTS'] = 'Delete all comments on this page'; $lang['en_US']['PageCommentInterface']['POST'] = 'Post'; $lang['en_US']['PageCommentInterface']['SPAMQUESTION'] = 'Spam protection question: %s'; $lang['en_US']['PageCommentInterface']['YOURCOMMENT'] = 'Comments'; @@ -489,6 +491,7 @@ $lang['en_US']['ReportAdmin']['MENUTITLE'] = array( 100, 'Menu title' ); +$lang['en_US']['ReportAdminForm']['FILTERBY'] = 'Filter by'; $lang['en_US']['ReportAdmin_SiteTree.ss']['REPORTS'] = 'Reports'; $lang['en_US']['ReportAdmin_left.ss']['REPORTS'] = 'Reports'; $lang['en_US']['ReportAdmin_right.ss']['WELCOME1'] = array( diff --git a/templates/Includes/AssetTableField.ss b/templates/Includes/AssetTableField.ss index 75e4b2bd..136b95ad 100755 --- a/templates/Includes/AssetTableField.ss +++ b/templates/Includes/AssetTableField.ss @@ -48,7 +48,7 @@   <% if Markable %> <% end_if %> - No $NamePlural found + <% sprintf(_t('AssetTableField.NODATAFOUND', 'No %s found'),$NamePlural) %> <% if Can(show) %> <% end_if %> <% if Can(edit) %> <% end_if %> <% if Can(delete) %> <% end_if %> diff --git a/templates/ReportAdminForm.ss b/templates/ReportAdminForm.ss index 798b5be6..eaec9431 100644 --- a/templates/ReportAdminForm.ss +++ b/templates/ReportAdminForm.ss @@ -12,7 +12,7 @@ <% if FieldMap.Filters.Children %> -
Filter by
+
<% _t('ReportAdminForm.FILTERBY', 'Filter by') %>
<% control FieldMap.Filters %> <% control Children %>