resolve conflicts

spryker · Jul 8, 2020 · 0ee9aa4 · 0ee9aa4
2 parents 3823349 + 8fbd428
commit 0ee9aa4
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/data/translation/Zed/de_DE.csv b/data/translation/Zed/de_DE.csv
@@ -5,7 +5,7 @@ Action,Aktion
 "Assigned groups","Zugewiesene Gruppen"
 "Assigned Roles","Zugewiesene Rollen"
 "Assigned Rules","Zugeordnete Regeln"
-Bundle,Bundle
+Bundle,Bündel
 Controller,Controller
 "Could not modify root role node!","Knotenpunkt kann nicht geändert werden"
 Create,Erstellen
@@ -54,3 +54,9 @@ Save,Speichern
 "User was updated successfully.","Nutzer wurde erfolgreich aktualisiert."
 Users,Nutzer
 "Users Control",User-Verwaltung
+Groups,Gruppen
+allow,zulassen
+deny,verweigern
+"Edit Role","Rolle bearbeiten"
+"Created At","Erstellt am"
+"Create new Group","Neue Gruppe erstellen"
diff --git a/data/translation/Zed/en_US.csv b/data/translation/Zed/en_US.csv
@@ -54,3 +54,9 @@ Save,Save
 "User was updated successfully.","User was updated successfully."
 Users,Users
 "Users Control","Users Control"
+Groups,Groups
+allow,allow
+deny,deny
+"Edit Role","Edit Role"
+"Created At","Created At"
+"Create new Group","Create new Group"
diff --git a/src/Spryker/Zed/Acl/Communication/Controller/RoleController.php b/src/Spryker/Zed/Acl/Communication/Controller/RoleController.php
@@ -73,7 +73,8 @@ public function createAction(Request $request)
                 $roleTransfer = $this->getFacade()->addRole($formData[RoleForm::FIELD_NAME]);
 
                 $this->addSuccessMessage(
-                    sprintf('Role "%s" successfully added.', $formData[RoleForm::FIELD_NAME])
+                    'Role "%s" successfully added.',
+                    ['%s' => $formData[RoleForm::FIELD_NAME]]
                 );
 
                 return $this->redirectResponse(
@@ -243,7 +244,8 @@ protected function handleRoleForm(Request $request, FormInterface $roleForm)
             try {
                 $this->getFacade()->updateRole($roleTransfer);
                 $this->addSuccessMessage(
-                    sprintf('Role "%s" successfully updated.', $roleTransfer->getName())
+                    'Role "%s" successfully updated.',
+                    ['%s' => $roleTransfer->getName()]
                 );
             } catch (RoleNameExistsException $e) {
                 $this->addErrorMessage($e->getMessage());