diff --git a/admin/code/CMSMenu.php b/admin/code/CMSMenu.php
index 223031c10..d95c6d289 100644
--- a/admin/code/CMSMenu.php
+++ b/admin/code/CMSMenu.php
@@ -318,7 +318,7 @@ class CMSMenu extends Object implements IteratorAggregate, i18nEntityProvider
foreach($cmsClasses as $cmsClass) {
$defaultTitle = LeftAndMain::menu_title_for_class($cmsClass);
$ownerModule = i18n::get_owner_module($cmsClass);
- $entities["{$cmsClass}.MENUTITLE"] = array($defaultTitle, PR_HIGH, 'Menu title', $ownerModule);
+ $entities["{$cmsClass}.MENUTITLE"] = array($defaultTitle, 'Menu title', $ownerModule);
}
return $entities;
}
diff --git a/admin/code/LeftAndMain.php b/admin/code/LeftAndMain.php
index e4051c616..75b557d48 100644
--- a/admin/code/LeftAndMain.php
+++ b/admin/code/LeftAndMain.php
@@ -160,7 +160,7 @@ class LeftAndMain extends Controller implements PermissionProvider {
// can't be done in cms/_config.php as locale is not set yet
CMSMenu::add_link(
'Help',
- _t('LeftAndMain.HELP', 'Help', PR_HIGH, 'Menu title'),
+ _t('LeftAndMain.HELP', 'Help', 'Menu title'),
self::$help_link
);
@@ -1298,7 +1298,7 @@ class LeftAndMain extends Controller implements PermissionProvider {
'name' => sprintf(_t(
'CMSMain.ACCESS',
"Access to '%s' section",
- PR_MEDIUM,
+
"Item in permission selection identifying the admin section. Example: Access to 'Files & Images'"
), $title, null),
'category' => _t('Permission.CMS_ACCESS_CATEGORY', 'CMS Access')
diff --git a/admin/templates/Includes/CMSLoadingScreen.ss b/admin/templates/Includes/CMSLoadingScreen.ss
index ed896c8d7..24551c224 100644
--- a/admin/templates/Includes/CMSLoadingScreen.ss
+++ b/admin/templates/Includes/CMSLoadingScreen.ss
@@ -1,6 +1,6 @@
-
-
+
+
diff --git a/core/Core.php b/core/Core.php
index 2d51ae740..73c2238d3 100644
--- a/core/Core.php
+++ b/core/Core.php
@@ -391,8 +391,8 @@ function stripslashes_recursively(&$array) {
/**
* @see i18n::_t()
*/
-function _t($entity, $string = "", $priority = 40, $context = "") {
- return i18n::_t($entity, $string, $priority, $context);
+function _t($entity, $string = "", $context = "") {
+ return i18n::_t($entity, $string, $context);
}
/**
diff --git a/filesystem/File.php b/filesystem/File.php
index 2158fad53..65ba2cfc2 100644
--- a/filesystem/File.php
+++ b/filesystem/File.php
@@ -856,7 +856,7 @@ class File extends DataObject {
_t(
'File.INVALIDEXTENSION',
'Extension is not allowed (valid: %s)',
- PR_MEDIUM,
+
'Argument 1: Comma-separated list of valid extensions'
),
wordwrap(implode(', ',$exts))
diff --git a/filesystem/Upload.php b/filesystem/Upload.php
index 509e5eb8c..31339dcec 100644
--- a/filesystem/Upload.php
+++ b/filesystem/Upload.php
@@ -500,7 +500,7 @@ class Upload_Validator {
_t(
'File.TOOLARGE',
'Filesize is too large, maximum %s allowed.',
- PR_MEDIUM,
+
'Argument 1: Filesize (e.g. 1MB)'
),
$arg
@@ -514,7 +514,7 @@ class Upload_Validator {
_t(
'File.INVALIDEXTENSION',
'Extension is not allowed (valid: %s)',
- PR_MEDIUM,
+
'Argument 1: Comma-separated list of valid extensions'
),
wordwrap(implode(', ', $this->allowedExtensions))
diff --git a/forms/ConfirmedPasswordField.php b/forms/ConfirmedPasswordField.php
index 02a631640..889b3342a 100644
--- a/forms/ConfirmedPasswordField.php
+++ b/forms/ConfirmedPasswordField.php
@@ -107,7 +107,7 @@ class ConfirmedPasswordField extends FormField {
$title = _t(
'ConfirmedPasswordField.SHOWONCLICKTITLE',
'Change Password',
- PR_MEDIUM,
+
'Label of the link which triggers display of the "change password" formfields'
);
}
diff --git a/forms/NullableField.php b/forms/NullableField.php
index c1e17a53c..700950e0e 100644
--- a/forms/NullableField.php
+++ b/forms/NullableField.php
@@ -42,7 +42,7 @@ class NullableField extends FormField {
$this->isNullLabel = $isNullLabel;
if ( is_null($this->isNullLabel) ) {
// Set a default label if one is not provided.
- $this->isNullLabel = _t('NullableField.IsNullLabel', 'Is Null', PR_HIGH);
+ $this->isNullLabel = _t('NullableField.IsNullLabel', 'Is Null');
}
parent::__construct($valueField->getName(), $valueField->Title(), $valueField->Value(), $valueField->getForm(), $valueField->RightTitle());
$this->readonly = $valueField->isReadonly();
diff --git a/forms/TreeDropdownField.php b/forms/TreeDropdownField.php
index aa714fc98..3b6f101df 100644
--- a/forms/TreeDropdownField.php
+++ b/forms/TreeDropdownField.php
@@ -175,7 +175,7 @@ class TreeDropdownField extends FormField {
if($record) {
$title = $record->{$this->labelField};
} else {
- $title = _t('DropdownField.CHOOSE', '(Choose)', PR_MEDIUM, 'start value of a dropdown');
+ $title = _t('DropdownField.CHOOSE', '(Choose)', 'start value of a dropdown');
}
// TODO Implement for TreeMultiSelectField
diff --git a/forms/TreeMultiselectField.php b/forms/TreeMultiselectField.php
index 3529774fa..2647e0ba1 100644
--- a/forms/TreeMultiselectField.php
+++ b/forms/TreeMultiselectField.php
@@ -104,7 +104,7 @@ class TreeMultiselectField extends TreeDropdownField {
$value = implode(",", $idArray);
}
} else {
- $title = _t('DropdownField.CHOOSE', '(Choose)', PR_MEDIUM, 'start value of a dropdown');
+ $title = _t('DropdownField.CHOOSE', '(Choose)', 'start value of a dropdown');
}
return $this->createTag (
diff --git a/forms/gridfield/GridFieldAddExistingAutocompleter.php b/forms/gridfield/GridFieldAddExistingAutocompleter.php
index e019667a8..a9f1f4629 100755
--- a/forms/gridfield/GridFieldAddExistingAutocompleter.php
+++ b/forms/gridfield/GridFieldAddExistingAutocompleter.php
@@ -252,13 +252,13 @@ class GridFieldAddExistingAutocompleter implements GridField_HTMLProvider, GridF
}
if($labels) {
return sprintf(
- _t('GridField.PlaceHolderWithLabels', 'Find %s by %s', PR_MEDIUM, 'Find