[BUGFIX] Use editors language in admin panel instead of site language

The translations need to use the language of the current backend user and not the one of the current language of the site in the frontend. Resolves: #96004 Releases: master, 11.5, 10.4 Change-Id: Id409e759de4f0324835cc932f87719147b6e1b0f Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/72362 Tested-by: core-ci <typo3@b13.com> Tested-by: Georg Ringer <georg.ringer@gmail.com> Reviewed-by: Georg Ringer <georg.ringer@gmail.com>
TYPO3 · Dec 1, 2021 · 473410a · 473410a
1 parent 04640cd
commit 473410a
Show file tree

Hide file tree

Showing 30 changed files with 111 additions and 69 deletions.
diff --git a/typo3/sysext/adminpanel/Classes/Controller/MainController.php b/typo3/sysext/adminpanel/Classes/Controller/MainController.php
@@ -32,6 +32,7 @@
 use TYPO3\CMS\Adminpanel\Utility\ResourceUtility;
 use TYPO3\CMS\Adminpanel\Utility\StateUtility;
 use TYPO3\CMS\Backend\Routing\UriBuilder;
+use TYPO3\CMS\Core\Authentication\BackendUserAuthentication;
 use TYPO3\CMS\Core\Cache\CacheManager;
 use TYPO3\CMS\Core\SingletonInterface;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
@@ -127,6 +128,7 @@ public function render(ServerRequestInterface $request): string
                 'toggleActiveUrl' => $this->generateBackendUrl('ajax_adminPanel_toggle'),
                 'resources' => $resources,
                 'adminPanelActive' => StateUtility::isOpen(),
+                'languageKey' => $this->getBackendUser()->user['lang'],
             ]
         );
         if (StateUtility::isOpen()) {
@@ -244,4 +246,9 @@ protected function storeDataPerModule(ServerRequestInterface $request, array $mo
         }
         return $data;
     }
+
+    protected function getBackendUser(): BackendUserAuthentication
+    {
+        return $GLOBALS['BE_USER'];
+    }
 }
diff --git a/typo3/sysext/adminpanel/Classes/ModuleApi/AbstractSubModule.php b/typo3/sysext/adminpanel/Classes/ModuleApi/AbstractSubModule.php
@@ -17,6 +17,7 @@
 
 namespace TYPO3\CMS\Adminpanel\ModuleApi;
 
+use TYPO3\CMS\Core\Authentication\BackendUserAuthentication;
 use TYPO3\CMS\Core\Localization\LanguageService;
 
 /**
@@ -35,4 +36,9 @@ protected function getLanguageService(): LanguageService
     {
         return $GLOBALS['LANG'];
     }
+
+    protected function getBackendUser(): BackendUserAuthentication
+    {
+        return $GLOBALS['BE_USER'];
+    }
 }
diff --git a/typo3/sysext/adminpanel/Classes/Modules/CacheModule.php b/typo3/sysext/adminpanel/Classes/Modules/CacheModule.php
@@ -68,6 +68,7 @@ public function getPageSettings(): string
                         'cacheCmd' => $pageId,
                     ]
                 ),
+                'languageKey' => $this->getBackendUser()->user['lang'],
             ]
         );
 

diff --git a/typo3/sysext/adminpanel/Classes/Modules/Debug/Events.php b/typo3/sysext/adminpanel/Classes/Modules/Debug/Events.php
@@ -72,6 +72,7 @@ public function getContent(ModuleData $data): string
         $dumper->setTheme('light');
 
         $view->assign('events', $dumper->dump($events, true));
+        $view->assign('languageKey', $this->getBackendUser()->user['lang']);
 
         return $view->render();
     }

diff --git a/typo3/sysext/adminpanel/Classes/Modules/Debug/Log.php b/typo3/sysext/adminpanel/Classes/Modules/Debug/Log.php
@@ -114,6 +114,7 @@ public function getSettings(): string
         $templateNameAndPath = 'EXT:adminpanel/Resources/Private/Templates/Modules/Debug/LogSettings.html';
         $view->setTemplatePathAndFilename(GeneralUtility::getFileAbsFileName($templateNameAndPath));
         $view->setPartialRootPaths(['EXT:adminpanel/Resources/Private/Partials']);
+        $view->assign('languageKey', $this->getBackendUser()->user['lang']);
 
         $maxLevel = LogLevel::normalizeLevel(LogLevel::DEBUG);
         $levels = [];
@@ -171,6 +172,7 @@ public function getContent(ModuleData $data): string
         $data['groupByComponent'] = $groupByComponent;
         $data['groupByLevel'] = $groupByLevel;
         $view->assignMultiple($data->getArrayCopy());
+        $view->assign('languageKey', $this->getBackendUser()->user['lang']);
 
         return $view->render();
     }

diff --git a/typo3/sysext/adminpanel/Classes/Modules/Debug/PageTitle.php b/typo3/sysext/adminpanel/Classes/Modules/Debug/PageTitle.php
@@ -105,6 +105,7 @@ public function getContent(ModuleData $data): string
         );
         $this->getLanguageService()->includeLLFile('EXT:adminpanel/Resources/Private/Language/locallang_debug.xlf');
         $view->assignMultiple($data->getArrayCopy());
+        $view->assign('languageKey', $this->getBackendUser()->user['lang']);
         return $view->render();
     }
 

diff --git a/typo3/sysext/adminpanel/Classes/Modules/Debug/QueryInformation.php b/typo3/sysext/adminpanel/Classes/Modules/Debug/QueryInformation.php
@@ -87,6 +87,7 @@ public function getContent(ModuleData $data): string
         );
         $this->getLanguageService()->includeLLFile('EXT:adminpanel/Resources/Private/Language/locallang_debug.xlf');
         $view->assignMultiple($data->getArrayCopy());
+        $view->assign('languageKey', $this->getBackendUser()->user['lang']);
         return $view->render();
     }
 

diff --git a/typo3/sysext/adminpanel/Classes/Modules/Info/GeneralInformation.php b/typo3/sysext/adminpanel/Classes/Modules/Info/GeneralInformation.php
@@ -84,6 +84,7 @@ public function getContent(ModuleData $data): string
         $view->setPartialRootPaths(['EXT:adminpanel/Resources/Private/Partials']);
 
         $view->assignMultiple($data->getArrayCopy());
+        $view->assign('languageKey', $this->getBackendUser()->user['lang']);
 
         return $view->render();
     }

diff --git a/typo3/sysext/adminpanel/Classes/Modules/Info/PhpInformation.php b/typo3/sysext/adminpanel/Classes/Modules/Info/PhpInformation.php
@@ -79,6 +79,7 @@ public function getContent(ModuleData $data): string
         $view->setPartialRootPaths(['EXT:adminpanel/Resources/Private/Partials']);
 
         $view->assignMultiple($data->getArrayCopy());
+        $view->assign('languageKey', $this->getBackendUser()->user['lang']);
 
         return $view->render();
     }

diff --git a/typo3/sysext/adminpanel/Classes/Modules/Info/RequestInformation.php b/typo3/sysext/adminpanel/Classes/Modules/Info/RequestInformation.php
@@ -76,6 +76,7 @@ public function getContent(ModuleData $data): string
         $view->setPartialRootPaths(['EXT:adminpanel/Resources/Private/Partials']);
 
         $view->assignMultiple($data->getArrayCopy());
+        $view->assign('languageKey', $this->getBackendUser()->user['lang']);
 
         return $view->render();
     }

diff --git a/typo3/sysext/adminpanel/Classes/Modules/Info/UserIntInformation.php b/typo3/sysext/adminpanel/Classes/Modules/Info/UserIntInformation.php
@@ -73,6 +73,7 @@ public function getContent(ModuleData $data): string
         $view->setPartialRootPaths(['EXT:adminpanel/Resources/Private/Partials']);
 
         $view->assignMultiple($data->getArrayCopy());
+        $view->assign('languageKey', $this->getBackendUser()->user['lang']);
 
         return $view->render();
     }

diff --git a/typo3/sysext/adminpanel/Classes/Modules/PreviewModule.php b/typo3/sysext/adminpanel/Classes/Modules/PreviewModule.php
@@ -132,6 +132,7 @@ public function getPageSettings(): string
                     'availableGroups' => $frontendGroupsRepository->getAvailableFrontendUserGroups(),
                     'selected' => (int)$this->config['simulateUserGroup'],
                 ],
+                'languageKey' => $this->getBackendUser()->user['lang'],
             ]
         );
         return $view->render();

diff --git a/typo3/sysext/adminpanel/Classes/Modules/TsDebug/TypoScriptWaterfall.php b/typo3/sysext/adminpanel/Classes/Modules/TsDebug/TypoScriptWaterfall.php
@@ -103,6 +103,7 @@ public function getContent(ModuleData $data): string
                 'trackContentRendering' => (int)$this->getConfigurationOption('LR'),
                 'forceTemplateParsing' => (int)$this->getConfigurationOption('forceTemplateParsing'),
                 'typoScriptLog' => $this->renderTypoScriptLog(),
+                'languageKey' => $this->getBackendUser()->user['lang'],
             ]
         );
 
@@ -128,7 +129,8 @@ public function getSettings(): string
                     'content' => (int)$this->getConfigurationOption('displayContent'),
                 ],
                 'trackContentRendering' => (int)$this->getConfigurationOption('LR'),
-                'forceTemplateParsing' => (int)$this->getConfigurationOption('forceTemplateParsing')
+                'forceTemplateParsing' => (int)$this->getConfigurationOption('forceTemplateParsing'),
+                'languageKey' => $this->getBackendUser()->user['lang'],
             ]
         );
 

diff --git a/typo3/sysext/adminpanel/Resources/Private/Partials/Data/TableKeyValue.html b/typo3/sysext/adminpanel/Resources/Private/Partials/Data/TableKeyValue.html
@@ -7,15 +7,15 @@ <h2 class="typo3-adminPanel-headline">{label}</h2>
         <table class="typo3-adminPanel-table typo3-adminPanel-table-debug">
             <thead>
                 <tr>
-                    <th scope="col" class="typo3-adminPanel-table-cell-key"><f:translate key="LLL:EXT:adminpanel/Resources/Private/Language/locallang_info.xlf:key"/></th>
-                    <th scope="col"><f:translate key="LLL:EXT:adminpanel/Resources/Private/Language/locallang_info.xlf:value"/></th>
+                    <th scope="col" class="typo3-adminPanel-table-cell-key"><f:translate key="LLL:EXT:adminpanel/Resources/Private/Language/locallang_info.xlf:key" languageKey="{languageKey}"/></th>
+                    <th scope="col"><f:translate key="LLL:EXT:adminpanel/Resources/Private/Language/locallang_info.xlf:value" languageKey="{languageKey}"/></th>
                 </tr>
             </thead>
             <tbody>
                 <f:for each="{data}" as="val" key="key">
                     <tr>
                         <th scope="row" class="typo3-adminPanel-table-cell-key">
-                            <f:translate key="{key}" default="{key}" extensionName="adminpanel"/>
+                            <f:translate key="{key}" default="{key}" extensionName="adminpanel" languageKey="{languageKey}"/>
                         </th>
                         <td>
                             <f:variable name="typeClass" value="string" />
@@ -24,10 +24,10 @@ <h2 class="typo3-adminPanel-headline">{label}</h2>
                             <f:if condition="{adm:isArray(value: val)}"><f:variable name="typeClass" value="array" /></f:if>
                             <f:switch expression="{typeClass}">
                                 <f:case value="string">
-                                    <pre class="typo3-adminPanel-dump typo3-adminPanel-dump-{typeClass}"><f:if condition="{val}"><f:translate key="{val}" default="{val}" extensionName="adminpanel"/></f:if></pre>
+                                    <pre class="typo3-adminPanel-dump typo3-adminPanel-dump-{typeClass}"><f:if condition="{val}"><f:translate key="{val}" default="{val}" extensionName="adminpanel" languageKey="{languageKey}"/></f:if></pre>
                                 </f:case>
                                 <f:case value="array">
-                                    <f:render partial="Data/TableKeyValue" arguments="{data: val}" />
+                                    <f:render partial="Data/TableKeyValue" arguments="{data: val, languageKey: languageKey}" />
                                 </f:case>
                                 <f:defaultCase>
                                     <pre class="typo3-adminPanel-dump typo3-adminPanel-dump-{typeClass}">{val}</pre>

diff --git a/typo3/sysext/adminpanel/Resources/Private/Partials/Form/Checkbox.html b/typo3/sysext/adminpanel/Resources/Private/Partials/Form/Checkbox.html
@@ -5,7 +5,7 @@
             <input type="hidden" name="TSFE_ADMIN_PANEL[{name}]" value="0"/>
             <input type="checkbox" id="{name}" name="TSFE_ADMIN_PANEL[{name}]" value="1" class="typo3-adminPanel-form-checkbox-input"{f:if(condition: value, then:' checked="checked"')} />
             <label for="{name}" class="typo3-adminPanel-form-checkbox-label">
-                <f:translate key="{label}" default="{label}" extensionName="adminpanel"/>
+                <f:translate key="{label}" default="{label}" extensionName="adminpanel" languageKey="{languageKey}"/>
             </label>
         </div>
     </div>

diff --git a/typo3/sysext/adminpanel/Resources/Private/Partials/Form/DateTime.html b/typo3/sysext/adminpanel/Resources/Private/Partials/Form/DateTime.html
@@ -3,7 +3,7 @@
     <div class="typo3-adminPanel-form-group">
         <div class="typo3-adminPanel-form-datetime">
             <label for="{name}" class="typo3-adminPanel-form-datetime-label">
-                <f:translate key="{label}" default="{label}" extensionName="adminpanel"/>
+                <f:translate key="{label}" default="{label}" extensionName="adminpanel" languageKey="{languageKey}"/>
             </label>
             <div class="typo3-adminPanel-form-datetime-input-group">
                 <input type="date" id="{name}-date-hr" class="typo3-adminPanel-form-datetime-input" data-target="{name}"/>

diff --git a/typo3/sysext/adminpanel/Resources/Private/Partials/Form/Select.html b/typo3/sysext/adminpanel/Resources/Private/Partials/Form/Select.html
@@ -3,7 +3,7 @@
     <div class="typo3-adminPanel-form-group">
         <div class="typo3-adminPanel-form-select">
             <label for="{name}" class="typo3-adminPanel-form-select-label">
-                <f:translate key="{label}" default="{label}" extensionName="adminpanel"/>
+                <f:translate key="{label}" default="{label}" extensionName="adminpanel" languageKey="{languageKey}"/>
             </label>
             <select name="TSFE_ADMIN_PANEL[{name}]" id="{name}" class="typo3-adminPanel-form-select-input">
                 <option value="0"></option>

diff --git a/typo3/sysext/adminpanel/Resources/Private/Partials/Modules/Item.html b/typo3/sysext/adminpanel/Resources/Private/Partials/Modules/Item.html
@@ -34,15 +34,15 @@
                     <f:for each="{module.subModules}" as="sub">
                         <f:if condition="{sub.settings}">
                             <div class="typo3-adminPanel-content-settings-group">
-                                <h4 class="typo3-adminPanel-headline">{sub.label} <f:translate key="LLL:EXT:adminpanel/Resources/Private/Language/locallang.xlf:settings.label"/></h4>
+                                <h4 class="typo3-adminPanel-headline">{sub.label} <f:translate key="LLL:EXT:adminpanel/Resources/Private/Language/locallang.xlf:settings.label" languageKey="{languageKey}"/></h4>
                                 <f:format.raw>
                                     {sub.settings}
                                 </f:format.raw>
                             </div>
                         </f:if>
                     </f:for>
                     <div class="typo3-adminPanel-form-group">
-                        <f:form.button class="typo3-adminPanel-btn typo3-adminPanel-btn-primary" data="{typo3-role: 'typo3-adminPanel-saveButton'}"><f:translate key="LLL:EXT:adminpanel/Resources/Private/Language/locallang.xlf:settings.updateButtonLabel"/></f:form.button>
+                        <f:form.button class="typo3-adminPanel-btn typo3-adminPanel-btn-primary" data="{typo3-role: 'typo3-adminPanel-saveButton'}"><f:translate key="LLL:EXT:adminpanel/Resources/Private/Language/locallang.xlf:settings.updateButtonLabel" languageKey="{languageKey}"/></f:form.button>
                     </div>
                 </div>
             </f:if>

diff --git a/typo3/sysext/adminpanel/Resources/Private/Templates/Main.html b/typo3/sysext/adminpanel/Resources/Private/Templates/Main.html
@@ -6,26 +6,26 @@
         <f:variable name="icon"><core:icon identifier="{module.iconIdentifier}" alternativeMarkupIdentifier="inline"/></f:variable>
         <f:variable name="label">{module.label}</f:variable>
         <f:variable name="information">{module.shortInfo}</f:variable>
-        <f:render partial="Modules/Item" arguments="{module: module, uid: uid, icon: icon, label: label, information: information, data: data}" debug="false"/>
+        <f:render partial="Modules/Item" arguments="{module: module, uid: uid, icon: icon, label: label, information: information, data: data, languageKey: languageKey}" debug="false"/>
     </f:for>
 
     <f:if condition="{hookObjectModuleContent}">
         <f:variable name="uid">hook</f:variable>
         <f:variable name="icon"><core:icon identifier="actions-window-open" alternativeMarkupIdentifier="inline"/></f:variable>
-        <f:variable name="label"><f:translate key="LLL:EXT:adminpanel/Resources/Private/Language/locallang.xlf:deprecatedModuleLabel"/></f:variable>
+        <f:variable name="label"><f:translate key="LLL:EXT:adminpanel/Resources/Private/Language/locallang.xlf:deprecatedModuleLabel" languageKey="{languageKey}"/></f:variable>
         <f:variable name="mainContent">{hookObjectModuleContent}</f:variable>
-        <f:render partial="Modules/Item" arguments="{uid: uid, icon: icon, label: label, mainContent: mainContent, data: data}}" debug="false"/>
+        <f:render partial="Modules/Item" arguments="{uid: uid, icon: icon, label: label, mainContent: mainContent, data: data, languageKey: languageKey}}" debug="false"/>
     </f:if>
 
 </f:section>
 <f:section name="Settings">
 
     <f:variable name="uid">settings</f:variable>
     <f:variable name="icon"><core:icon identifier="actions-system-extension-configure" alternativeMarkupIdentifier="inline"/></f:variable>
-    <f:variable name="label"><f:translate key="LLL:EXT:adminpanel/Resources/Private/Language/locallang.xlf:settings.label"/></f:variable>
+    <f:variable name="label"><f:translate key="LLL:EXT:adminpanel/Resources/Private/Language/locallang.xlf:settings.label" languageKey="{languageKey}"/></f:variable>
     <f:variable name="information">{module.shortInfo}</f:variable>
     <f:variable name="mainContent">
-        <h1 class="typo3-adminPanel-headline"><f:translate key="LLL:EXT:adminpanel/Resources/Private/Language/locallang.xlf:settings.label"/></h1>
+        <h1 class="typo3-adminPanel-headline"><f:translate key="LLL:EXT:adminpanel/Resources/Private/Language/locallang.xlf:settings.label" languageKey="{languageKey}"/></h1>
         <div class="typo3-adminPanel-card-group">
             <f:for each="{settingsModules}" as="module">
                 <f:if condition="{module.pageSettings}">
@@ -43,10 +43,10 @@ <h2 class="typo3-adminPanel-card-header-headline">
         </div>
         <div class="typo3-adminPanel-form-group">
             <button data-typo3-role="typo3-adminPanel-saveButton" class="typo3-adminPanel-btn typo3-adminPanel-btn-primary">
-                <f:translate key="LLL:EXT:adminpanel/Resources/Private/Language/locallang.xlf:settings.updateButtonLabel"/>
+                <f:translate key="LLL:EXT:adminpanel/Resources/Private/Language/locallang.xlf:settings.updateButtonLabel" languageKey="{languageKey}"/>
             </button>
         </div>
     </f:variable>
-    <f:render partial="Modules/Item" arguments="{uid: uid, icon: icon, label: label, information: information, mainContent: mainContent, data: data}" debug="false"/>
+    <f:render partial="Modules/Item" arguments="{uid: uid, icon: icon, label: label, information: information, mainContent: mainContent, data: data, languageKey: languageKey}" debug="false"/>
 </f:section>
 </html>