diff --git a/code/CMSMain.php b/code/CMSMain.php index c845d49c..1f1e1c65 100755 --- a/code/CMSMain.php +++ b/code/CMSMain.php @@ -1063,8 +1063,11 @@ JS; $this, 'SearchTreeForm', new FieldSet( - // TODO i18n - $showDefaultFields[] = new DropdownField('FilterClass', 'Pages', $filterMap), + $showDefaultFields[] = new DropdownField( + 'FilterClass', + _t('CMSMain.SearchTreeFormPagesDropdown', 'Pages'), + $filterMap + ), $showDefaultFields[] = new TextField( 'Title', _t('CMSMain.TITLEOPT', 'Title') @@ -1291,8 +1294,7 @@ JS; if(Permission::checkMember($member, 'VIEW_LANGS')) { $field = new LanguageDropdownField( 'Locale', - // TODO i18n - 'Language', + _t('CMSMAIN.LanguageDropdownLabel', 'Language'), array(), 'SiteTree', 'Locale-English', diff --git a/code/CMSSiteTreeFilter.php b/code/CMSSiteTreeFilter.php index 6eff66b1..01c09e14 100644 --- a/code/CMSSiteTreeFilter.php +++ b/code/CMSSiteTreeFilter.php @@ -115,8 +115,7 @@ class CMSSiteTreeFilter_DeletedPages extends CMSSiteTreeFilter { protected $childrenMethod = "AllHistoricalChildren"; static function title() { - // TODO i18n - return "Deleted pages"; + return _t('CMSSiteTreeFilter_DeletedPages.Title', "Deleted pages"); } function pagesIncluded() { @@ -139,8 +138,7 @@ class CMSSiteTreeFilter_DeletedPages extends CMSSiteTreeFilter { class CMSSiteTreeFilter_ChangedPages extends CMSSiteTreeFilter { static function title() { - // TODO i18n - return "Changed pages"; + return _t('CMSSiteTreeFilter_ChangedPages.Title', "Changed pages"); } function pagesIncluded() { @@ -166,8 +164,7 @@ class CMSSiteTreeFilter_ChangedPages extends CMSSiteTreeFilter { class CMSSiteTreeFilter_Search extends CMSSiteTreeFilter { static function title() { - // TODO i18n - return "All pages"; + return _t('CMSSiteTreeFilter_Search.Title', "All pages"); } /** diff --git a/javascript/CMSMain.js b/javascript/CMSMain.js index 3750b1fa..a51f8c41 100644 --- a/javascript/CMSMain.js +++ b/javascript/CMSMain.js @@ -65,7 +65,11 @@ // add default option // TODO i18n - jQuery('').appendTo(self.getSelectEl()); + jQuery( + '' + ).appendTo(self.getSelectEl()); // populate dropdown values from existing fields this.find('.field').not(':visible').each(function() { diff --git a/javascript/lang/en_US.js b/javascript/lang/en_US.js index 63d10f7b..f0d5e936 100644 --- a/javascript/lang/en_US.js +++ b/javascript/lang/en_US.js @@ -31,6 +31,7 @@ if(typeof(ss) == 'undefined' || typeof(ss.i18n) == 'undefined') { 'AssetAdmin.BATCHACTIONSDELETECONFIRM': "Do you really want to delete %s folders?", 'AssetTableField.REALLYDELETE': 'Do you really want to delete the marked files?', 'AssetTableField.MOVING': 'Moving %s file(s)', - 'SecurityAdmin.BATCHACTIONSDELETECONFIRM': "Do you really want to delete %s groups?" + 'SecurityAdmin.BATCHACTIONSDELETECONFIRM': "Do you really want to delete %s groups?", + 'CMSMAIN.AddSearchCriteria': 'Add Criteria' }); } \ No newline at end of file