refactor: improved translation key

thorsten · Nov 24, 2024 · 5b4d031 · 5b4d031
1 parent 546bb8e
commit 5b4d031
Show file tree

Hide file tree

Showing 66 changed files with 138 additions and 144 deletions.
diff --git a/phpmyfaq/admin/media.browser.php b/phpmyfaq/admin/media.browser.php
@@ -92,7 +92,7 @@
 $templateVars = [
     'metaLanguage' => Translation::get('metaLanguage'),
     'notAuthenticated' => !$user->isLoggedIn(),
-    'msgNotAuthenticated' => Translation::get('err_NotAuth'),
+    'msgNotAuthenticated' => Translation::get('msgNoPermission'),
     'msgMediaSearch' => Translation::get('ad_media_name_search'),
     'isImageDirectoryMissing' => !is_dir(PMF_CONTENT_DIR . '/user/images'),
     'msgImageDirectoryMissing' => sprintf(Translation::get('ad_dir_missing'), '/images'),

diff --git a/phpmyfaq/admin/no-permission.php b/phpmyfaq/admin/no-permission.php
@@ -16,14 +16,8 @@
  */
 
 use phpMyFAQ\Template\TwigWrapper;
-use phpMyFAQ\Translation;
 
 $twig = new TwigWrapper(PMF_ROOT_DIR . '/assets/templates');
 $template = $twig->loadTemplate('@admin/no-permission.twig');
 
-echo $template->render(
-    [
-        'adminHeaderNoPermission' => Translation::get('ad_entryins_fail'),
-        'msgNoPermission' => Translation::get('err_NotAuth')
-    ]
-);
+echo $template->render();
diff --git a/phpmyfaq/assets/templates/admin/no-permission.twig b/phpmyfaq/assets/templates/admin/no-permission.twig
@@ -1,10 +1,10 @@
 <div class="d-flex justify-content-between flex-wrap flex-md-nowrap align-items-center pt-3 pb-2 mb-3 border-bottom">
     <h1 class="h2">
         <i aria-hidden="true" class="bi bi-exclamation-triangle"></i>
-        {{ adminHeaderNoPermission }}
+        {{ 'msgErrorOccurred' | translate }}
     </h1>
 </div>
 
 <p class="alert alert-danger">
-    {{ msgNoPermission }}
+    {{ 'msgNoPermission' | translate }}
 </p>
diff --git a/phpmyfaq/src/phpMyFAQ/Controller/Administration/Api/AttachmentController.php b/phpmyfaq/src/phpMyFAQ/Controller/Administration/Api/AttachmentController.php
@@ -46,7 +46,7 @@ public function delete(Request $request): JsonResponse
                 !Token::getInstance($this->container->get('session'))
                     ->verifyToken('delete-attachment', $deleteData->csrf)
             ) {
-                return $this->json(['error' => Translation::get('err_NotAuth')], Response::HTTP_UNAUTHORIZED);
+                return $this->json(['error' => Translation::get('msgNoPermission')], Response::HTTP_UNAUTHORIZED);
             }
 
             $attachment = AttachmentFactory::create($deleteData->attId);
@@ -75,7 +75,7 @@ public function refresh(Request $request): JsonResponse
                 !Token::getInstance($this->container->get('session'))
                     ->verifyToken('refresh-attachment', $dataToCheck->csrf)
             ) {
-                return $this->json(['error' => Translation::get('err_NotAuth')], Response::HTTP_UNAUTHORIZED);
+                return $this->json(['error' => Translation::get('msgNoPermission')], Response::HTTP_UNAUTHORIZED);
             }
 
             $attachment = AttachmentFactory::create($dataToCheck->attId);

diff --git a/phpmyfaq/src/phpMyFAQ/Controller/Administration/Api/CategoryController.php b/phpmyfaq/src/phpMyFAQ/Controller/Administration/Api/CategoryController.php
@@ -49,7 +49,7 @@ public function delete(Request $request): JsonResponse
         $data = json_decode($request->getContent());
 
         if (!Token::getInstance($this->container->get('session'))->verifyToken('category', $data->csrfToken)) {
-            return $this->json(['error' => Translation::get('err_NotAuth')], Response::HTTP_UNAUTHORIZED);
+            return $this->json(['error' => Translation::get('msgNoPermission')], Response::HTTP_UNAUTHORIZED);
         }
 
         [ $currentAdminUser, $currentAdminGroups ] = CurrentUser::getCurrentUserGroupId($currentUser);
@@ -151,7 +151,7 @@ public function updateOrder(Request $request): JsonResponse
         $data = json_decode($request->getContent());
 
         if (!Token::getInstance($this->container->get('session'))->verifyToken('category', $data->csrfToken)) {
-            return $this->json(['error' => Translation::get('err_NotAuth')], Response::HTTP_UNAUTHORIZED);
+            return $this->json(['error' => Translation::get('msgNoPermission')], Response::HTTP_UNAUTHORIZED);
         }
 
         $user = CurrentUser::getCurrentUser($this->configuration);

diff --git a/phpmyfaq/src/phpMyFAQ/Controller/Administration/Api/CommentController.php b/phpmyfaq/src/phpMyFAQ/Controller/Administration/Api/CommentController.php
@@ -44,7 +44,7 @@ public function delete(Request $request): JsonResponse
             !Token::getInstance($this->container->get('session'))
                 ->verifyToken('delete-comment', $data->data->{'pmf-csrf-token'})
         ) {
-            return $this->json(['error' => Translation::get('err_NotAuth')], Response::HTTP_UNAUTHORIZED);
+            return $this->json(['error' => Translation::get('msgNoPermission')], Response::HTTP_UNAUTHORIZED);
         }
 
         $comments = new Comments($this->configuration);

diff --git a/phpmyfaq/src/phpMyFAQ/Controller/Administration/Api/ConfigurationController.php b/phpmyfaq/src/phpMyFAQ/Controller/Administration/Api/ConfigurationController.php
@@ -42,7 +42,7 @@ public function sendTestMail(Request $request): JsonResponse
         $data = json_decode($request->getContent());
 
         if (!Token::getInstance($this->container->get('session'))->verifyToken('configuration', $data->csrf)) {
-            return $this->json(['error' => Translation::get('err_NotAuth')], Response::HTTP_UNAUTHORIZED);
+            return $this->json(['error' => Translation::get('msgNoPermission')], Response::HTTP_UNAUTHORIZED);
         }
 
         try {

diff --git a/phpmyfaq/src/phpMyFAQ/Controller/Administration/Api/ConfigurationTabController.php b/phpmyfaq/src/phpMyFAQ/Controller/Administration/Api/ConfigurationTabController.php
@@ -92,7 +92,7 @@ public function save(Request $request): JsonResponse
         $oldConfigurationData = $this->configuration->getAll();
 
         if (!Token::getInstance($this->container->get('session'))->verifyToken('configuration', $csrfToken)) {
-            return $this->json(['error' => Translation::get('err_NotAuth')], Response::HTTP_UNAUTHORIZED);
+            return $this->json(['error' => Translation::get('msgNoPermission')], Response::HTTP_UNAUTHORIZED);
         } else {
             // Set the new values
             $newConfigValues = [];

diff --git a/phpmyfaq/src/phpMyFAQ/Controller/Administration/Api/ExportController.php b/phpmyfaq/src/phpMyFAQ/Controller/Administration/Api/ExportController.php
@@ -83,7 +83,7 @@ public function exportReport(Request $request): Response
             !Token::getInstance($this->container->get('session'))
                 ->verifyToken('create-report', $data->{'pmf-csrf-token'})
         ) {
-            return $this->json(['error' => Translation::get('err_NotAuth')], Response::HTTP_UNAUTHORIZED);
+            return $this->json(['error' => Translation::get('msgNoPermission')], Response::HTTP_UNAUTHORIZED);
         }
 
         $text = [];

diff --git a/phpmyfaq/src/phpMyFAQ/Controller/Administration/Api/FaqController.php b/phpmyfaq/src/phpMyFAQ/Controller/Administration/Api/FaqController.php
@@ -86,7 +86,7 @@ public function create(Request $request): JsonResponse
         $data = json_decode($request->getContent())->data;
 
         if (!Token::getInstance($this->container->get('session'))->verifyToken('edit-faq', $data->{'pmf-csrf-token'})) {
-            return $this->json(['error' => Translation::get('err_NotAuth')], Response::HTTP_UNAUTHORIZED);
+            return $this->json(['error' => Translation::get('msgNoPermission')], Response::HTTP_UNAUTHORIZED);
         }
 
         // Collect FAQ data
@@ -279,7 +279,7 @@ public function update(Request $request): JsonResponse
         $data = json_decode($request->getContent())->data;
 
         if (!Token::getInstance()->verifyToken('edit-faq', $data->{'pmf-csrf-token'})) {
-            return $this->json(['error' => Translation::get('err_NotAuth')], Response::HTTP_UNAUTHORIZED);
+            return $this->json(['error' => Translation::get('msgNoPermission')], Response::HTTP_UNAUTHORIZED);
         }
 
         // Collect FAQ data
@@ -505,7 +505,7 @@ public function activate(Request $request): JsonResponse
         $checked = Filter::filterVar($data->checked, FILTER_VALIDATE_BOOLEAN);
 
         if (!Token::getInstance()->verifyToken('faq-overview', $data->csrf)) {
-            return $this->json(['error' => Translation::get('err_NotAuth')], Response::HTTP_UNAUTHORIZED);
+            return $this->json(['error' => Translation::get('msgNoPermission')], Response::HTTP_UNAUTHORIZED);
         }
 
         if (!($faqIds === false || $faqIds === [] || $faqIds === null)) {
@@ -543,7 +543,7 @@ public function sticky(Request $request): JsonResponse
         $checked = Filter::filterVar($data->checked, FILTER_VALIDATE_BOOLEAN);
 
         if (!Token::getInstance()->verifyToken('faq-overview', $data->csrf)) {
-            return $this->json(['error' => Translation::get('err_NotAuth')], Response::HTTP_UNAUTHORIZED);
+            return $this->json(['error' => Translation::get('msgNoPermission')], Response::HTTP_UNAUTHORIZED);
         }
 
         if (!($faqIds === false || $faqIds === [] || $faqIds === null)) {
@@ -583,7 +583,7 @@ public function delete(Request $request): JsonResponse
         $faqLanguage = Filter::filterVar($data->faqLanguage, FILTER_SANITIZE_SPECIAL_CHARS);
 
         if (!Token::getInstance()->verifyToken('faq-overview', $data->csrf)) {
-            return $this->json(['error' => Translation::get('err_NotAuth')], Response::HTTP_UNAUTHORIZED);
+            return $this->json(['error' => Translation::get('msgNoPermission')], Response::HTTP_UNAUTHORIZED);
         }
 
         $adminLog = new AdminLog($this->configuration);
@@ -611,7 +611,7 @@ public function search(Request $request): JsonResponse
         $data = json_decode($request->getContent());
 
         if (!Token::getInstance()->verifyToken('edit-faq', $data->csrf)) {
-            return $this->json(['error' => Translation::get('err_NotAuth')], Response::HTTP_UNAUTHORIZED);
+            return $this->json(['error' => Translation::get('msgNoPermission')], Response::HTTP_UNAUTHORIZED);
         }
 
         $faqPermission = new FaqPermission($this->configuration);
@@ -649,7 +649,7 @@ public function saveOrderOfStickyFaqs(Request $request): JsonResponse
         $data = json_decode($request->getContent());
 
         if (!Token::getInstance()->verifyToken('order-stickyfaqs', $data->csrf)) {
-            return $this->json(['error' => Translation::get('err_NotAuth')], Response::HTTP_UNAUTHORIZED);
+            return $this->json(['error' => Translation::get('msgNoPermission')], Response::HTTP_UNAUTHORIZED);
         }
 
         $faq = new Faq($this->configuration);
@@ -672,7 +672,7 @@ public function import(Request $request): JsonResponse
         }
 
         if (!Token::getInstance()->verifyToken('importfaqs', $request->request->get('csrf'))) {
-            return $this->json(['error' => Translation::get('err_NotAuth')], Response::HTTP_UNAUTHORIZED);
+            return $this->json(['error' => Translation::get('msgNoPermission')], Response::HTTP_UNAUTHORIZED);
         }
 
         $faqImport = new Import($this->configuration);

diff --git a/phpmyfaq/src/phpMyFAQ/Controller/Administration/Api/FormController.php b/phpmyfaq/src/phpMyFAQ/Controller/Administration/Api/FormController.php
@@ -42,7 +42,7 @@ public function activateInput(Request $request)
 
         $forms = new Forms($this->configuration);
         if (!Token::getInstance($this->container->get('session'))->verifyToken('activate-input', $data->csrf)) {
-            return $this->json(['error' => Translation::get('err_NotAuth')], Response::HTTP_UNAUTHORIZED);
+            return $this->json(['error' => Translation::get('msgNoPermission')], Response::HTTP_UNAUTHORIZED);
         }
 
         try {
@@ -64,7 +64,7 @@ public function setInputAsRequired(Request $request)
 
         $forms = new Forms($this->configuration);
         if (!Token::getInstance($this->container->get('session'))->verifyToken('require-input', $data->csrf)) {
-            return $this->json(['error' => Translation::get('err_NotAuth')], Response::HTTP_UNAUTHORIZED);
+            return $this->json(['error' => Translation::get('msgNoPermission')], Response::HTTP_UNAUTHORIZED);
         }
 
         try {
@@ -87,7 +87,7 @@ public function editTranslation(Request $request)
 
         $forms = new Forms($this->configuration);
         if (!Token::getInstance($this->container->get('session'))->verifyToken('edit-translation', $data->csrf)) {
-            return $this->json(['error' => Translation::get('err_NotAuth')], Response::HTTP_UNAUTHORIZED);
+            return $this->json(['error' => Translation::get('msgNoPermission')], Response::HTTP_UNAUTHORIZED);
         }
 
         try {
@@ -109,7 +109,7 @@ public function deleteTranslation(Request $request)
 
         $forms = new Forms($this->configuration);
         if (!Token::getInstance($this->container->get('session'))->verifyToken('delete-translation', $data->csrf)) {
-            return $this->json(['error' => Translation::get('err_NotAuth')], Response::HTTP_UNAUTHORIZED);
+            return $this->json(['error' => Translation::get('msgNoPermission')], Response::HTTP_UNAUTHORIZED);
         }
 
         try {
@@ -140,7 +140,7 @@ public function addTranslation(Request $request): JsonResponse
 
         $forms = new Forms($this->configuration);
         if (!Token::getInstance($this->container->get('session'))->verifyToken('add-translation', $data->csrf)) {
-            return $this->json(['error' => Translation::get('err_NotAuth')], Response::HTTP_UNAUTHORIZED);
+            return $this->json(['error' => Translation::get('msgNoPermission')], Response::HTTP_UNAUTHORIZED);
         }
 
         try {

diff --git a/phpmyfaq/src/phpMyFAQ/Controller/Administration/Api/GlossaryController.php b/phpmyfaq/src/phpMyFAQ/Controller/Administration/Api/GlossaryController.php
@@ -62,7 +62,7 @@ public function delete(Request $request): JsonResponse
         $glossaryLanguage = Filter::filterVar($data->lang, FILTER_SANITIZE_SPECIAL_CHARS);
 
         if (!Token::getInstance($this->container->get('session'))->verifyToken('delete-glossary', $data->csrf)) {
-            return $this->json(['error' => Translation::get('err_NotAuth')], Response::HTTP_UNAUTHORIZED);
+            return $this->json(['error' => Translation::get('msgNoPermission')], Response::HTTP_UNAUTHORIZED);
         }
 
         $glossary = new Glossary($this->configuration);
@@ -90,7 +90,7 @@ public function create(Request $request): JsonResponse
         $glossaryDefinition = Filter::filterVar($data->definition, FILTER_SANITIZE_SPECIAL_CHARS);
 
         if (!Token::getInstance($this->container->get('session'))->verifyToken('add-glossary', $data->csrf)) {
-            return $this->json(['error' => Translation::get('err_NotAuth')], Response::HTTP_UNAUTHORIZED);
+            return $this->json(['error' => Translation::get('msgNoPermission')], Response::HTTP_UNAUTHORIZED);
         }
 
         $glossary = new Glossary($this->configuration);
@@ -119,7 +119,7 @@ public function update(Request $request): JsonResponse
         $glossaryDefinition = Filter::filterVar($data->definition, FILTER_SANITIZE_SPECIAL_CHARS);
 
         if (!Token::getInstance($this->container->get('session'))->verifyToken('update-glossary', $data->csrf)) {
-            return $this->json(['error' => Translation::get('err_NotAuth')], Response::HTTP_UNAUTHORIZED);
+            return $this->json(['error' => Translation::get('msgNoPermission')], Response::HTTP_UNAUTHORIZED);
         }
 
         $glossary = new Glossary($this->configuration);

diff --git a/phpmyfaq/src/phpMyFAQ/Controller/Administration/Api/ImageController.php b/phpmyfaq/src/phpMyFAQ/Controller/Administration/Api/ImageController.php
@@ -45,7 +45,7 @@ public function upload(Request $request): JsonResponse
             !Token::getInstance($this->container->get('session'))
                 ->verifyToken('edit-faq', $request->query->get('csrf'))
         ) {
-            return $this->json(['error' => Translation::get('err_NotAuth')], Response::HTTP_UNAUTHORIZED);
+            return $this->json(['error' => Translation::get('msgNoPermission')], Response::HTTP_UNAUTHORIZED);
         }
 
         $file = $request->files->get('file');

diff --git a/phpmyfaq/src/phpMyFAQ/Controller/Administration/Api/InstanceController.php b/phpmyfaq/src/phpMyFAQ/Controller/Administration/Api/InstanceController.php
@@ -51,7 +51,7 @@ public function add(Request $request): JsonResponse
         $data = json_decode($request->getContent());
 
         if (!Token::getInstance($this->container->get('session'))->verifyToken('add-instance', $data->csrf)) {
-            return $this->json(['error' => Translation::get('err_NotAuth')], Response::HTTP_UNAUTHORIZED);
+            return $this->json(['error' => Translation::get('msgNoPermission')], Response::HTTP_UNAUTHORIZED);
         }
 
         $url = Filter::filterVar($data->url, FILTER_SANITIZE_SPECIAL_CHARS);
@@ -160,7 +160,7 @@ public function delete(Request $request): JsonResponse
         $data = json_decode($request->getContent());
 
         if (!Token::getInstance($this->container->get('session'))->verifyToken('delete-instance', $data->csrf)) {
-            return $this->json(['error' => Translation::get('err_NotAuth')], Response::HTTP_UNAUTHORIZED);
+            return $this->json(['error' => Translation::get('msgNoPermission')], Response::HTTP_UNAUTHORIZED);
         }
 
         $instanceId = Filter::filterVar($data->instanceId, FILTER_SANITIZE_SPECIAL_CHARS);

diff --git a/phpmyfaq/src/phpMyFAQ/Controller/Administration/Api/NewsController.php b/phpmyfaq/src/phpMyFAQ/Controller/Administration/Api/NewsController.php
@@ -46,7 +46,7 @@ public function create(Request $request): JsonResponse
         $news = new News($this->configuration);
 
         if (!Token::getInstance($this->container->get('session'))->verifyToken('save-news', $data->csrfToken)) {
-            return $this->json(['error' => Translation::get('err_NotAuth')], Response::HTTP_UNAUTHORIZED);
+            return $this->json(['error' => Translation::get('msgNoPermission')], Response::HTTP_UNAUTHORIZED);
         }
 
         $header = Filter::filterVar($data->newsHeader, FILTER_SANITIZE_SPECIAL_CHARS);
@@ -94,7 +94,7 @@ public function delete(Request $request): JsonResponse
         $news = new News($this->configuration);
 
         if (!Token::getInstance($this->container->get('session'))->verifyToken('delete-news', $data->csrfToken)) {
-            return $this->json(['error' => Translation::get('err_NotAuth')], Response::HTTP_UNAUTHORIZED);
+            return $this->json(['error' => Translation::get('msgNoPermission')], Response::HTTP_UNAUTHORIZED);
         }
 
         $deleteId = Filter::filterVar($data->id, FILTER_VALIDATE_INT);
@@ -119,7 +119,7 @@ public function update(Request $request): JsonResponse
         $news = new News($this->configuration);
 
         if (!Token::getInstance($this->container->get('session'))->verifyToken('update-news', $data->csrfToken)) {
-            return $this->json(['error' => Translation::get('err_NotAuth')], Response::HTTP_UNAUTHORIZED);
+            return $this->json(['error' => Translation::get('msgNoPermission')], Response::HTTP_UNAUTHORIZED);
         }
 
         $newsId = Filter::filterVar($data->id, FILTER_VALIDATE_INT);
@@ -168,7 +168,7 @@ public function activate(Request $request): JsonResponse
         $news = new News($this->configuration);
 
         if (!Token::getInstance($this->container->get('session'))->verifyToken('activate-news', $data->csrfToken)) {
-            return $this->json(['error' => Translation::get('err_NotAuth')], Response::HTTP_UNAUTHORIZED);
+            return $this->json(['error' => Translation::get('msgNoPermission')], Response::HTTP_UNAUTHORIZED);
         }
 
         $newsId = Filter::filterVar($data->id, FILTER_VALIDATE_INT);

diff --git a/phpmyfaq/src/phpMyFAQ/Controller/Administration/Api/QuestionController.php b/phpmyfaq/src/phpMyFAQ/Controller/Administration/Api/QuestionController.php
@@ -43,7 +43,7 @@ public function delete(Request $request): JsonResponse
             !Token::getInstance($this->container->get('session'))
                 ->verifyToken('delete-questions', $data->data->{'pmf-csrf-token'})
         ) {
-            return $this->json(['error' => Translation::get('err_NotAuth')], Response::HTTP_UNAUTHORIZED);
+            return $this->json(['error' => Translation::get('msgNoPermission')], Response::HTTP_UNAUTHORIZED);
         }
 
         $questionIds = $data->data->{'questions[]'};
@@ -60,7 +60,7 @@ public function delete(Request $request): JsonResponse
 
             return $this->json(['success' => Translation::get('ad_open_question_deleted')], Response::HTTP_OK);
         } else {
-            return $this->json(['error' => Translation::get('err_NotAuth')], Response::HTTP_UNAUTHORIZED);
+            return $this->json(['error' => Translation::get('msgNoPermission')], Response::HTTP_UNAUTHORIZED);
         }
     }
 }
diff --git a/phpmyfaq/src/phpMyFAQ/Controller/Administration/Api/SearchController.php b/phpmyfaq/src/phpMyFAQ/Controller/Administration/Api/SearchController.php
@@ -47,7 +47,7 @@ public function deleteTerm(Request $request): JsonResponse
             !Token::getInstance($this->container->get('session'))
                 ->verifyToken('delete-searchterm', $deleteData->csrf)
         ) {
-            return $this->json(['error' => Translation::get('err_NotAuth')], Response::HTTP_UNAUTHORIZED);
+            return $this->json(['error' => Translation::get('msgNoPermission')], Response::HTTP_UNAUTHORIZED);
         }
 
         $searchId = Filter::filterVar($deleteData->searchTermId, FILTER_VALIDATE_INT);

diff --git a/phpmyfaq/src/phpMyFAQ/Controller/Administration/Api/SessionController.php b/phpmyfaq/src/phpMyFAQ/Controller/Administration/Api/SessionController.php
@@ -43,7 +43,7 @@ public function export(Request $request): BinaryFileResponse|JsonResponse
         $requestData = json_decode($request->getContent());
 
         if (!Token::getInstance($this->container->get('session'))->verifyToken('export-sessions', $requestData->csrf)) {
-            return $this->json(['error' => Translation::get('err_NotAuth')], Response::HTTP_UNAUTHORIZED);
+            return $this->json(['error' => Translation::get('msgNoPermission')], Response::HTTP_UNAUTHORIZED);
         }
 
         $session = $this->container->get('phpmyfaq.admin.session');