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

Merge remote-tracking branch 'origin/3.1'

Browse Source 
Conflicts:
	lang/en.yml
This commit is contained in:
Ingo Schommer 2013-08-07 17:20:28 +02:00
commit 5eaeb7462a
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/controllers/AssetAdmin.php
View File

@ -380,7 +380,7 @@ JS
$actions = new FieldList( $actions = new FieldList(
FormAction::create('doSearch', _t('CMSMain_left_ss.APPLY_FILTER', 'Apply Filter')) FormAction::create('doSearch', _t('CMSMain_left_ss.APPLY_FILTER', 'Apply Filter'))
->addExtraClass('ss-ui-action-constructive'), ->addExtraClass('ss-ui-action-constructive'),
Object::create('ResetFormAction', 'clear', _t('CMSMain_left.ss.RESET', 'Reset')) Object::create('ResetFormAction', 'clear', _t('CMSMain_left_ss.RESET', 'Reset'))
); );
$form = new Form($this, 'filter', $fields, $actions); $form = new Form($this, 'filter', $fields, $actions);

4
lang/en.yml
View File

@ -113,7 +113,7 @@ en:
MENUTITLE: 'Edit Page' MENUTITLE: 'Edit Page'
AddPageRestriction: 'Note: Some page types are not allowed for this selection' AddPageRestriction: 'Note: Some page types are not allowed for this selection'
CMSMain_left_ss: CMSMain_left_ss:
'APPLY FILTER': 'Apply Filter' 'APPLY_FILTER': 'Apply Filter'
RESET: Reset RESET: Reset
CMSPageAddController: CMSPageAddController:
ParentMode_child: 'Under another page' ParentMode_child: 'Under another page'
@ -266,7 +266,7 @@ en:
ParameterLiveCheckbox: 'Check live site' ParameterLiveCheckbox: 'Check live site'
REPEMPTY: 'The {title} report is empty.' REPEMPTY: 'The {title} report is empty.'
SilverStripeNavigatorLink: SilverStripeNavigatorLink:
ShareInstructions: 'To share this page, copy and paste the link below.' ShareInstructions: 'To share a this to this page, copy and paste the link below.'
ShareLink: 'Share link' ShareLink: 'Share link'
SilverStripeNavigatorLinkl: SilverStripeNavigatorLinkl:
CloseLink: Close CloseLink: Close