Merge branch '1' into 2

silverstripe · Sep 9, 2022 · 4cf683c · 4cf683c
2 parents ec1111f + 36fd3f4
commit 4cf683c
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 25 deletions.
diff --git a/code/CMSProfileController.php b/code/CMSProfileController.php
@@ -2,6 +2,7 @@
 
 namespace SilverStripe\Admin;
 
+use SilverStripe\CMS\Controllers\CMSMain;
 use SilverStripe\Control\HTTPResponse;
 use SilverStripe\Forms\HiddenField;
 use SilverStripe\Forms\FormAction;
@@ -12,7 +13,6 @@
 
 class CMSProfileController extends LeftAndMain
 {
-
     private static $url_segment = 'myprofile';
 
     private static $menu_title = 'My Profile';
@@ -34,7 +34,7 @@ public function getEditForm($id = null, $fields = null)
         $form->Fields()->removeByName('LastVisited');
         $form->Fields()->push(new HiddenField('ID', null, Security::getCurrentUser()->ID));
         $form->Actions()->push(
-            FormAction::create('save', _t('SilverStripe\\CMS\\Controllers\\CMSMain.SAVE', 'Save'))
+            FormAction::create('save', _t(CMSMain::class . '.SAVE', 'Save'))
                 ->addExtraClass('btn-primary font-icon-save')
                 ->setUseButtonTag(true)
         );

diff --git a/code/GroupImportForm.php b/code/GroupImportForm.php
@@ -58,7 +58,7 @@ public function __construct($controller, $name, $fields = null, $actions = null,
                 $fileField = new FileField(
                     'CsvFile',
                     DBField::create_field('HTMLFragment', _t(
-                        'SilverStripe\\Admin\\MemberImportForm.FileFieldLabel',
+                        MemberImportForm::class . '.FileFieldLabel',
                         'CSV File <small>(Allowed extensions: *.csv)</small>'
                     ))
                 )
@@ -67,7 +67,7 @@ public function __construct($controller, $name, $fields = null, $actions = null,
         }
 
         if (!$actions) {
-            $action = new FormAction('doImport', _t('SilverStripe\\Admin\\MemberImportForm.BtnImport', 'Import from CSV'));
+            $action = new FormAction('doImport', _t(MemberImportForm::class . '.BtnImport', 'Import from CSV'));
             $action->addExtraClass('btn btn-outline-secondary font-icon-upload');
             $actions = new FieldList($action);
         }
@@ -112,7 +112,7 @@ public function doImport($data, $form)
                 ['count' => $result->DeletedCount()]
             );
         }
-        $msg = ($msgArr) ? implode(',', $msgArr) : _t('SilverStripe\\Admin\\MemberImportForm.ResultNone', 'No changes');
+        $msg = ($msgArr) ? implode(',', $msgArr) : _t(MemberImportForm::class . '.ResultNone', 'No changes');
 
         $this->sessionMessage($msg, 'good');
 

diff --git a/code/LeftAndMain.php b/code/LeftAndMain.php
@@ -6,6 +6,7 @@
 use InvalidArgumentException;
 use LogicException;
 use ReflectionClass;
+use SilverStripe\CMS\Controllers\CMSMain;
 use SilverStripe\CMS\Controllers\SilverStripeNavigator;
 use SilverStripe\Control\ContentNegotiator;
 use SilverStripe\Control\Controller;
@@ -1452,14 +1453,14 @@ public function getEditForm($id = null, $fields = null)
             if (!$actions || !$actions->count()) {
                 if ($record->hasMethod('canEdit') && $record->canEdit()) {
                     $actions->push(
-                        FormAction::create('save', _t('SilverStripe\\CMS\\Controllers\\CMSMain.SAVE', 'Save'))
+                        FormAction::create('save', _t(CMSMain::class . '.SAVE', 'Save'))
                             ->addExtraClass('btn btn-primary')
                             ->addExtraClass('font-icon-add-circle')
                     );
                 }
                 if ($record->hasMethod('canDelete') && $record->canDelete()) {
                     $actions->push(
-                        FormAction::create('delete', _t('SilverStripe\\Admin\\ModelAdmin.DELETE', 'Delete'))
+                        FormAction::create('delete', _t(ModelAdmin::class . '.DELETE', 'Delete'))
                             ->addExtraClass('btn btn-secondary')
                     );
                 }
@@ -1968,7 +1969,7 @@ public function providePermissions()
         $perms = [
             "CMS_ACCESS_LeftAndMain" => [
                 'name' => _t(__CLASS__ . '.ACCESSALLINTERFACES', 'Access to all CMS sections'),
-                'category' => _t('SilverStripe\\Security\\Permission.CMS_ACCESS_CATEGORY', 'CMS Access'),
+                'category' => _t(Permission::class . '.CMS_ACCESS_CATEGORY', 'CMS Access'),
                 'help' => _t(__CLASS__ . '.ACCESSALLINTERFACESHELP', 'Overrules more specific access settings.'),
                 'sort' => -100
             ]
@@ -1999,12 +2000,12 @@ public function providePermissions()
             $title = LeftAndMain::menu_title($class);
             $perms[$code] = [
                 'name' => _t(
-                    'SilverStripe\\CMS\\Controllers\\CMSMain.ACCESS',
+                    CMSMain::class . '.ACCESS',
                     "Access to '{title}' section",
                     "Item in permission selection identifying the admin section. Example: Access to 'Files & Images'",
                     ['title' => $title]
                 ),
-                'category' => _t('SilverStripe\\Security\\Permission.CMS_ACCESS_CATEGORY', 'CMS Access')
+                'category' => _t(Permission::class . '.CMS_ACCESS_CATEGORY', 'CMS Access')
             ];
         }
 

diff --git a/code/MemberImportForm.php b/code/MemberImportForm.php
@@ -58,7 +58,7 @@ public function __construct($controller, $name, $fields = null, $actions = null,
                 $fileField = new FileField(
                     'CsvFile',
                     DBField::create_field('HTMLFragment', _t(
-                        'SilverStripe\\Admin\\MemberImportForm.FileFieldLabel',
+                        __CLASS__ . '.FileFieldLabel',
                         'CSV File <small>(Allowed extensions: *.csv)</small>'
                     ))
                 )
@@ -67,7 +67,7 @@ public function __construct($controller, $name, $fields = null, $actions = null,
         }
 
         if (!$actions) {
-            $action = new FormAction('doImport', _t('SilverStripe\\Admin\\MemberImportForm.BtnImport', 'Import from CSV'));
+            $action = new FormAction('doImport', _t(__CLASS__ . '.BtnImport', 'Import from CSV'));
             $action->addExtraClass('btn btn-outline-secondary font-icon-upload');
             $actions = new FieldList($action);
         }

diff --git a/code/ModelAdmin.php b/code/ModelAdmin.php
@@ -292,7 +292,7 @@ function ($form) {
             $config->addComponent(
                 GridFieldImportButton::create('buttons-before-left')
                     ->setImportForm($this->ImportForm())
-                    ->setModalTitle(_t('SilverStripe\\Admin\\ModelAdmin.IMPORT', 'Import from CSV'))
+                    ->setModalTitle(_t(__CLASS__ . '.IMPORT', 'Import from CSV'))
             );
         }
 
@@ -569,13 +569,13 @@ public function ImportForm()
         $fields->push(
             new CheckboxField(
                 'EmptyBeforeImport',
-                _t('SilverStripe\\Admin\\ModelAdmin.EMPTYBEFOREIMPORT', 'Replace data'),
+                _t(__CLASS__ . '.EMPTYBEFOREIMPORT', 'Replace data'),
                 false
             )
         );
 
         $actions = new FieldList(
-            FormAction::create('import', _t('SilverStripe\\Admin\\ModelAdmin.IMPORT', 'Import from CSV'))
+            FormAction::create('import', _t(__CLASS__ . '.IMPORT', 'Import from CSV'))
                 ->addExtraClass('btn btn-outline-secondary font-icon-upload')
         );
 
@@ -623,7 +623,7 @@ public function import($data, $form, $request)
             file_get_contents($_FILES['_CsvFile']['tmp_name'] ?? '') == ''
         ) {
             $form->sessionMessage(
-                _t('SilverStripe\\Admin\\ModelAdmin.NOCSVFILE', 'Please browse for a CSV file to import'),
+                _t(__CLASS__ . '.NOCSVFILE', 'Please browse for a CSV file to import'),
                 ValidationResult::TYPE_ERROR
             );
             $this->redirectBack();
@@ -640,30 +640,30 @@ public function import($data, $form, $request)
         if ($results) {
             if ($results->CreatedCount()) {
                 $message .= _t(
-                    'SilverStripe\\Admin\\ModelAdmin.IMPORTEDRECORDS',
+                    __CLASS__ . '.IMPORTEDRECORDS',
                     "Imported {count} records.",
                     ['count' => $results->CreatedCount()]
                 );
             }
             if ($results && $results->UpdatedCount()) {
                 $message .= _t(
-                    'SilverStripe\\Admin\\ModelAdmin.UPDATEDRECORDS',
+                    __CLASS__ . '.UPDATEDRECORDS',
                     "Updated {count} records.",
                     ['count' => $results->UpdatedCount()]
                 );
             }
             if ($results->DeletedCount()) {
                 $message .= _t(
-                    'SilverStripe\\Admin\\ModelAdmin.DELETEDRECORDS',
+                    __CLASS__ . '.DELETEDRECORDS',
                     "Deleted {count} records.",
                     ['count' => $results->DeletedCount()]
                 );
             }
             if (!$results->CreatedCount() && !$results->UpdatedCount()) {
-                $message .= _t('SilverStripe\\Admin\\ModelAdmin.NOIMPORT', "Nothing to import");
+                $message .= _t(__CLASS__ . '.NOIMPORT', "Nothing to import");
             }
         } else {
-            $message .= _t('SilverStripe\\Admin\\ModelAdmin.NOIMPORT', "Nothing to import");
+            $message .= _t(__CLASS__ . '.NOIMPORT', "Nothing to import");
         }
 
         $form->sessionMessage($message, 'good');

diff --git a/code/SecurityAdmin.php b/code/SecurityAdmin.php
@@ -2,6 +2,7 @@
 
 namespace SilverStripe\Admin;
 
+use SilverStripe\CMS\Controllers\CMSMain;
 use SilverStripe\Control\HTTPRequest;
 use SilverStripe\Control\HTTPResponse;
 use SilverStripe\Core\Convert;
@@ -318,11 +319,11 @@ public function providePermissions()
         return [
             "CMS_ACCESS_SecurityAdmin" => [
                 'name' => _t(
-                    'SilverStripe\\CMS\\Controllers\\CMSMain.ACCESS',
+                    CMSMain::class . '.ACCESS',
                     "Access to '{title}' section",
                     ['title' => $title]
                 ),
-                'category' => _t('SilverStripe\\Security\\Permission.CMS_ACCESS_CATEGORY', 'CMS Access'),
+                'category' => _t(Permission::class . '.CMS_ACCESS_CATEGORY', 'CMS Access'),
                 'help' => _t(
                     __CLASS__ . '.ACCESS_HELP',
                     'Allow viewing, adding and editing users, as well as assigning permissions and roles to them.'
@@ -331,7 +332,7 @@ public function providePermissions()
             'EDIT_PERMISSIONS' => [
                 'name' => _t(__CLASS__ . '.EDITPERMISSIONS', 'Manage permissions for groups'),
                 'category' => _t(
-                    'SilverStripe\\Security\\Permission.PERMISSIONS_CATEGORY',
+                    Permission::class . '.PERMISSIONS_CATEGORY',
                     'Roles and access permissions'
                 ),
                 'help' => _t(
@@ -344,7 +345,7 @@ public function providePermissions()
             'APPLY_ROLES' => [
                 'name' => _t(__CLASS__ . '.APPLY_ROLES', 'Apply roles to groups'),
                 'category' => _t(
-                    'SilverStripe\\Security\\Permission.PERMISSIONS_CATEGORY',
+                    Permission::class . '.PERMISSIONS_CATEGORY',
                     'Roles and access permissions'
                 ),
                 'help' => _t(