diff --git a/typo3/sysext/adminpanel/Classes/Controller/MainController.php b/typo3/sysext/adminpanel/Classes/Controller/MainController.php
index 66b5290b1b1f7c678e207bb92d8b13fab61fc3ac..449c58b4b941b4b64285cb9bcaa125a804beb572 100644
--- a/typo3/sysext/adminpanel/Classes/Controller/MainController.php
+++ b/typo3/sysext/adminpanel/Classes/Controller/MainController.php
@@ -31,6 +31,7 @@ use TYPO3\CMS\Adminpanel\Service\ModuleLoader;
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;
@@ -126,6 +127,7 @@ class MainController implements SingletonInterface
'toggleActiveUrl' => $this->generateBackendUrl('ajax_adminPanel_toggle'),
'resources' => $resources,
'adminPanelActive' => StateUtility::isOpen(),
+ 'languageKey' => $this->getBackendUser()->user['lang'],
]
);
if (StateUtility::isOpen()) {
@@ -238,4 +240,9 @@ class MainController implements SingletonInterface
}
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
index 355f7b869089204b09ae5dfdfaa5267f25fbc2c9..b7463de2d558c398bb751c7f4c6ae030137428ab 100644
--- a/typo3/sysext/adminpanel/Classes/ModuleApi/AbstractSubModule.php
+++ b/typo3/sysext/adminpanel/Classes/ModuleApi/AbstractSubModule.php
@@ -17,6 +17,7 @@ declare(strict_types=1);
namespace TYPO3\CMS\Adminpanel\ModuleApi;
+use TYPO3\CMS\Core\Authentication\BackendUserAuthentication;
use TYPO3\CMS\Core\Localization\LanguageService;
/**
@@ -35,4 +36,9 @@ abstract class AbstractSubModule implements ModuleInterface, ContentProviderInte
{
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
index fcae2f5507076ebb9a657c8af59b74cacd836c4c..5f482661677eebbe2deccaf7a46c29286645dea2 100644
--- a/typo3/sysext/adminpanel/Classes/Modules/CacheModule.php
+++ b/typo3/sysext/adminpanel/Classes/Modules/CacheModule.php
@@ -68,6 +68,7 @@ class CacheModule extends AbstractModule implements PageSettingsProviderInterfac
'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
index 21c41a0d8ec16b48179a5282e55249e063cd6253..57a6a1469dc1b7b1bea82c91464173af21bf4e4f 100644
--- a/typo3/sysext/adminpanel/Classes/Modules/Debug/Events.php
+++ b/typo3/sysext/adminpanel/Classes/Modules/Debug/Events.php
@@ -72,6 +72,7 @@ class Events extends AbstractSubModule implements DataProviderInterface
$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
index 94f500400e1f64ef608e159afa55e75e684b4cb0..badd311a0f14f7c94cd8141eccd5448a010562cc 100644
--- a/typo3/sysext/adminpanel/Classes/Modules/Debug/Log.php
+++ b/typo3/sysext/adminpanel/Classes/Modules/Debug/Log.php
@@ -114,6 +114,7 @@ class Log extends AbstractSubModule implements DataProviderInterface, ModuleSett
$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 @@ class Log extends AbstractSubModule implements DataProviderInterface, ModuleSett
$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
index bb935619fc054b682da8e8c30929fab1d3b65200..66b7eac7ff909060c8aa9d64c0326ee32ab9f828 100644
--- a/typo3/sysext/adminpanel/Classes/Modules/Debug/PageTitle.php
+++ b/typo3/sysext/adminpanel/Classes/Modules/Debug/PageTitle.php
@@ -105,6 +105,7 @@ class PageTitle extends AbstractSubModule implements DataProviderInterface
);
$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
index 86df9fdb0d9791ada56bc89e6af9b27cc0251737..a2092bf7a8858c920791a3af4da0daa6f9b07bd7 100644
--- a/typo3/sysext/adminpanel/Classes/Modules/Debug/QueryInformation.php
+++ b/typo3/sysext/adminpanel/Classes/Modules/Debug/QueryInformation.php
@@ -87,6 +87,7 @@ class QueryInformation extends AbstractSubModule implements DataProviderInterfac
);
$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
index b9bba534eec3b2b93cfa289a7509ca6730e315a0..6023a3e96825faeadd8998febaf25fcb14a6a74d 100644
--- a/typo3/sysext/adminpanel/Classes/Modules/Info/GeneralInformation.php
+++ b/typo3/sysext/adminpanel/Classes/Modules/Info/GeneralInformation.php
@@ -84,6 +84,7 @@ class GeneralInformation extends AbstractSubModule implements DataProviderInterf
$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
index bab58ae4c19625018342198a38add416b3dbb551..e33548b466de62ed627aa302915f9f18f921d397 100644
--- a/typo3/sysext/adminpanel/Classes/Modules/Info/PhpInformation.php
+++ b/typo3/sysext/adminpanel/Classes/Modules/Info/PhpInformation.php
@@ -79,6 +79,7 @@ class PhpInformation extends AbstractSubModule implements DataProviderInterface
$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
index 38ed6ef08fc713314f2a0f7f760f62fc739c6308..44a2d79556d4db4f59a5e29f3e8a72227dacead8 100644
--- a/typo3/sysext/adminpanel/Classes/Modules/Info/RequestInformation.php
+++ b/typo3/sysext/adminpanel/Classes/Modules/Info/RequestInformation.php
@@ -76,6 +76,7 @@ class RequestInformation extends AbstractSubModule implements DataProviderInterf
$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
index 4756450d1d84fe9583cc2ce6347224122272e3bd..711ca279bd3d77d264212a313f2e7d8ef623d886 100644
--- a/typo3/sysext/adminpanel/Classes/Modules/Info/UserIntInformation.php
+++ b/typo3/sysext/adminpanel/Classes/Modules/Info/UserIntInformation.php
@@ -73,6 +73,7 @@ class UserIntInformation extends AbstractSubModule implements DataProviderInterf
$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
index 0857edf92daea2a8f510386382fbc9c1ea77057e..f1d329e9ddf74bbd578eadc7fc2d824c651362da 100644
--- a/typo3/sysext/adminpanel/Classes/Modules/PreviewModule.php
+++ b/typo3/sysext/adminpanel/Classes/Modules/PreviewModule.php
@@ -129,6 +129,7 @@ class PreviewModule extends AbstractModule implements RequestEnricherInterface,
'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
index e37b71a08a65a6e1d2eba06912c805e9fdc3075e..82af2687f58457107e9c9480bec88c7c651f0e47 100644
--- a/typo3/sysext/adminpanel/Classes/Modules/TsDebug/TypoScriptWaterfall.php
+++ b/typo3/sysext/adminpanel/Classes/Modules/TsDebug/TypoScriptWaterfall.php
@@ -103,6 +103,7 @@ class TypoScriptWaterfall extends AbstractSubModule implements RequestEnricherIn
'trackContentRendering' => (int)$this->getConfigurationOption('LR'),
'forceTemplateParsing' => (int)$this->getConfigurationOption('forceTemplateParsing'),
'typoScriptLog' => $this->renderTypoScriptLog(),
+ 'languageKey' => $this->getBackendUser()->user['lang'],
]
);
@@ -129,6 +130,7 @@ class TypoScriptWaterfall extends AbstractSubModule implements RequestEnricherIn
],
'trackContentRendering' => (int)$this->getConfigurationOption('LR'),
'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
index 40b0e7b3e8508e0a2e1588ca57e794d8e1882a0a..4e3d0a3d1cb055807b7f0b12da2cda3d2babcf7c 100644
--- a/typo3/sysext/adminpanel/Resources/Private/Partials/Data/TableKeyValue.html
+++ b/typo3/sysext/adminpanel/Resources/Private/Partials/Data/TableKeyValue.html
@@ -7,15 +7,15 @@
<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 @@
<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
index 74e5c0924bf5bddc29cc819af3d0b9f812826342..2427c490eea3162ef7bcc9c7d6035ee5282abb74 100644
--- 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
index b75ac99da79f46addfa591be7141ddb52d6b2c3f..d2729f845e8957c16c64de9b3f7aed70ea55cc4c 100644
--- 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-bs-target="{name}"/>
diff --git a/typo3/sysext/adminpanel/Resources/Private/Partials/Form/Select.html b/typo3/sysext/adminpanel/Resources/Private/Partials/Form/Select.html
index 9c3074795ae38018c2b560eea7674da0d89a65a1..8fa79d7b3fa9117ee42aea7e9a4b077526f56daf 100644
--- 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
index 273aa321423787e5cef355c2755c779dac2af7dc..94909cf15ab679a47208a8f81aeeffca9d35e005 100644
--- a/typo3/sysext/adminpanel/Resources/Private/Partials/Modules/Item.html
+++ b/typo3/sysext/adminpanel/Resources/Private/Partials/Modules/Item.html
@@ -34,7 +34,7 @@
<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>
@@ -42,7 +42,7 @@
</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
index 0533306b61f93c431c70e824c70342dfd4960fc0..8d776e8f7596d20bc730eae250d999ed3630385e 100644
--- a/typo3/sysext/adminpanel/Resources/Private/Templates/Main.html
+++ b/typo3/sysext/adminpanel/Resources/Private/Templates/Main.html
@@ -6,15 +6,15 @@
<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>
@@ -22,10 +22,10 @@
<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 @@
</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>
diff --git a/typo3/sysext/adminpanel/Resources/Private/Templates/Modules/Debug/Log.html b/typo3/sysext/adminpanel/Resources/Private/Templates/Modules/Debug/Log.html
index ff9cdfd186581086b6e1cedcde47cd2040a4a861..d53ad1c6a81c6bf6dda37f46e011b34e870e8982 100644
--- a/typo3/sysext/adminpanel/Resources/Private/Templates/Modules/Debug/Log.html
+++ b/typo3/sysext/adminpanel/Resources/Private/Templates/Modules/Debug/Log.html
@@ -12,7 +12,7 @@
<thead>
<tr>
<th scope="col" class="typo3-adminPanel-table-cell-key">
- <f:translate key="LLL:EXT:adminpanel/Resources/Private/Language/locallang_debug.xlf:submodule.log.message"/>
+ <f:translate key="LLL:EXT:adminpanel/Resources/Private/Language/locallang_debug.xlf:submodule.log.message" languageKey="{languageKey}"/>
</th>
</tr>
</thead>
@@ -42,17 +42,17 @@
<f:if condition="{groupByComponent}">
<f:then>
<th scope="col" class="typo3-adminPanel-table-cell-key">
- <f:translate key="LLL:EXT:adminpanel/Resources/Private/Language/locallang_debug.xlf:submodule.log.level"/>
+ <f:translate key="LLL:EXT:adminpanel/Resources/Private/Language/locallang_debug.xlf:submodule.log.level" languageKey="{languageKey}"/>
</th>
</f:then>
<f:else>
<th scope="col" class="typo3-adminPanel-table-cell-key">
- <f:translate key="LLL:EXT:adminpanel/Resources/Private/Language/locallang_debug.xlf:submodule.log.component"/>
+ <f:translate key="LLL:EXT:adminpanel/Resources/Private/Language/locallang_debug.xlf:submodule.log.component" languageKey="{languageKey}"/>
</th>
</f:else>
</f:if>
<th scope="col" class="typo3-adminPanel-table-cell-key">
- <f:translate key="LLL:EXT:adminpanel/Resources/Private/Language/locallang_debug.xlf:submodule.log.message"/>
+ <f:translate key="LLL:EXT:adminpanel/Resources/Private/Language/locallang_debug.xlf:submodule.log.message" languageKey="{languageKey}"/>
</th>
</tr>
</thead>
@@ -87,13 +87,13 @@
<thead>
<tr>
<th scope="col" class="typo3-adminPanel-table-cell-key">
- <f:translate key="LLL:EXT:adminpanel/Resources/Private/Language/locallang_debug.xlf:submodule.log.level"/>
+ <f:translate key="LLL:EXT:adminpanel/Resources/Private/Language/locallang_debug.xlf:submodule.log.level" languageKey="{languageKey}"/>
</th>
<th scope="col" class="typo3-adminPanel-table-cell-key">
- <f:translate key="LLL:EXT:adminpanel/Resources/Private/Language/locallang_debug.xlf:submodule.log.component"/>
+ <f:translate key="LLL:EXT:adminpanel/Resources/Private/Language/locallang_debug.xlf:submodule.log.component" languageKey="{languageKey}"/>
</th>
<th scope="col" class="typo3-adminPanel-table-cell-key">
- <f:translate key="LLL:EXT:adminpanel/Resources/Private/Language/locallang_debug.xlf:submodule.log.message"/>
+ <f:translate key="LLL:EXT:adminpanel/Resources/Private/Language/locallang_debug.xlf:submodule.log.message" languageKey="{languageKey}"/>
</th>
</tr>
</thead>
@@ -122,7 +122,7 @@
<f:else>
<div class="typo3-adminPanel-message typo3-adminPanel-message-info">
<div class="typo3-adminPanel-message-text">
- <f:translate key="LLL:EXT:adminpanel/Resources/Private/Language/locallang_debug.xlf:submodule.log.noEntries"/>
+ <f:translate key="LLL:EXT:adminpanel/Resources/Private/Language/locallang_debug.xlf:submodule.log.noEntries" languageKey="{languageKey}"/>
</div>
</div>
</f:else>
diff --git a/typo3/sysext/adminpanel/Resources/Private/Templates/Modules/Debug/LogSettings.html b/typo3/sysext/adminpanel/Resources/Private/Templates/Modules/Debug/LogSettings.html
index a78f13a9fbaaefd70f4465288b724a3373fbac41..6bf2803d4c30246ad74c613964022621b05ec64a 100644
--- a/typo3/sysext/adminpanel/Resources/Private/Templates/Modules/Debug/LogSettings.html
+++ b/typo3/sysext/adminpanel/Resources/Private/Templates/Modules/Debug/LogSettings.html
@@ -4,6 +4,7 @@
arguments="{
label: 'LLL:EXT:adminpanel/Resources/Private/Language/locallang_debug.xlf:submodule.log.groupByComponent',
name: 'debug_log_groupByComponent',
+ languageKey: languageKey,
value: groupByComponent
}"
debug="false"/>
@@ -12,6 +13,7 @@
arguments="{
label: 'LLL:EXT:adminpanel/Resources/Private/Language/locallang_debug.xlf:submodule.log.groupByLevel',
name: 'debug_log_groupByLevel',
+ languageKey: languageKey,
value: groupByLevel
}"
debug="false"/>
@@ -20,6 +22,7 @@
arguments="{
label: 'LLL:EXT:adminpanel/Resources/Private/Language/locallang_debug.xlf:submodule.log.startLevel',
name: 'debug_log_startLevel',
+ languageKey: languageKey,
options: levels,
optionValue: 'level',
optionLabel: 'levelName',
diff --git a/typo3/sysext/adminpanel/Resources/Private/Templates/Modules/Debug/PageTitle.html b/typo3/sysext/adminpanel/Resources/Private/Templates/Modules/Debug/PageTitle.html
index d609cc092b693ac719bb46199e3204cd0eddd230..1a156b7f593de2e9c5ef1effea696bb48300a660 100644
--- a/typo3/sysext/adminpanel/Resources/Private/Templates/Modules/Debug/PageTitle.html
+++ b/typo3/sysext/adminpanel/Resources/Private/Templates/Modules/Debug/PageTitle.html
@@ -1,17 +1,17 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
<f:if condition="{cacheEnabled}">
<f:then>
- <p><f:translate key="LLL:EXT:adminpanel/Resources/Private/Language/locallang_debug.xlf:submodule.pageTitle.cacheEnabled" /></p>
- <p><f:translate key="LLL:EXT:adminpanel/Resources/Private/Language/locallang_debug.xlf:submodule.pageTitle.cacheEnabled.extraInfo" /></p>
+ <p><f:translate key="LLL:EXT:adminpanel/Resources/Private/Language/locallang_debug.xlf:submodule.pageTitle.cacheEnabled" languageKey="{languageKey}"/></p>
+ <p><f:translate key="LLL:EXT:adminpanel/Resources/Private/Language/locallang_debug.xlf:submodule.pageTitle.cacheEnabled.extraInfo" languageKey="{languageKey}"/></p>
</f:then>
<f:else>
- <h2 class="typo3-adminPanel-headline"><f:translate key="LLL:EXT:adminpanel/Resources/Private/Language/locallang_debug.xlf:submodule.pageTitle.usedProvider" /></h2>
+ <h2 class="typo3-adminPanel-headline"><f:translate key="LLL:EXT:adminpanel/Resources/Private/Language/locallang_debug.xlf:submodule.pageTitle.usedProvider" languageKey="{languageKey}" /></h2>
<div class="typo3-adminPanel-table-overflow">
<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_debug.xlf:submodule.pageTitle.title" /></th>
- <th scope="col" class="typo3-adminPanel-table-cell-key"><f:translate key="LLL:EXT:adminpanel/Resources/Private/Language/locallang_debug.xlf:submodule.pageTitle.provider" /></th>
+ <th scope="col" class="typo3-adminPanel-table-cell-key"><f:translate key="LLL:EXT:adminpanel/Resources/Private/Language/locallang_debug.xlf:submodule.pageTitle.title" languageKey="{languageKey}" /></th>
+ <th scope="col" class="typo3-adminPanel-table-cell-key"><f:translate key="LLL:EXT:adminpanel/Resources/Private/Language/locallang_debug.xlf:submodule.pageTitle.provider" languageKey="{languageKey}" /></th>
</tr>
</thead>
<tbody>
@@ -22,13 +22,13 @@
</tbody>
</table>
</div>
- <h2 class="typo3-adminPanel-headline"><f:translate key="LLL:EXT:adminpanel/Resources/Private/Language/locallang_debug.xlf:submodule.pageTitle.skippedProviders" /></h2>
+ <h2 class="typo3-adminPanel-headline"><f:translate key="LLL:EXT:adminpanel/Resources/Private/Language/locallang_debug.xlf:submodule.pageTitle.skippedProviders" languageKey="{languageKey}" /></h2>
<div class="typo3-adminPanel-table-overflow">
<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_debug.xlf:submodule.pageTitle.name" /></th>
- <th scope="col" class="typo3-adminPanel-table-cell-key"><f:translate key="LLL:EXT:adminpanel/Resources/Private/Language/locallang_debug.xlf:submodule.pageTitle.provider" /></th>
+ <th scope="col" class="typo3-adminPanel-table-cell-key"><f:translate key="LLL:EXT:adminpanel/Resources/Private/Language/locallang_debug.xlf:submodule.pageTitle.name" languageKey="{languageKey}" /></th>
+ <th scope="col" class="typo3-adminPanel-table-cell-key"><f:translate key="LLL:EXT:adminpanel/Resources/Private/Language/locallang_debug.xlf:submodule.pageTitle.provider" languageKey="{languageKey}" /></th>
</tr>
</thead>
<tbody>
@@ -41,13 +41,13 @@
</tbody>
</table>
</div>
- <h2 class="typo3-adminPanel-headline"><f:translate key="LLL:EXT:adminpanel/Resources/Private/Language/locallang_debug.xlf:submodule.pageTitle.allProviders" /></h2>
+ <h2 class="typo3-adminPanel-headline"><f:translate key="LLL:EXT:adminpanel/Resources/Private/Language/locallang_debug.xlf:submodule.pageTitle.allProviders" languageKey="{languageKey}"/></h2>
<div class="typo3-adminPanel-table-overflow">
<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_debug.xlf:submodule.pageTitle.name" /></th>
- <th scope="col" class="typo3-adminPanel-table-cell-key"><f:translate key="LLL:EXT:adminpanel/Resources/Private/Language/locallang_debug.xlf:submodule.pageTitle.provider" /></th>
+ <th scope="col" class="typo3-adminPanel-table-cell-key"><f:translate key="LLL:EXT:adminpanel/Resources/Private/Language/locallang_debug.xlf:submodule.pageTitle.name" languageKey="{languageKey}" /></th>
+ <th scope="col" class="typo3-adminPanel-table-cell-key"><f:translate key="LLL:EXT:adminpanel/Resources/Private/Language/locallang_debug.xlf:submodule.pageTitle.provider" languageKey="{languageKey}" /></th>
</tr>
</thead>
<tbody>
diff --git a/typo3/sysext/adminpanel/Resources/Private/Templates/Modules/Debug/QueryInformation.html b/typo3/sysext/adminpanel/Resources/Private/Templates/Modules/Debug/QueryInformation.html
index eca638498b0fcaa6e948828b678df3df4b8e359a..38c5fe6aa1d0b245761dfe5ae7c9c7b6fc158ea7 100644
--- a/typo3/sysext/adminpanel/Resources/Private/Templates/Modules/Debug/QueryInformation.html
+++ b/typo3/sysext/adminpanel/Resources/Private/Templates/Modules/Debug/QueryInformation.html
@@ -3,19 +3,19 @@
<div class="typo3-adminPanel-row typo3-adminPanel-row-nowrap typo3-adminPanel-sql-header">
<div class="typo3-adminPanel-col typo3-adminPanel-col-icon"></div>
<div class="typo3-adminPanel-col typo3-adminPanel-col-ellipsis typo3-adminPanel-col-auto">
- <f:translate key="LLL:EXT:adminpanel/Resources/Private/Language/locallang_debug.xlf:submodule.queryInformation.sqlQuery"/>
+ <f:translate key="LLL:EXT:adminpanel/Resources/Private/Language/locallang_debug.xlf:submodule.queryInformation.sqlQuery" languageKey="{languageKey}"/>
</div>
<div class="typo3-adminPanel-col typo3-adminPanel-sql-col-count">
- <f:translate key="LLL:EXT:adminpanel/Resources/Private/Language/locallang_debug.xlf:submodule.queryInformation.queryCount"/>
+ <f:translate key="LLL:EXT:adminpanel/Resources/Private/Language/locallang_debug.xlf:submodule.queryInformation.queryCount" languageKey="{languageKey}"/>
</div>
<div class="typo3-adminPanel-col typo3-adminPanel-sql-col-time">
- <f:translate key="LLL:EXT:adminpanel/Resources/Private/Language/locallang_debug.xlf:submodule.queryInformation.queryTime"/>
+ <f:translate key="LLL:EXT:adminpanel/Resources/Private/Language/locallang_debug.xlf:submodule.queryInformation.queryTime" languageKey="{languageKey}"/>
</div>
</div>
<f:for each="{queries}" as="queryCollection" iteration="queryCollectionIteration">
<div class="typo3-adminPanel-row typo3-adminPanel-row-nowrap">
<div class="typo3-adminPanel-col typo3-adminPanel-col-icon">
- <a href="#" title="{f:translate(key:'LLL:EXT:adminpanel/Resources/Private/Language/locallang.xlf:button.view')}" data-typo3-zoom-target="queryCollection-{queryCollectionIteration.index}">
+ <a href="#" title="{f:translate(key:'LLL:EXT:adminpanel/Resources/Private/Language/locallang.xlf:button.view', languageKey: languageKey)}" data-typo3-zoom-target="queryCollection-{queryCollectionIteration.index}">
<core:icon identifier="actions-document-view" alternativeMarkupIdentifier="inline"/>
</a>
</div>
@@ -33,16 +33,16 @@
<div class="typo3-adminPanel-zoom" data-typo3-zoom-id="queryCollection-{queryCollectionIteration.index}">
<div class="typo3-adminPanel-zoom-header">
<button class="typo3-adminPanel-btn" data-typo3-zoom-close="true">
- {f:translate(key:'LLL:EXT:adminpanel/Resources/Private/Language/locallang.xlf:button.close')}
+ {f:translate(key:'LLL:EXT:adminpanel/Resources/Private/Language/locallang.xlf:button.close', languageKey: languageKey)}
</button>
</div>
<div class="typo3-adminPanel-zoom-body">
- <h3 class="typo3-adminPanel-headline">{f:translate(key:'LLL:EXT:adminpanel/Resources/Private/Language/locallang_debug.xlf:submodule.queryInformation.query')}</h3>
+ <h3 class="typo3-adminPanel-headline">{f:translate(key:'LLL:EXT:adminpanel/Resources/Private/Language/locallang_debug.xlf:submodule.queryInformation.query', languageKey: languageKey)}</h3>
<pre class="typo3-adminPanel-sql-statement">{queryCollection.sql}</pre>
<f:if condition="{queryCollection.queries}">
<f:if condition="{queryCollection.queries.0.backtrace}">
<f:alias map="{query: queryCollection.queries.0}">
- <h3 class="typo3-adminPanel-headline">{f:translate(key:'LLL:EXT:adminpanel/Resources/Private/Language/locallang_debug.xlf:submodule.queryInformation.backtrace')}</h3>
+ <h3 class="typo3-adminPanel-headline">{f:translate(key:'LLL:EXT:adminpanel/Resources/Private/Language/locallang_debug.xlf:submodule.queryInformation.backtrace', languageKey: languageKey)}</h3>
<div class="typo3-adminPanel-sql-backtrace">
<f:for each="{query.backtrace}" as="value">
<div class="typo3-adminPanel-sql-backtrace-item">
@@ -57,7 +57,7 @@
</div>
</f:alias>
</f:if>
- <h3 class="typo3-adminPanel-headline">{f:translate(key:'LLL:EXT:adminpanel/Resources/Private/Language/locallang_debug.xlf:submodule.queryInformation.queries')}</h3>
+ <h3 class="typo3-adminPanel-headline">{f:translate(key:'LLL:EXT:adminpanel/Resources/Private/Language/locallang_debug.xlf:submodule.queryInformation.queries', languageKey: languageKey)}</h3>
<div class="typo3-adminPanel-table-overflow">
<table class="typo3-adminPanel-table typo3-adminPanel-table-debug">
<thead>
@@ -66,7 +66,7 @@
<th scope="col">dcValue{param.cycle}</th>
</f:for>
<th scope="col" class="typo3-adminPanel-table-cell-space"></th>
- <th scope="col" class="typo3-adminPanel-table-cell-time"><f:translate key="LLL:EXT:adminpanel/Resources/Private/Language/locallang_debug.xlf:submodule.queryInformation.queryTime"/></th>
+ <th scope="col" class="typo3-adminPanel-table-cell-time"><f:translate key="LLL:EXT:adminpanel/Resources/Private/Language/locallang_debug.xlf:submodule.queryInformation.queryTime", languageKey: languageKey/></th>
</tr>
</thead>
<tbody>
diff --git a/typo3/sysext/adminpanel/Resources/Private/Templates/Modules/Info/General.html b/typo3/sysext/adminpanel/Resources/Private/Templates/Modules/Info/General.html
index 506e6d9da4450830a2f9416ae797687d22974395..e3f8b1cf767b8d20779674246accadea780809a9 100644
--- a/typo3/sysext/adminpanel/Resources/Private/Templates/Modules/Info/General.html
+++ b/typo3/sysext/adminpanel/Resources/Private/Templates/Modules/Info/General.html
@@ -7,13 +7,13 @@
<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>
<tr>
- <th scope="row" class="typo3-adminPanel-table-cell-key"><f:translate key="LLL:EXT:adminpanel/Resources/Private/Language/locallang_info.xlf:imagesOnPage"/></th>
+ <th scope="row" class="typo3-adminPanel-table-cell-key"><f:translate key="LLL:EXT:adminpanel/Resources/Private/Language/locallang_info.xlf:imagesOnPage" languageKey="{languageKey}"/></th>
<td>
<f:variable name="typeClass" value="string" />
<f:if condition="{info.imagesOnPage.total as integer} === {info.imagesOnPage.total}"><f:variable name="typeClass" value="integer" /></f:if>
@@ -24,7 +24,7 @@
<f:for each="{info.imagesOnPage.files}" as="file">
<tr>
<th scope="row" class="typo3-adminPanel-table-cell-key">
- <a href="{file.name}" class="typo3-adminPanel-table-cell-key-icon" target="_blank" title="{f:translate(key:'LLL:EXT:adminpanel/Resources/Private/Language/locallang.xlf:button.view')}">
+ <a href="{file.name}" class="typo3-adminPanel-table-cell-key-icon" target="_blank" title="{f:translate(key:'LLL:EXT:adminpanel/Resources/Private/Language/locallang.xlf:button.view', languageKey: languageKey)}">
<core:icon identifier="actions-window-open" alternativeMarkupIdentifier="inline"/>
</a>
{file.name}
@@ -38,7 +38,7 @@
</tr>
</f:for>
<tr>
- <th scope="row" class="typo3-adminPanel-table-cell-key"><f:translate key="LLL:EXT:adminpanel/Resources/Private/Language/locallang_info.xlf:imagesSize"/></th>
+ <th scope="row" class="typo3-adminPanel-table-cell-key"><f:translate key="LLL:EXT:adminpanel/Resources/Private/Language/locallang_info.xlf:imagesSize" languageKey="{languageKey}"/></th>
<td>
<f:variable name="typeClass" value="string" />
<f:if condition="{info.imagesOnPage.totalSize as integer} === {info.imagesOnPage.totalSize}"><f:variable name="typeClass" value="integer" /></f:if>
@@ -51,18 +51,18 @@
</div>
</f:if>
- <f:render partial="Data/TableKeyValue" arguments="{label: 'Document Size', data: '{
+ <f:render partial="Data/TableKeyValue" arguments="{label: 'Document Size', languageKey: languageKey, data: '{
\'LLL:EXT:adminpanel/Resources/Private/Language/locallang_info.xlf:DocumentSize\': \'{info.documentSize}\'
}'}" debug="false"/>
</f:if>
-<f:render partial="Data/TableKeyValue" arguments="{label: 'Page', data: '{
+<f:render partial="Data/TableKeyValue" arguments="{label: 'Page', languageKey: languageKey, data: '{
\'LLL:EXT:adminpanel/Resources/Private/Language/locallang_info.xlf:pageUid\': info.pageUid,
\'LLL:EXT:adminpanel/Resources/Private/Language/locallang_info.xlf:pageType\': info.pageType
}'}" debug="false"/>
-<f:render partial="Data/TableKeyValue" arguments="{label: 'Frontend User Group', data: '{
+<f:render partial="Data/TableKeyValue" arguments="{label: 'Frontend User Group', languageKey: languageKey, data: '{
\'LLL:EXT:adminpanel/Resources/Private/Language/locallang_info.xlf:groupList\': info.groupList
}'}" debug="false"/>
@@ -70,22 +70,22 @@
<f:then><f:variable name="isCachedInfo">LLL:EXT:adminpanel/Resources/Private/Language/locallang_info.xlf:noCache_no</f:variable></f:then>
<f:else><f:variable name="isCachedInfo">LLL:EXT:adminpanel/Resources/Private/Language/locallang_info.xlf:noCache_yes</f:variable></f:else>
</f:if>
-<f:render partial="Data/TableKeyValue" arguments="{label: 'Cache', data: '{
+<f:render partial="Data/TableKeyValue" arguments="{label: 'Cache', languageKey: languageKey, data: '{
\'LLL:EXT:adminpanel/Resources/Private/Language/locallang_info.xlf:noCache\': isCachedInfo
}'}" debug="false"/>
-<f:render partial="Data/TableKeyValue" arguments="{label: 'UserIntObjects', data: '{
+<f:render partial="Data/TableKeyValue" arguments="{label: 'UserIntObjects', languageKey: languageKey, data: '{
\'LLL:EXT:adminpanel/Resources/Private/Language/locallang_info.xlf:countUserInt\': info.countUserInt
}'}" debug="false"/>
<f:if condition="{info.feUser.uid} > 0">
- <f:render partial="Data/TableKeyValue" arguments="{label: 'Frontend User', data: '{
+ <f:render partial="Data/TableKeyValue" arguments="{label: 'Frontend User', languageKey: languageKey, data: '{
\'LLL:EXT:adminpanel/Resources/Private/Language/locallang_info.xlf:feuserName\': info.feUser.username,
\'LLL:EXT:adminpanel/Resources/Private/Language/locallang_info.xlf:feuserId\': info.feUser.uid
}'}" debug="false"/>
</f:if>
-<f:render partial="Data/TableKeyValue" arguments="{label: 'Total Parsetime', data: '{
+<f:render partial="Data/TableKeyValue" arguments="{label: 'Total Parsetime', languageKey: languageKey, data: '{
\'LLL:EXT:adminpanel/Resources/Private/Language/locallang_info.xlf:totalParsetime\': \'{info.totalParsetime} ms\'
}'}" debug="false"/>
diff --git a/typo3/sysext/adminpanel/Resources/Private/Templates/Modules/Info/PhpInfo.html b/typo3/sysext/adminpanel/Resources/Private/Templates/Modules/Info/PhpInfo.html
index 62c1b496b614fe15386b3b7689f6e8c317894851..c80ac8124fb3356faddb796633eb8754a86abde6 100644
--- a/typo3/sysext/adminpanel/Resources/Private/Templates/Modules/Info/PhpInfo.html
+++ b/typo3/sysext/adminpanel/Resources/Private/Templates/Modules/Info/PhpInfo.html
@@ -1,6 +1,6 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
-<f:render partial="Data/TableKeyValue" arguments="{label: 'General', data: general}" debug="false"/>
-<f:render partial="Data/TableKeyValue" arguments="{label: 'Constants', data: constants.user}" debug="false"/>
+<f:render partial="Data/TableKeyValue" arguments="{label: 'General', data: general, languageKey: languageKey}" debug="false"/>
+<f:render partial="Data/TableKeyValue" arguments="{label: 'Constants', data: constants.user, languageKey: languageKey}" debug="false"/>
<h2 class="typo3-adminPanel-headline">Extensions</h2>
<pre class="typo3-adminPanel-dump">{loadedExtensions}</pre>
</html>
diff --git a/typo3/sysext/adminpanel/Resources/Private/Templates/Modules/Info/RequestInformation.html b/typo3/sysext/adminpanel/Resources/Private/Templates/Modules/Info/RequestInformation.html
index 6479ac9bd2f5eb4f832d96555c8af654ca9cba81..887b37c76f08912c22a98f4e348aca5be28875c1 100644
--- a/typo3/sysext/adminpanel/Resources/Private/Templates/Modules/Info/RequestInformation.html
+++ b/typo3/sysext/adminpanel/Resources/Private/Templates/Modules/Info/RequestInformation.html
@@ -1,7 +1,7 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
-<f:render partial="Data/TableKeyValue" arguments="{label: '$_GET', data: get}" debug="false"/>
-<f:render partial="Data/TableKeyValue" arguments="{label: '$_POST', data: post}" debug="false"/>
-<f:render partial="Data/TableKeyValue" arguments="{label: '$_COOKIE', data: cookie}" debug="false"/>
-<f:render partial="Data/TableKeyValue" arguments="{label: '$_SESSION', data: session}" debug="false"/>
-<f:render partial="Data/TableKeyValue" arguments="{label: '$_SERVER', data: server}" debug="false"/>
+<f:render partial="Data/TableKeyValue" arguments="{label: '$_GET', data: get, languageKey: languageKey}" debug="false"/>
+<f:render partial="Data/TableKeyValue" arguments="{label: '$_POST', data: post, languageKey: languageKey}" debug="false"/>
+<f:render partial="Data/TableKeyValue" arguments="{label: '$_COOKIE', data: cookie, languageKey: languageKey}" debug="false"/>
+<f:render partial="Data/TableKeyValue" arguments="{label: '$_SESSION', data: session, languageKey: languageKey}" debug="false"/>
+<f:render partial="Data/TableKeyValue" arguments="{label: '$_SERVER', data: server, languageKey: languageKey}" debug="false"/>
</html>
diff --git a/typo3/sysext/adminpanel/Resources/Private/Templates/Modules/Info/UserInt.html b/typo3/sysext/adminpanel/Resources/Private/Templates/Modules/Info/UserInt.html
index f495ae3bd7a84793caedf2d480e14347c7742bbc..b6021c148d3be9c76aa9096ec3b0286000ec944e 100644
--- a/typo3/sysext/adminpanel/Resources/Private/Templates/Modules/Info/UserInt.html
+++ b/typo3/sysext/adminpanel/Resources/Private/Templates/Modules/Info/UserInt.html
@@ -3,11 +3,11 @@
<f:if condition="{userIntInfo -> f:count()} > 0">
<f:then>
<f:for each="{userIntInfo}" as="info" key="label">
- <f:render partial="Data/TableKeyValue" arguments="{label: label, data: info}" debug="false"/>
+ <f:render partial="Data/TableKeyValue" arguments="{label: label, data: info, languageKey: languageKey}" debug="false"/>
</f:for>
</f:then>
<f:else>
- <p><f:translate key="LLL:EXT:adminpanel/Resources/Private/Language/locallang_info.xlf:noUserInt"/></p>
+ <p><f:translate key="LLL:EXT:adminpanel/Resources/Private/Language/locallang_info.xlf:noUserInt" languageKey="{languageKey}"/></p>
</f:else>
</f:if>
</html>
diff --git a/typo3/sysext/adminpanel/Resources/Private/Templates/Modules/Settings/Cache.html b/typo3/sysext/adminpanel/Resources/Private/Templates/Modules/Settings/Cache.html
index 089e59d89f07d987d212e96a46cc784ade8953ea..a537865d42ebe261b1ea96cbcc80ac576013e409 100644
--- a/typo3/sysext/adminpanel/Resources/Private/Templates/Modules/Settings/Cache.html
+++ b/typo3/sysext/adminpanel/Resources/Private/Templates/Modules/Settings/Cache.html
@@ -2,16 +2,17 @@
<f:render partial="Form/Checkbox" arguments="{
label: 'LLL:EXT:adminpanel/Resources/Private/Language/locallang_cache.xlf:cache.no_cache',
name: 'cache_noCache',
+ languageKey: languageKey,
value: noCache }" debug="false"/>
<div class="typo3-adminPanel-form-group">
<f:form.button class="typo3-adminPanel-btn typo3-adminPanel-btn-default" data="{'typo3-ajax-url': clearCurrentPageCacheUrl, 'typo3-role': 'clearCacheButton'}" type="button">
- {f:translate(key:'LLL:EXT:adminpanel/Resources/Private/Language/locallang_cache.xlf:cache.clear_current')}
+ {f:translate(key:'LLL:EXT:adminpanel/Resources/Private/Language/locallang_cache.xlf:cache.clear_current', languageKey: languageKey)}
</f:form.button>
</div>
<f:if condition="{clearPageCacheUrl}">
<div class="typo3-adminPanel-form-group">
<f:form.button class="typo3-adminPanel-btn typo3-adminPanel-btn-default" data="{'typo3-ajax-url': clearPageCacheUrl, 'typo3-role': 'clearCacheButton'}" type="button">
- {f:translate(key:'LLL:EXT:adminpanel/Resources/Private/Language/locallang_cache.xlf:cache.clear_pages')}
+ {f:translate(key:'LLL:EXT:adminpanel/Resources/Private/Language/locallang_cache.xlf:cache.clear_pages', languageKey: languageKey)}
</f:form.button>
</div>
</f:if>
diff --git a/typo3/sysext/adminpanel/Resources/Private/Templates/Modules/Settings/Preview.html b/typo3/sysext/adminpanel/Resources/Private/Templates/Modules/Settings/Preview.html
index 01ba493fe19b810acff441c0f0a01297830ba45e..af4d94214e4ea8b658e189de788471b0479e927d 100644
--- a/typo3/sysext/adminpanel/Resources/Private/Templates/Modules/Settings/Preview.html
+++ b/typo3/sysext/adminpanel/Resources/Private/Templates/Modules/Settings/Preview.html
@@ -2,25 +2,31 @@
<f:render partial="Form/Checkbox" arguments="{
label: 'LLL:EXT:adminpanel/Resources/Private/Language/locallang_preview.xlf:showHiddenPages',
name: 'preview_showHiddenPages',
+ languageKey: languageKey,
value: show.hiddenPages }" debug="false"/>
<f:render partial="Form/Checkbox" arguments="{
label: 'LLL:EXT:adminpanel/Resources/Private/Language/locallang_preview.xlf:showHiddenRecords',
name: 'preview_showHiddenRecords',
+ languageKey: languageKey,
value: show.hiddenRecords }" debug="false"/>
<f:render partial="Form/Checkbox" arguments="{
label: 'LLL:EXT:adminpanel/Resources/Private/Language/locallang_preview.xlf:showFluidDebug',
name: 'preview_showFluidDebug',
+ languageKey: languageKey,
value: show.fluidDebug }" debug="false"/>
<f:render partial="Form/Hidden" arguments="{
name: 'preview_clearCacheId',
+ languageKey: languageKey,
value: show.pageId }" debug="false"/>
<f:render partial="Form/DateTime" arguments="{
label: 'LLL:EXT:adminpanel/Resources/Private/Language/locallang_preview.xlf:simulateDate',
name: 'preview_simulateDate',
+ languageKey: languageKey,
value: simulateDate }" debug="false"/>
<f:render partial="Form/Select" arguments="{
label: 'LLL:EXT:adminpanel/Resources/Private/Language/locallang_preview.xlf:simulateUserGroup',
name: 'preview_simulateUserGroup',
+ languageKey: languageKey,
options: frontendUserGroups.availableGroups,
optionValue: 'uid',
optionLabel: 'title',
diff --git a/typo3/sysext/adminpanel/Resources/Private/Templates/Modules/TsDebug/TypoScriptSettings.html b/typo3/sysext/adminpanel/Resources/Private/Templates/Modules/TsDebug/TypoScriptSettings.html
index 6684b365374e5a0b395833ea16f806f6a73e8376..229dcee6af19869e21f78e0ecd8fab1c87ed507b 100644
--- a/typo3/sysext/adminpanel/Resources/Private/Templates/Modules/TsDebug/TypoScriptSettings.html
+++ b/typo3/sysext/adminpanel/Resources/Private/Templates/Modules/TsDebug/TypoScriptSettings.html
@@ -2,25 +2,31 @@
<f:render partial="Form/Checkbox" arguments="{
label: 'LLL:EXT:adminpanel/Resources/Private/Language/locallang_tsdebug.xlf:treeDisplay',
name: 'tsdebug_tree',
+ languageKey: languageKey,
value: tree }" debug="false"/>
<f:render partial="Form/Checkbox" arguments="{
label: 'LLL:EXT:adminpanel/Resources/Private/Language/locallang_tsdebug.xlf:displayTimes',
name: 'tsdebug_displayTimes',
+ languageKey: languageKey,
value: display.times }" debug="false"/>
<f:render partial="Form/Checkbox" arguments="{
label: 'LLL:EXT:adminpanel/Resources/Private/Language/locallang_tsdebug.xlf:displayMessages',
name: 'tsdebug_displayMessages',
+ languageKey: languageKey,
value: display.messages }" debug="false"/>
<f:render partial="Form/Checkbox" arguments="{
label: 'LLL:EXT:adminpanel/Resources/Private/Language/locallang_tsdebug.xlf:trackContentRendering',
name: 'tsdebug_LR',
+ languageKey: languageKey,
value: trackContentRendering }" debug="false"/>
<f:render partial="Form/Checkbox" arguments="{
label: 'LLL:EXT:adminpanel/Resources/Private/Language/locallang_tsdebug.xlf:displayContent',
name: 'tsdebug_displayContent',
+ languageKey: languageKey,
value: display.content }" debug="false"/>
<f:render partial="Form/Checkbox" arguments="{
label: 'LLL:EXT:adminpanel/Resources/Private/Language/locallang_tsdebug.xlf:forceTemplateParsing',
name: 'tsdebug_forceTemplateParsing',
+ languageKey: languageKey,
value: forceTemplateParsing }" debug="false"/>
</html>