Merge branch '5.3' into 5

silverstripe · Jan 9, 2025 · 533c0eb · 533c0eb
2 parents 3518d8a + 4e151be
commit 533c0eb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/Dev/BulkLoader.php b/src/Dev/BulkLoader.php
@@ -172,7 +172,7 @@ public function load($filepath)
                     if (!$record->canDelete()) {
                         $type = $record->i18n_singular_name();
                         throw new HTTPResponse_Exception(
-                            _t(__CLASS__ . '.CANNOT_DELETE', "Not allowed to delete '$type' records"),
+                            _t(__CLASS__ . '.CANNOT_DELETE', "Not allowed to delete '{type}' records", ["type" => $type]),
                             403
                         );
                     }

diff --git a/src/Dev/CsvBulkLoader.php b/src/Dev/CsvBulkLoader.php
@@ -185,7 +185,7 @@ protected function processRecord($record, $columnMap, &$results, $preview = fals
         if ($this->getCheckPermissions() && !$preview && $alreadyExists && !$existingObj->canEdit()) {
             $type = $existingObj->i18n_singular_name();
             throw new HTTPResponse_Exception(
-                _t(BulkLoader::class . '.CANNOT_EDIT', "Not allowed to edit '$type' records"),
+                _t(BulkLoader::class . '.CANNOT_EDIT', "Not allowed to edit '{type}' records", ["type" => $type]),
                 403
             );
         }
@@ -197,7 +197,7 @@ protected function processRecord($record, $columnMap, &$results, $preview = fals
         if ($this->getCheckPermissions() && !$preview && !$alreadyExists && !$obj->canCreate()) {
             $type = $obj->i18n_singular_name();
             throw new HTTPResponse_Exception(
-                _t(BulkLoader::class . '.CANNOT_CREATE', "Not allowed to create '$type' records"),
+                _t(BulkLoader::class . '.CANNOT_CREATE', "Not allowed to create '{type}' records", ["type" => $type]),
                 403
             );
         }
@@ -233,7 +233,7 @@ protected function processRecord($record, $columnMap, &$results, $preview = fals
                         if ($this->getCheckPermissions() && !$relationObj->canCreate()) {
                             $type = $relationObj->i18n_singular_name();
                             throw new HTTPResponse_Exception(
-                                _t(BulkLoader::class . '.CANNOT_CREATE', "Not allowed to create '$type' records"),
+                                _t(BulkLoader::class . '.CANNOT_CREATE', "Not allowed to create '{type}' records", ["type" => $type]),
                                 403
                             );
                         }
@@ -255,7 +255,7 @@ protected function processRecord($record, $columnMap, &$results, $preview = fals
                     if ($this->getCheckPermissions() && !$relationObj->canEdit()) {
                         $type = $relationObj->i18n_singular_name();
                         throw new HTTPResponse_Exception(
-                            _t(BulkLoader::class . '.CANNOT_EDIT', "Not allowed to edit '$type' records"),
+                            _t(BulkLoader::class . '.CANNOT_EDIT', "Not allowed to edit '{type}' records", ["type" => $type]),
                             403
                         );
                     }