Skip to content
This repository
Browse code

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

  • Loading branch information...
commit 52e69dd1fd0f6a90561f472c47bff20748d654c5 1 parent 2dc0e72
Ingo Schommer authored April 13, 2012
4  code/controllers/AssetAdmin.php
@@ -290,8 +290,8 @@ public function getSearchContext() {
290 290
 			'image' => _t('AssetAdmin.AppCategoryImage', 'Image'),
291 291
 			'audio' => _t('AssetAdmin.AppCategoryAudio', 'Audio'),
292 292
 			'mov' => _t('AssetAdmin.AppCategoryVideo', 'Video'),
293  
-			'flash' => _t('AssetAdmin.AppCategoryFlash', 'Flash', PR_MEDIUM, 'The fileformat'),
294  
-			'zip' => _t('AssetAdmin.AppCategoryArchive', 'Archive', PR_MEDIUM, 'A collection of files'),
  293
+			'flash' => _t('AssetAdmin.AppCategoryFlash', 'Flash', 'The fileformat'),
  294
+			'zip' => _t('AssetAdmin.AppCategoryArchive', 'Archive', 'A collection of files'),
295 295
 		);
296 296
 		$context->addField(
297 297
 			new DropdownField(
11  code/controllers/CMSMain.php
@@ -190,7 +190,7 @@ function SearchForm() {
190 190
 			),
191 191
 			new DropdownField(
192 192
 				'ClassName', 
193  
-				_t('CMSMain.PAGETYPEOPT','Page Type', PR_MEDIUM, 'Dropdown for limiting search to a page type'), 
  193
+				_t('CMSMain.PAGETYPEOPT','Page Type', 'Dropdown for limiting search to a page type'), 
194 194
 				$pageTypes, 
195 195
 				null, 
196 196
 				null, 
@@ -710,7 +710,6 @@ public function save($data, $form) {
710 710
 					_t(
711 711
 						'LeftAndMain.STATUSPUBLISHEDSUCCESS', 
712 712
 						"Published '%s' successfully",
713  
-						PR_MEDIUM,
714 713
 						'Status message after publishing a page, showing the page title'
715 714
 					),
716 715
 					$record->Title
@@ -743,7 +742,7 @@ public function getNewItem($id, $setID = true) {
743 742
 		    	$id = $id . $suffix;
744 743
 	    }
745 744
 
746  
-		$newItem->Title = _t('CMSMain.NEW',"New ",PR_MEDIUM,'"New " followed by a className').$className;
  745
+		$newItem->Title = _t('CMSMain.NEW',"New ",'"New " followed by a className').$className;
747 746
 		$newItem->URLSegment = "new-" . strtolower($className);
748 747
 		$newItem->ClassName = $className;
749 748
 		$newItem->ParentID = $parentID;
@@ -854,7 +853,7 @@ public function revert($data, $form) {
854 853
 		$this->response->addHeader(
855 854
 			'X-Status',
856 855
 			sprintf(
857  
-				_t('CMSMain.RESTORED',"Restored '%s' successfully",PR_MEDIUM,'Param %s is a title'),
  856
+				_t('CMSMain.RESTORED',"Restored '%s' successfully",'Param %s is a title'),
858 857
 				$record->Title
859 858
 			)
860 859
 		);
@@ -1081,7 +1080,7 @@ function publishall($request) {
1081 1080
 				first built.') . '</p>
1082 1081
 				<form method="post" action="publishall">
1083 1082
 					<input type="submit" name="confirm" value="'
1084  
-					. _t('CMSMain.PUBALLCONFIRM',"Please publish every page in the site, copying content stage to live",PR_LOW,'Confirmation button') .'" />'
  1083
+					. _t('CMSMain.PUBALLCONFIRM',"Please publish every page in the site, copying content stage to live",'Confirmation button') .'" />'
1085 1084
 					. $tokenHtml .
1086 1085
 				'</form>';
1087 1086
 		}
@@ -1106,7 +1105,7 @@ function restore($data, $form) {
1106 1105
 		$this->response->addHeader(
1107 1106
 			'X-Status',
1108 1107
 			sprintf(
1109  
-				_t('CMSMain.RESTORED',"Restored '%s' successfully",PR_MEDIUM,'Param %s is a title'),
  1108
+				_t('CMSMain.RESTORED',"Restored '%s' successfully",'Param %s is a title'),
1110 1109
 				$restoredPage->TreeTitle
1111 1110
 			)
1112 1111
 		);
22  code/model/SiteTree.php
@@ -1499,7 +1499,7 @@ function validate() {
1499 1499
 						_t(
1500 1500
 							'SiteTree.PageTypeNotAllowed', 
1501 1501
 							'Page type "%s" not allowed as child of this parent page', 
1502  
-							PR_MEDIUM,
  1502
+							
1503 1503
 							'First argument is a class name'
1504 1504
 						),
1505 1505
 						$subject->i18n_singular_name()
@@ -1516,7 +1516,7 @@ function validate() {
1516 1516
 					_t(
1517 1517
 						'SiteTree.PageTypNotAllowedOnRoot', 
1518 1518
 						'Page type "%s" is not allowed on the root level', 
1519  
-						PR_MEDIUM,
  1519
+						
1520 1520
 						'First argument is a class name'
1521 1521
 					),
1522 1522
 					$this->i18n_singular_name()
@@ -1838,7 +1838,7 @@ function getCMSFields() {
1838 1838
 				$tabMain = new Tab('Main',
1839 1839
 					new TextField("Title", $this->fieldLabel('Title')),
1840 1840
 					new TextField("MenuTitle", $this->fieldLabel('MenuTitle')),
1841  
-					$htmlField = new HtmlEditorField("Content", _t('SiteTree.HTMLEDITORTITLE', "Content", PR_MEDIUM, 'HTML editor title'))
  1841
+					$htmlField = new HtmlEditorField("Content", _t('SiteTree.HTMLEDITORTITLE', "Content", 'HTML editor title'))
1842 1842
 				),
1843 1843
 				$tabMeta = new Tab('Metadata',
1844 1844
 					$urlsegment,
@@ -1998,16 +1998,16 @@ function fieldLabels($includerelations = true) {
1998 1998
 			$labels['MetaDescription'] = _t('SiteTree.METADESC', "Meta Description");
1999 1999
 			$labels['MetaKeywords'] = _t('SiteTree.METAKEYWORDS', "Meta Keywords");
2000 2000
 			$labels['ExtraMeta'] = _t('SiteTree.METAEXTRA', "Custom Meta Tags");
2001  
-			$labels['ClassName'] = _t('SiteTree.PAGETYPE', "Page type", PR_MEDIUM, 'Classname of a page object');
2002  
-			$labels['ParentType'] = _t('SiteTree.PARENTTYPE', "Page location", PR_MEDIUM);
2003  
-			$labels['ParentID'] = _t('SiteTree.PARENTID', "Parent page", PR_MEDIUM);
  2001
+			$labels['ClassName'] = _t('SiteTree.PAGETYPE', "Page type", 'Classname of a page object');
  2002
+			$labels['ParentType'] = _t('SiteTree.PARENTTYPE', "Page location");
  2003
+			$labels['ParentID'] = _t('SiteTree.PARENTID', "Parent page");
2004 2004
 			$labels['ShowInMenus'] =_t('SiteTree.SHOWINMENUS', "Show in menus?");
2005 2005
 			$labels['ShowInSearch'] = _t('SiteTree.SHOWINSEARCH', "Show in search?");
2006 2006
 			$labels['ProvideComments'] = _t('SiteTree.ALLOWCOMMENTS', "Allow comments on this page?");
2007 2007
 			$labels['ViewerGroups'] = _t('SiteTree.VIEWERGROUPS', "Viewer Groups");
2008 2008
 			$labels['EditorGroups'] = _t('SiteTree.EDITORGROUPS', "Editor Groups");
2009  
-			$labels['URLSegment'] = _t('SiteTree.URLSegment', 'URL Segment', PR_MEDIUM, 'URL for this page');
2010  
-			$labels['Content'] = _t('SiteTree.Content', 'Content', PR_MEDIUM, 'Main HTML Content for a page');
  2009
+			$labels['URLSegment'] = _t('SiteTree.URLSegment', 'URL Segment', 'URL for this page');
  2010
+			$labels['Content'] = _t('SiteTree.Content', 'Content', 'Main HTML Content for a page');
2011 2011
 			$labels['CanViewType'] = _t('SiteTree.Viewers', 'Viewers Groups');
2012 2012
 			$labels['CanEditType'] = _t('SiteTree.Editors', 'Editors Groups');
2013 2013
 			$labels['Comments'] = _t('SiteTree.Comments', 'Comments');
@@ -2017,7 +2017,7 @@ function fieldLabels($includerelations = true) {
2017 2017
 			);
2018 2018
 			
2019 2019
 			if($includerelations){
2020  
-				$labels['Parent'] = _t('SiteTree.has_one_Parent', 'Parent Page', PR_MEDIUM, 'The parent page in the site hierarchy');
  2020
+				$labels['Parent'] = _t('SiteTree.has_one_Parent', 'Parent Page', 'The parent page in the site hierarchy');
2021 2021
 				$labels['LinkTracking'] = _t('SiteTree.many_many_LinkTracking', 'Link Tracking');
2022 2022
 				$labels['ImageTracking'] = _t('SiteTree.many_many_ImageTracking', 'Image Tracking');
2023 2023
 				$labels['BackLinkTracking'] = _t('SiteTree.many_many_BackLinkTracking', 'Backlink Tracking');
@@ -2332,7 +2332,7 @@ protected function getClassDropdown() {
2332 2332
 				$translation = _t(
2333 2333
 					'SiteTree.CHANGETO', 
2334 2334
 					'Change to "%s"', 
2335  
-					PR_MEDIUM,
  2335
+					
2336 2336
 					"Pagetype selection dropdown with class names"
2337 2337
 				);
2338 2338
 
@@ -2704,7 +2704,7 @@ function provideI18nEntities() {
2704 2704
 			$inst = singleton($type);
2705 2705
 			$entities[$type . '.DESCRIPTION'] = array(
2706 2706
 				$inst->stat('description'),
2707  
-				PR_MEDIUM,
  2707
+				
2708 2708
 				'Description of the page type (shown in the "add page" dialog)'
2709 2709
 			);
2710 2710
 		}
2  code/model/VirtualPage.php
@@ -304,7 +304,7 @@ function validate() {
304 304
 					_t(
305 305
 						'VirtualPage.PageTypNotAllowedOnRoot', 
306 306
 						'Original page type "%s" is not allowed on the root level for this virtual page', 
307  
-						PR_MEDIUM,
  307
+						
308 308
 						'First argument is a class name'
309 309
 					),
310 310
 					$orig->i18n_singular_name()
2  code/reports/SideReport.php
@@ -51,7 +51,7 @@ function forTemplate() {
51 51
 		} else {
52 52
 			$result = "<p class=\"message notice\">" . 
53 53
 				sprintf(
54  
-					_t('SideReport.REPEMPTY','The %s report is empty.',PR_MEDIUM,'%s is a report title'),
  54
+					_t('SideReport.REPEMPTY','The %s report is empty.','%s is a report title'),
55 55
 					$this->report->title()
56 56
 				) 
57 57
 				. "</p>";

0 notes on commit 52e69dd

Please sign in to comment.
Something went wrong with that request. Please try again.