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

MINOR Making strings in ContentControllerSearchExtension translatable (from r104596)

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112355 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Ingo Schommer 2010-10-15 00:30:30 +00:00
parent 59ae019b6d
commit 079167ccac
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lang/en_US.php
View File

@ -2,16 +2,6 @@
global $lang; global $lang;
$lang['en_US']['Page']['PLURALNAME'] = array(
'Pags',
50,
'Pural name of the object, used in dropdowns and to generally identify a collection of this object in the interface'
);
$lang['en_US']['Page']['SINGULARNAME'] = array(
'Page',
50,
'Singular name of the object, used in dropdowns and to generally identify a single object in the interface'
);
$lang['en_US']['']['NOBACKLINKEDPAGES'] = 'There are no pages linked to this page.'; $lang['en_US']['']['NOBACKLINKEDPAGES'] = 'There are no pages linked to this page.';
$lang['en_US']['AdvancedSearchForm']['ALLWORDS'] = 'All Words'; $lang['en_US']['AdvancedSearchForm']['ALLWORDS'] = 'All Words';
$lang['en_US']['AdvancedSearchForm']['ATLEAST'] = 'At Least One Of the Words'; $lang['en_US']['AdvancedSearchForm']['ATLEAST'] = 'At Least One Of the Words';
@ -409,6 +399,7 @@ $lang['en_US']['Member']['EMAIL'] = 'Email';
$lang['en_US']['Member']['EMAILSIGNUPINTRO1'] = 'Thanks for signing up to become a new member, your details are listed below for future reference.'; $lang['en_US']['Member']['EMAILSIGNUPINTRO1'] = 'Thanks for signing up to become a new member, your details are listed below for future reference.';
$lang['en_US']['Member']['EMAILSIGNUPINTRO2'] = 'You can login to the website using the credentials listed below'; $lang['en_US']['Member']['EMAILSIGNUPINTRO2'] = 'You can login to the website using the credentials listed below';
$lang['en_US']['Member']['EMAILSIGNUPSUBJECT'] = 'Thanks for signing up'; $lang['en_US']['Member']['EMAILSIGNUPSUBJECT'] = 'Thanks for signing up';
$lang['en_US']['Member']['EMPTYNEWPASSWORD'] = 'The new password can\'t be empty, please try again';
$lang['en_US']['Member']['ENTEREMAIL'] = 'Please enter an email address to get a password reset link.'; $lang['en_US']['Member']['ENTEREMAIL'] = 'Please enter an email address to get a password reset link.';
$lang['en_US']['Member']['ERRORLOCKEDOUT'] = 'Your account has been temporarily disabled because of too many failed attempts at logging in. Please try again in 20 minutes.'; $lang['en_US']['Member']['ERRORLOCKEDOUT'] = 'Your account has been temporarily disabled because of too many failed attempts at logging in. Please try again in 20 minutes.';
$lang['en_US']['Member']['ERRORNEWPASSWORD'] = 'You have entered your new password differently, try again'; $lang['en_US']['Member']['ERRORNEWPASSWORD'] = 'You have entered your new password differently, try again';
@ -421,6 +412,10 @@ $lang['en_US']['Member']['INTERFACELANG'] = array(
PR_MEDIUM, PR_MEDIUM,
'Language of the CMS' 'Language of the CMS'
); );
$lang['en_US']['Member']['INVALIDNEWPASSWORD'] = array(
'We couldn\'t accept that password: %s',
nl2br("\n".$isValid->starredList(
);
$lang['en_US']['Member']['LOGGEDINAS'] = 'You\'re logged in as %s.'; $lang['en_US']['Member']['LOGGEDINAS'] = 'You\'re logged in as %s.';
$lang['en_US']['Member']['MOBILE'] = 'Mobile'; $lang['en_US']['Member']['MOBILE'] = 'Mobile';
$lang['en_US']['Member']['NAME'] = 'Name'; $lang['en_US']['Member']['NAME'] = 'Name';
@ -462,6 +457,11 @@ $lang['en_US']['Member']['USERDETAILS'] = array(
'Headline for formfields' 'Headline for formfields'
); );
$lang['en_US']['Member']['VALIDATIONMEMBEREXISTS'] = 'A member already exists with the same %s'; $lang['en_US']['Member']['VALIDATIONMEMBEREXISTS'] = 'A member already exists with the same %s';
$lang['en_US']['Member']['ValidationIdentifierFailed'] = array(
'Can\'t overwrite existing member #%d with identical identifier (%s = %s))',
PR_MEDIUM,
'The values in brackets show a fieldname mapped to a value, usually denoting an existing email address'
);
$lang['en_US']['Member']['WELCOMEBACK'] = 'Welcome Back, %s'; $lang['en_US']['Member']['WELCOMEBACK'] = 'Welcome Back, %s';
$lang['en_US']['Member']['YOUROLDPASSWORD'] = 'Your old password'; $lang['en_US']['Member']['YOUROLDPASSWORD'] = 'Your old password';
$lang['en_US']['Member']['belongs_many_many_Groups'] = array( $lang['en_US']['Member']['belongs_many_many_Groups'] = array(
@ -597,6 +597,7 @@ $lang['en_US']['RemoveOrphanedPagesTask']['SELECTALL'] = 'select all';
$lang['en_US']['RemoveOrphanedPagesTask']['UNSELECTALL'] = 'unselect all'; $lang['en_US']['RemoveOrphanedPagesTask']['UNSELECTALL'] = 'unselect all';
$lang['en_US']['SearchForm']['GO'] = 'Go'; $lang['en_US']['SearchForm']['GO'] = 'Go';
$lang['en_US']['SearchForm']['SEARCH'] = 'Search'; $lang['en_US']['SearchForm']['SEARCH'] = 'Search';
$lang['en_US']['SearchForm']['SearchResults'] = 'Search Results';
$lang['en_US']['Security']['ALREADYLOGGEDIN'] = array( $lang['en_US']['Security']['ALREADYLOGGEDIN'] = array(
'You don\'t have access to this page. If you have another account that can access that page, you can <a href="%s">log in again</a>.', 'You don\'t have access to this page. If you have another account that can access that page, you can <a href="%s">log in again</a>.',
PR_MEDIUM, PR_MEDIUM,

8
search/ContentControllerSearchExtension.php
View File

@ -15,12 +15,12 @@ class ContentControllerSearchExtension extends Extension {
* Site search form * Site search form
*/ */
function SearchForm() { function SearchForm() {
$searchText = isset($_REQUEST['Search']) ? $_REQUEST['Search'] : 'Search'; $searchText = ($s = $this->owner->request->getVar('Search')) ? $s : _t('SearchForm.SEARCH', 'Search');
$fields = new FieldSet( $fields = new FieldSet(
new TextField('Search', '', $searchText) new TextField('Search', false, $searchText)
); );
$actions = new FieldSet( $actions = new FieldSet(
new FormAction('results', 'Search') new FormAction('results', _t('SearchForm.GO', 'Go'))
); );
return new SearchForm($this->owner, 'SearchForm', $fields, $actions); return new SearchForm($this->owner, 'SearchForm', $fields, $actions);
} }
@ -36,7 +36,7 @@ class ContentControllerSearchExtension extends Extension {
$data = array( $data = array(
'Results' => $form->getResults(), 'Results' => $form->getResults(),
'Query' => $form->getSearchQuery(), 'Query' => $form->getSearchQuery(),
'Title' => 'Search Results' 'Title' => _t('SearchForm.SearchResults', 'Search Results')
); );
return $this->owner->customise($data)->renderWith(array('Page_results', 'Page')); return $this->owner->customise($data)->renderWith(array('Page_results', 'Page'));
} }