Merge pull request neos#3697 from pKallert/task-translate-backend-mes…

…sages TASK: Translate backend messages
ahaeslich · Jun 25, 2024 · 56ec023 · 56ec023
2 parents ee00f76 + 3266b31
commit 56ec023
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 7 deletions.
diff --git a/Classes/Controller/BackendServiceController.php b/Classes/Controller/BackendServiceController.php
@@ -176,7 +176,9 @@ public function changeAction(array $changes): void
             $changes->apply();
 
             $success = new Info();
-            $success->setMessage(sprintf('%d change(s) successfully applied.', $count));
+            $success->setMessage(
+                $this->getLabel('changesApplied', [$count], $count)
+            );
 
             $this->feedbackCollection->add($success);
         } catch (\Exception $e) {
@@ -441,9 +443,7 @@ public function changeBaseWorkspaceAction(string $targetWorkspaceName, string $d
         } catch (WorkspaceIsNotEmptyException $exception) {
             $error = new Error();
             $error->setMessage(
-                'Your personal workspace currently contains unpublished changes.'
-                . ' In order to switch to a different target workspace you need to either publish'
-                . ' or discard pending changes first.'
+                $this->getLabel('workspaceContainsUnpublishedChanges')
             );
 
             $this->feedbackCollection->add($error);
@@ -467,7 +467,9 @@ public function changeBaseWorkspaceAction(string $targetWorkspaceName, string $d
         $documentNode = $subgraph->findNodeById($command->documentNode->nodeAggregateId);
 
         $success = new Success();
-        $success->setMessage(sprintf('Switched base workspace to %s.', $targetWorkspaceName));
+        $success->setMessage(
+            $this->getLabel('switchedBaseWorkspace', ['workspace' => $targetWorkspaceName])
+        );
         $this->feedbackCollection->add($success);
 
         $updateWorkspaceInfo = new UpdateWorkspaceInfo($contentRepositoryId, $userWorkspaceName);

diff --git a/Classes/Controller/TranslationTrait.php b/Classes/Controller/TranslationTrait.php
@@ -29,12 +29,12 @@ trait TranslationTrait
     /**
      * @param array<int|string,mixed> $arguments
      */
-    public function getLabel(string $id, array $arguments = []): string
+    public function getLabel(string $id, array $arguments = [], ?int $quantity = null): string
     {
         return $this->translator->translateById(
             $id,
             $arguments,
-            null,
+            $quantity,
             null,
             'Main',
             'Neos.Neos.Ui'

diff --git a/Resources/Private/Translations/en/Main.xlf b/Resources/Private/Translations/en/Main.xlf
@@ -326,6 +326,14 @@
                     <source>Discarded {0} changes.</source>
                 </trans-unit>
             </group>
+            <trans-unit id="switchedBaseWorkspace" xml:space="preserve">
+                <source>Switched base workspace to "{workspace}".</source>
+            </trans-unit>
+            <trans-unit id="workspaceContainsUnpublishedChanges" xml:space="preserve">
+                <source>Your personal workspace currently contains unpublished changes.
+                In order to switch to a different target workspace you need to either publish or discard pending changes first.
+                </source>
+            </trans-unit>
             <trans-unit id="syncUriPathSegment" xml:space="preserve">
                 <source>Syncronize with the title property</source>
             </trans-unit>