tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-09-28 12:26:29 +02:00
Code Issues Projects Releases Wiki Activity

MINOR Removed usage of deprecated $priority argument for _t()

Browse Source
This commit is contained in:
Ingo Schommer 2012-04-13 21:54:56 +02:00
parent 2dc0e72c00
commit 52e69dd1fd
5 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
code/controllers/AssetAdmin.php
View File

@ -290,8 +290,8 @@ JS
'image' => _t('AssetAdmin.AppCategoryImage', 'Image'), 'image' => _t('AssetAdmin.AppCategoryImage', 'Image'),
'audio' => _t('AssetAdmin.AppCategoryAudio', 'Audio'), 'audio' => _t('AssetAdmin.AppCategoryAudio', 'Audio'),
'mov' => _t('AssetAdmin.AppCategoryVideo', 'Video'), 'mov' => _t('AssetAdmin.AppCategoryVideo', 'Video'),
'flash' => _t('AssetAdmin.AppCategoryFlash', 'Flash', PR_MEDIUM, 'The fileformat'), 'flash' => _t('AssetAdmin.AppCategoryFlash', 'Flash', 'The fileformat'),
'zip' => _t('AssetAdmin.AppCategoryArchive', 'Archive', PR_MEDIUM, 'A collection of files'), 'zip' => _t('AssetAdmin.AppCategoryArchive', 'Archive', 'A collection of files'),
); );
$context->addField( $context->addField(
new DropdownField( new DropdownField(

11
code/controllers/CMSMain.php
View File

@ -190,7 +190,7 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
), ),
new DropdownField( new DropdownField(
'ClassName', 'ClassName',
_t('CMSMain.PAGETYPEOPT','Page Type', PR_MEDIUM, 'Dropdown for limiting search to a page type'), _t('CMSMain.PAGETYPEOPT','Page Type', 'Dropdown for limiting search to a page type'),
$pageTypes, $pageTypes,
null, null,
null, null,
@ -710,7 +710,6 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
_t( _t(
'LeftAndMain.STATUSPUBLISHEDSUCCESS', 'LeftAndMain.STATUSPUBLISHEDSUCCESS',
"Published '%s' successfully", "Published '%s' successfully",
PR_MEDIUM,
'Status message after publishing a page, showing the page title' 'Status message after publishing a page, showing the page title'
), ),
$record->Title $record->Title
@ -743,7 +742,7 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
$id = $id . $suffix; $id = $id . $suffix;
} }
$newItem->Title = _t('CMSMain.NEW',"New ",PR_MEDIUM,'"New " followed by a className').$className; $newItem->Title = _t('CMSMain.NEW',"New ",'"New " followed by a className').$className;
$newItem->URLSegment = "new-" . strtolower($className); $newItem->URLSegment = "new-" . strtolower($className);
$newItem->ClassName = $className; $newItem->ClassName = $className;
$newItem->ParentID = $parentID; $newItem->ParentID = $parentID;
@ -854,7 +853,7 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
$this->response->addHeader( $this->response->addHeader(
'X-Status', 'X-Status',
sprintf( sprintf(
_t('CMSMain.RESTORED',"Restored '%s' successfully",PR_MEDIUM,'Param %s is a title'), _t('CMSMain.RESTORED',"Restored '%s' successfully",'Param %s is a title'),
$record->Title $record->Title
) )
); );
@ -1081,7 +1080,7 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
first built.') . '</p> first built.') . '</p>
<form method="post" action="publishall"> <form method="post" action="publishall">
<input type="submit" name="confirm" value="' <input type="submit" name="confirm" value="'
. _t('CMSMain.PUBALLCONFIRM',"Please publish every page in the site, copying content stage to live",PR_LOW,'Confirmation button') .'" />' . _t('CMSMain.PUBALLCONFIRM',"Please publish every page in the site, copying content stage to live",'Confirmation button') .'" />'
. $tokenHtml . . $tokenHtml .
'</form>'; '</form>';
} }
@ -1106,7 +1105,7 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
$this->response->addHeader( $this->response->addHeader(
'X-Status', 'X-Status',
sprintf( sprintf(
_t('CMSMain.RESTORED',"Restored '%s' successfully",PR_MEDIUM,'Param %s is a title'), _t('CMSMain.RESTORED',"Restored '%s' successfully",'Param %s is a title'),
$restoredPage->TreeTitle $restoredPage->TreeTitle
) )
); );

22
code/model/SiteTree.php
View File

@ -1499,7 +1499,7 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
_t( _t(
'SiteTree.PageTypeNotAllowed', 'SiteTree.PageTypeNotAllowed',
'Page type "%s" not allowed as child of this parent page', 'Page type "%s" not allowed as child of this parent page',
PR_MEDIUM,
'First argument is a class name' 'First argument is a class name'
), ),
$subject->i18n_singular_name() $subject->i18n_singular_name()
@ -1516,7 +1516,7 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
_t( _t(
'SiteTree.PageTypNotAllowedOnRoot', 'SiteTree.PageTypNotAllowedOnRoot',
'Page type "%s" is not allowed on the root level', 'Page type "%s" is not allowed on the root level',
PR_MEDIUM,
'First argument is a class name' 'First argument is a class name'
), ),
$this->i18n_singular_name() $this->i18n_singular_name()
@ -1838,7 +1838,7 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
$tabMain = new Tab('Main', $tabMain = new Tab('Main',
new TextField("Title", $this->fieldLabel('Title')), new TextField("Title", $this->fieldLabel('Title')),
new TextField("MenuTitle", $this->fieldLabel('MenuTitle')), new TextField("MenuTitle", $this->fieldLabel('MenuTitle')),
$htmlField = new HtmlEditorField("Content", _t('SiteTree.HTMLEDITORTITLE', "Content", PR_MEDIUM, 'HTML editor title')) $htmlField = new HtmlEditorField("Content", _t('SiteTree.HTMLEDITORTITLE', "Content", 'HTML editor title'))
), ),
$tabMeta = new Tab('Metadata', $tabMeta = new Tab('Metadata',
$urlsegment, $urlsegment,
@ -1998,16 +1998,16 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
$labels['MetaDescription'] = _t('SiteTree.METADESC', "Meta Description"); $labels['MetaDescription'] = _t('SiteTree.METADESC', "Meta Description");
$labels['MetaKeywords'] = _t('SiteTree.METAKEYWORDS', "Meta Keywords"); $labels['MetaKeywords'] = _t('SiteTree.METAKEYWORDS', "Meta Keywords");
$labels['ExtraMeta'] = _t('SiteTree.METAEXTRA', "Custom Meta Tags"); $labels['ExtraMeta'] = _t('SiteTree.METAEXTRA', "Custom Meta Tags");
$labels['ClassName'] = _t('SiteTree.PAGETYPE', "Page type", PR_MEDIUM, 'Classname of a page object'); $labels['ClassName'] = _t('SiteTree.PAGETYPE', "Page type", 'Classname of a page object');
$labels['ParentType'] = _t('SiteTree.PARENTTYPE', "Page location", PR_MEDIUM); $labels['ParentType'] = _t('SiteTree.PARENTTYPE', "Page location");
$labels['ParentID'] = _t('SiteTree.PARENTID', "Parent page", PR_MEDIUM); $labels['ParentID'] = _t('SiteTree.PARENTID', "Parent page");
$labels['ShowInMenus'] =_t('SiteTree.SHOWINMENUS', "Show in menus?"); $labels['ShowInMenus'] =_t('SiteTree.SHOWINMENUS', "Show in menus?");
$labels['ShowInSearch'] = _t('SiteTree.SHOWINSEARCH', "Show in search?"); $labels['ShowInSearch'] = _t('SiteTree.SHOWINSEARCH', "Show in search?");
$labels['ProvideComments'] = _t('SiteTree.ALLOWCOMMENTS', "Allow comments on this page?"); $labels['ProvideComments'] = _t('SiteTree.ALLOWCOMMENTS', "Allow comments on this page?");
$labels['ViewerGroups'] = _t('SiteTree.VIEWERGROUPS', "Viewer Groups"); $labels['ViewerGroups'] = _t('SiteTree.VIEWERGROUPS', "Viewer Groups");
$labels['EditorGroups'] = _t('SiteTree.EDITORGROUPS', "Editor Groups"); $labels['EditorGroups'] = _t('SiteTree.EDITORGROUPS', "Editor Groups");
$labels['URLSegment'] = _t('SiteTree.URLSegment', 'URL Segment', PR_MEDIUM, 'URL for this page'); $labels['URLSegment'] = _t('SiteTree.URLSegment', 'URL Segment', 'URL for this page');
$labels['Content'] = _t('SiteTree.Content', 'Content', PR_MEDIUM, 'Main HTML Content for a page'); $labels['Content'] = _t('SiteTree.Content', 'Content', 'Main HTML Content for a page');
$labels['CanViewType'] = _t('SiteTree.Viewers', 'Viewers Groups'); $labels['CanViewType'] = _t('SiteTree.Viewers', 'Viewers Groups');
$labels['CanEditType'] = _t('SiteTree.Editors', 'Editors Groups'); $labels['CanEditType'] = _t('SiteTree.Editors', 'Editors Groups');
$labels['Comments'] = _t('SiteTree.Comments', 'Comments'); $labels['Comments'] = _t('SiteTree.Comments', 'Comments');
@ -2017,7 +2017,7 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
); );
if($includerelations){ if($includerelations){
$labels['Parent'] = _t('SiteTree.has_one_Parent', 'Parent Page', PR_MEDIUM, 'The parent page in the site hierarchy'); $labels['Parent'] = _t('SiteTree.has_one_Parent', 'Parent Page', 'The parent page in the site hierarchy');
$labels['LinkTracking'] = _t('SiteTree.many_many_LinkTracking', 'Link Tracking'); $labels['LinkTracking'] = _t('SiteTree.many_many_LinkTracking', 'Link Tracking');
$labels['ImageTracking'] = _t('SiteTree.many_many_ImageTracking', 'Image Tracking'); $labels['ImageTracking'] = _t('SiteTree.many_many_ImageTracking', 'Image Tracking');
$labels['BackLinkTracking'] = _t('SiteTree.many_many_BackLinkTracking', 'Backlink Tracking'); $labels['BackLinkTracking'] = _t('SiteTree.many_many_BackLinkTracking', 'Backlink Tracking');
@ -2332,7 +2332,7 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
$translation = _t( $translation = _t(
'SiteTree.CHANGETO', 'SiteTree.CHANGETO',
'Change to "%s"', 'Change to "%s"',
PR_MEDIUM,
"Pagetype selection dropdown with class names" "Pagetype selection dropdown with class names"
); );
@ -2704,7 +2704,7 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
$inst = singleton($type); $inst = singleton($type);
$entities[$type . '.DESCRIPTION'] = array( $entities[$type . '.DESCRIPTION'] = array(
$inst->stat('description'), $inst->stat('description'),
PR_MEDIUM,
'Description of the page type (shown in the "add page" dialog)' 'Description of the page type (shown in the "add page" dialog)'
); );
} }

2
code/model/VirtualPage.php
View File

@ -304,7 +304,7 @@ class VirtualPage extends Page {
_t( _t(
'VirtualPage.PageTypNotAllowedOnRoot', 'VirtualPage.PageTypNotAllowedOnRoot',
'Original page type "%s" is not allowed on the root level for this virtual page', 'Original page type "%s" is not allowed on the root level for this virtual page',
PR_MEDIUM,
'First argument is a class name' 'First argument is a class name'
), ),
$orig->i18n_singular_name() $orig->i18n_singular_name()

2
code/reports/SideReport.php
View File

@ -51,7 +51,7 @@ class SideReportView extends ViewableData {
} else { } else {
$result = "<p class=\"message notice\">" . $result = "<p class=\"message notice\">" .
sprintf( sprintf(
_t('SideReport.REPEMPTY','The %s report is empty.',PR_MEDIUM,'%s is a report title'), _t('SideReport.REPEMPTY','The %s report is empty.','%s is a report title'),
$this->report->title() $this->report->title()
) )
. "</p>"; . "</p>";