Commit 05c97180 authored by Wouter Wolters's avatar Wouter Wolters Committed by Andreas Fernandez
Browse files

[!!!][TASK] Move last language files away from language extension

This commit moves any language file of EXT:lang into a proper
destination, which renders EXT:lang obsolete.
This change requires an update of typo3/testing-framework, done with this
command:

composer update typo3/testing-framework

Resolves: #84680
Releases: master
Change-Id: I7ba59c1a10015121ed444a9c98082bad0348e03d
Reviewed-on: https://review.typo3.org/56017

Reviewed-by: Georg Ringer's avatarGeorg Ringer <georg.ringer@gmail.com>
Tested-by: Georg Ringer's avatarGeorg Ringer <georg.ringer@gmail.com>
Tested-by: default avatarTYPO3com <no-reply@typo3.com>
Reviewed-by: default avatarRiny van Tiggelen <info@online-gamer.nl>
Reviewed-by: Susanne Moog's avatarSusanne Moog <susanne.moog@typo3.org>
Tested-by: Susanne Moog's avatarSusanne Moog <susanne.moog@typo3.org>
Reviewed-by: Andreas Fernandez's avatarAndreas Fernandez <a.fernandez@scripting-base.de>
Tested-by: Andreas Fernandez's avatarAndreas Fernandez <a.fernandez@scripting-base.de>
parent ac88689f
{ {
"_readme": [ "_readme": [
"This file locks the dependencies of your project to a known state", "This file locks the dependencies of your project to a known state",
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "6b404527bc7f74c90e989244e882ba8f", "content-hash": "d7aa1d6bb21a2a96e095290923fb34cc",
"packages": [ "packages": [
{ {
"name": "cogpowered/finediff", "name": "cogpowered/finediff",
...@@ -4511,16 +4511,16 @@ ...@@ -4511,16 +4511,16 @@
}, },
{ {
"name": "typo3/testing-framework", "name": "typo3/testing-framework",
"version": "3.3.0", "version": "3.4.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/TYPO3/testing-framework.git", "url": "https://github.com/TYPO3/testing-framework.git",
"reference": "bad054fd079e669cd3fe8271cf8ba9f418a1ff22" "reference": "19f8b36aaac1815fa9c98600c292c41a11b008eb"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/TYPO3/testing-framework/zipball/bad054fd079e669cd3fe8271cf8ba9f418a1ff22", "url": "https://api.github.com/repos/TYPO3/testing-framework/zipball/19f8b36aaac1815fa9c98600c292c41a11b008eb",
"reference": "bad054fd079e669cd3fe8271cf8ba9f418a1ff22", "reference": "19f8b36aaac1815fa9c98600c292c41a11b008eb",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -4569,7 +4569,7 @@ ...@@ -4569,7 +4569,7 @@
"tests", "tests",
"typo3" "typo3"
], ],
"time": "2018-03-16T08:17:37+00:00" "time": "2018-04-15T12:42:35+00:00"
}, },
{ {
"name": "webmozart/assert", "name": "webmozart/assert",
......
...@@ -4,5 +4,5 @@ ...@@ -4,5 +4,5 @@
<br> <br>
<h1> <h1>
TYPO3 CMS {currentVersion}<br> TYPO3 CMS {currentVersion}<br>
<f:translate key="LLL:EXT:lang/Resources/Private/Language/locallang_alt_intro.xlf:introtext" /> <f:translate key="LLL:EXT:about/Resources/Private/Language/Modules/locallang_alt_intro.xlf:introtext" />
</h1> </h1>
<p> <p>
<f:translate key="LLL:EXT:lang/Resources/Private/Language/locallang_alt_intro.xlf:introtext2" /> <f:translate key="LLL:EXT:about/Resources/Private/Language/Modules/locallang_alt_intro.xlf:introtext2" />
</p> </p>
<f:for each="{modules}" as="mainModule"> <f:for each="{modules}" as="mainModule">
<f:if condition="{mainModule.subModules}"> <f:if condition="{mainModule.subModules}">
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<f:render partial="Logo" arguments="{_all}" /> <f:render partial="Logo" arguments="{_all}" />
<f:if condition="{warnings}"> <f:if condition="{warnings}">
<f:be.infobox title="{f:translate(key: 'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:warning.header')}" state="2"> <f:be.infobox title="{f:translate(key: 'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:warning.header')}" state="2">
<f:if condition="{f:count(subject: warnings)} > 1"> <f:if condition="{f:count(subject: warnings)} > 1">
<f:then> <f:then>
<ul> <ul>
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
<p> <p>
<em class="text-muted"> <em class="text-muted">
<f:translate key="LLL:EXT:lang/Resources/Private/Language/locallang_alt_intro.xlf:endText" /> <f:translate key="LLL:EXT:about/Resources/Private/Language/Modules/locallang_alt_intro.xlf:endText" />
</em> </em>
</p> </p>
<p>{copyRightNotice -> f:format.raw()}</p> <p>{copyRightNotice -> f:format.raw()}</p>
......
...@@ -119,7 +119,7 @@ abstract class AbstractModule implements AdminPanelModuleInterface ...@@ -119,7 +119,7 @@ abstract class AbstractModule implements AdminPanelModuleInterface
/** /**
* Translate given key * Translate given key
* *
* @param string $key Key for a label in the $LOCAL_LANG array of "sysext/lang/Resources/Private/Language/locallang_tsfe.xlf * @param string $key Key for a label in the $LOCAL_LANG array of "sysext/core/Resources/Private/Language/locallang_tsfe.xlf
* @param bool $convertWithHtmlspecialchars If TRUE the language-label will be sent through htmlspecialchars * @param bool $convertWithHtmlspecialchars If TRUE the language-label will be sent through htmlspecialchars
* @return string The value for the $key * @return string The value for the $key
*/ */
......
...@@ -143,7 +143,7 @@ class AdminPanelView ...@@ -143,7 +143,7 @@ class AdminPanelView
*/ */
public function display() public function display()
{ {
$this->getLanguageService()->includeLLFile('EXT:lang/Resources/Private/Language/locallang_tsfe.xlf'); $this->getLanguageService()->includeLLFile('EXT:core/Resources/Private/Language/locallang_tsfe.xlf');
$moduleContent = ''; $moduleContent = '';
...@@ -362,7 +362,7 @@ class AdminPanelView ...@@ -362,7 +362,7 @@ class AdminPanelView
/** /**
* Translate given key * Translate given key
* *
* @param string $key Key for a label in the $LOCAL_LANG array of "sysext/lang/Resources/Private/Language/locallang_tsfe.xlf * @param string $key Key for a label in the $LOCAL_LANG array of "sysext/core/Resources/Private/Language/locallang_tsfe.xlf
* @param bool $convertWithHtmlspecialchars If TRUE the language-label will be sent through htmlspecialchars * @param bool $convertWithHtmlspecialchars If TRUE the language-label will be sent through htmlspecialchars
* @return string The value for the $key * @return string The value for the $key
*/ */
......
...@@ -53,8 +53,8 @@ class ClearCacheToolbarItem implements ToolbarItemInterface ...@@ -53,8 +53,8 @@ class ClearCacheToolbarItem implements ToolbarItemInterface
if ($backendUser->isAdmin() || $backendUser->getTSConfigVal('options.clearCache.pages')) { if ($backendUser->isAdmin() || $backendUser->getTSConfigVal('options.clearCache.pages')) {
$this->cacheActions[] = [ $this->cacheActions[] = [
'id' => 'pages', 'id' => 'pages',
'title' => 'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:flushPageCachesTitle', 'title' => 'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:flushPageCachesTitle',
'description' => 'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:flushPageCachesDescription', 'description' => 'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:flushPageCachesDescription',
'href' => (string)$uriBuilder->buildUriFromRoute('tce_db', ['cacheCmd' => 'pages']), 'href' => (string)$uriBuilder->buildUriFromRoute('tce_db', ['cacheCmd' => 'pages']),
'iconIdentifier' => 'actions-system-cache-clear-impact-low' 'iconIdentifier' => 'actions-system-cache-clear-impact-low'
]; ];
...@@ -67,8 +67,8 @@ class ClearCacheToolbarItem implements ToolbarItemInterface ...@@ -67,8 +67,8 @@ class ClearCacheToolbarItem implements ToolbarItemInterface
if ($backendUser->getTSConfigVal('options.clearCache.all') || ($backendUser->isAdmin() && $backendUser->getTSConfigVal('options.clearCache.all') !== '0')) { if ($backendUser->getTSConfigVal('options.clearCache.all') || ($backendUser->isAdmin() && $backendUser->getTSConfigVal('options.clearCache.all') !== '0')) {
$this->cacheActions[] = [ $this->cacheActions[] = [
'id' => 'all', 'id' => 'all',
'title' => 'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:flushAllCachesTitle2', 'title' => 'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:flushAllCachesTitle2',
'description' => 'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:flushAllCachesDescription2', 'description' => 'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:flushAllCachesDescription2',
'href' => (string)$uriBuilder->buildUriFromRoute('tce_db', ['cacheCmd' => 'all']), 'href' => (string)$uriBuilder->buildUriFromRoute('tce_db', ['cacheCmd' => 'all']),
'iconIdentifier' => 'actions-system-cache-clear-impact-high' 'iconIdentifier' => 'actions-system-cache-clear-impact-high'
]; ];
......
...@@ -91,7 +91,7 @@ class ShortcutToolbarItem implements ToolbarItemInterface ...@@ -91,7 +91,7 @@ class ShortcutToolbarItem implements ToolbarItemInterface
public function __construct() public function __construct()
{ {
$this->iconFactory = GeneralUtility::makeInstance(IconFactory::class); $this->iconFactory = GeneralUtility::makeInstance(IconFactory::class);
$this->getLanguageService()->includeLLFile('EXT:lang/Resources/Private/Language/locallang_misc.xlf'); $this->getLanguageService()->includeLLFile('EXT:core/Resources/Private/Language/locallang_misc.xlf');
// Needed to get the correct icons when reloading the menu after saving it // Needed to get the correct icons when reloading the menu after saving it
$this->moduleLoader = GeneralUtility::makeInstance(ModuleLoader::class); $this->moduleLoader = GeneralUtility::makeInstance(ModuleLoader::class);
$this->moduleLoader->load($GLOBALS['TBE_MODULES']); $this->moduleLoader->load($GLOBALS['TBE_MODULES']);
...@@ -110,11 +110,11 @@ class ShortcutToolbarItem implements ToolbarItemInterface ...@@ -110,11 +110,11 @@ class ShortcutToolbarItem implements ToolbarItemInterface
$this->getPageRenderer()->loadRequireJsModule('TYPO3/CMS/Backend/Toolbar/ShortcutMenu'); $this->getPageRenderer()->loadRequireJsModule('TYPO3/CMS/Backend/Toolbar/ShortcutMenu');
$languageService = $this->getLanguageService(); $languageService = $this->getLanguageService();
$this->getPageRenderer()->addInlineLanguageLabelArray([ $this->getPageRenderer()->addInlineLanguageLabelArray([
'bookmark.delete' => $languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:toolbarItems.bookmarksDelete'), 'bookmark.delete' => $languageService->sL('LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:toolbarItems.bookmarksDelete'),
'bookmark.confirmDelete' => $languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:toolbarItems.confirmBookmarksDelete'), 'bookmark.confirmDelete' => $languageService->sL('LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:toolbarItems.confirmBookmarksDelete'),
'bookmark.create' => $languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:toolbarItems.createBookmark'), 'bookmark.create' => $languageService->sL('LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:toolbarItems.createBookmark'),
'bookmark.savedTitle' => $languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:toolbarItems.bookmarkSavedTitle'), 'bookmark.savedTitle' => $languageService->sL('LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:toolbarItems.bookmarkSavedTitle'),
'bookmark.savedMessage' => $languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:toolbarItems.bookmarkSavedMessage'), 'bookmark.savedMessage' => $languageService->sL('LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:toolbarItems.bookmarkSavedMessage'),
]); ]);
} }
...@@ -416,7 +416,7 @@ class ShortcutToolbarItem implements ToolbarItemInterface ...@@ -416,7 +416,7 @@ class ShortcutToolbarItem implements ToolbarItemInterface
$groupId = (int)$groupId; $groupId = (int)$groupId;
$label = $groupLabel; $label = $groupLabel;
if ($groupLabel == '1') { if ($groupLabel == '1') {
$label = htmlspecialchars($languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_misc.xlf:bookmark_group_' . abs($groupId))); $label = htmlspecialchars($languageService->sL('LLL:EXT:core/Resources/Private/Language/locallang_misc.xlf:bookmark_group_' . abs($groupId)));
if (empty($label)) { if (empty($label)) {
// Fallback label // Fallback label
$label = htmlspecialchars($languageService->getLL('bookmark_group')) . ' ' . abs($groupId); $label = htmlspecialchars($languageService->getLL('bookmark_group')) . ' ' . abs($groupId);
...@@ -424,7 +424,7 @@ class ShortcutToolbarItem implements ToolbarItemInterface ...@@ -424,7 +424,7 @@ class ShortcutToolbarItem implements ToolbarItemInterface
} }
if ($groupId < 0) { if ($groupId < 0) {
// Global group // Global group
$label = htmlspecialchars($languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_misc.xlf:bookmark_global')) . ': ' . (!empty($label) ? $label : abs($groupId)); $label = htmlspecialchars($languageService->sL('LLL:EXT:core/Resources/Private/Language/locallang_misc.xlf:bookmark_global')) . ': ' . (!empty($label) ? $label : abs($groupId));
if ($groupId === self::SUPERGLOBAL_GROUP) { if ($groupId === self::SUPERGLOBAL_GROUP) {
$label = htmlspecialchars($languageService->getLL('bookmark_global')) . ': ' . htmlspecialchars($languageService->getLL('bookmark_all')); $label = htmlspecialchars($languageService->getLL('bookmark_global')) . ': ' . htmlspecialchars($languageService->getLL('bookmark_all'));
} }
......
...@@ -234,7 +234,7 @@ class SystemInformationToolbarItem implements ToolbarItemInterface ...@@ -234,7 +234,7 @@ class SystemInformationToolbarItem implements ToolbarItemInterface
protected function getTypo3Version() protected function getTypo3Version()
{ {
$this->systemInformation[] = [ $this->systemInformation[] = [
'title' => 'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:toolbarItems.sysinfo.typo3-version', 'title' => 'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:toolbarItems.sysinfo.typo3-version',
'value' => VersionNumberUtility::getCurrentTypo3Version(), 'value' => VersionNumberUtility::getCurrentTypo3Version(),
'iconIdentifier' => 'information-typo3-version' 'iconIdentifier' => 'information-typo3-version'
]; ];
...@@ -246,7 +246,7 @@ class SystemInformationToolbarItem implements ToolbarItemInterface ...@@ -246,7 +246,7 @@ class SystemInformationToolbarItem implements ToolbarItemInterface
protected function getWebServer() protected function getWebServer()
{ {
$this->systemInformation[] = [ $this->systemInformation[] = [
'title' => 'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:toolbarItems.sysinfo.webserver', 'title' => 'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:toolbarItems.sysinfo.webserver',
'value' => $_SERVER['SERVER_SOFTWARE'], 'value' => $_SERVER['SERVER_SOFTWARE'],
'iconIdentifier' => 'information-webserver' 'iconIdentifier' => 'information-webserver'
]; ];
...@@ -258,7 +258,7 @@ class SystemInformationToolbarItem implements ToolbarItemInterface ...@@ -258,7 +258,7 @@ class SystemInformationToolbarItem implements ToolbarItemInterface
protected function getPhpVersion() protected function getPhpVersion()
{ {
$this->systemInformation[] = [ $this->systemInformation[] = [
'title' => 'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:toolbarItems.sysinfo.phpversion', 'title' => 'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:toolbarItems.sysinfo.phpversion',
'value' => PHP_VERSION, 'value' => PHP_VERSION,
'iconIdentifier' => 'information-php-version' 'iconIdentifier' => 'information-php-version'
]; ];
...@@ -271,7 +271,7 @@ class SystemInformationToolbarItem implements ToolbarItemInterface ...@@ -271,7 +271,7 @@ class SystemInformationToolbarItem implements ToolbarItemInterface
{ {
foreach (GeneralUtility::makeInstance(ConnectionPool::class)->getConnectionNames() as $connectionName) { foreach (GeneralUtility::makeInstance(ConnectionPool::class)->getConnectionNames() as $connectionName) {
$this->systemInformation[] = [ $this->systemInformation[] = [
'title' => 'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:toolbarItems.sysinfo.database', 'title' => 'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:toolbarItems.sysinfo.database',
'titleAddition' => $connectionName, 'titleAddition' => $connectionName,
'value' => GeneralUtility::makeInstance(ConnectionPool::class) 'value' => GeneralUtility::makeInstance(ConnectionPool::class)
->getConnectionByName($connectionName) ->getConnectionByName($connectionName)
...@@ -288,7 +288,7 @@ class SystemInformationToolbarItem implements ToolbarItemInterface ...@@ -288,7 +288,7 @@ class SystemInformationToolbarItem implements ToolbarItemInterface
{ {
$applicationContext = GeneralUtility::getApplicationContext(); $applicationContext = GeneralUtility::getApplicationContext();
$this->systemInformation[] = [ $this->systemInformation[] = [
'title' => 'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:toolbarItems.sysinfo.applicationcontext', 'title' => 'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:toolbarItems.sysinfo.applicationcontext',
'value' => (string)$applicationContext, 'value' => (string)$applicationContext,
'status' => $applicationContext->isProduction() ? InformationStatus::STATUS_OK : InformationStatus::STATUS_WARNING, 'status' => $applicationContext->isProduction() ? InformationStatus::STATUS_OK : InformationStatus::STATUS_WARNING,
'iconIdentifier' => 'information-application-context' 'iconIdentifier' => 'information-application-context'
...@@ -305,8 +305,8 @@ class SystemInformationToolbarItem implements ToolbarItemInterface ...@@ -305,8 +305,8 @@ class SystemInformationToolbarItem implements ToolbarItemInterface
} }
$this->systemInformation[] = [ $this->systemInformation[] = [
'title' => 'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:toolbarItems.sysinfo.composerMode', 'title' => 'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:toolbarItems.sysinfo.composerMode',
'value' => $GLOBALS['LANG']->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.enabled'), 'value' => $GLOBALS['LANG']->sL('LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:labels.enabled'),
'iconIdentifier' => 'information-composer-mode' 'iconIdentifier' => 'information-composer-mode'
]; ];
} }
...@@ -330,7 +330,7 @@ class SystemInformationToolbarItem implements ToolbarItemInterface ...@@ -330,7 +330,7 @@ class SystemInformationToolbarItem implements ToolbarItemInterface
$branch = trim(CommandUtility::exec('git rev-parse --abbrev-ref HEAD')); $branch = trim(CommandUtility::exec('git rev-parse --abbrev-ref HEAD'));
if (!empty($revision) && !empty($branch)) { if (!empty($revision) && !empty($branch)) {
$this->systemInformation[] = [ $this->systemInformation[] = [
'title' => 'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:toolbarItems.sysinfo.gitrevision', 'title' => 'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:toolbarItems.sysinfo.gitrevision',
'value' => sprintf('%s [%s]', $revision, $branch), 'value' => sprintf('%s [%s]', $revision, $branch),
'iconIdentifier' => 'information-git' 'iconIdentifier' => 'information-git'
]; ];
...@@ -354,7 +354,7 @@ class SystemInformationToolbarItem implements ToolbarItemInterface ...@@ -354,7 +354,7 @@ class SystemInformationToolbarItem implements ToolbarItemInterface
$icon = 'windows'; $icon = 'windows';
} }
$this->systemInformation[] = [ $this->systemInformation[] = [
'title' => 'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:toolbarItems.sysinfo.operatingsystem', 'title' => 'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:toolbarItems.sysinfo.operatingsystem',
'value' => $kernelName . ' ' . php_uname('r'), 'value' => $kernelName . ' ' . php_uname('r'),
'iconIdentifier' => 'information-os-' . $icon 'iconIdentifier' => 'information-os-' . $icon
]; ];
......
...@@ -296,16 +296,16 @@ class Clipboard ...@@ -296,16 +296,16 @@ class Clipboard
} }
$confirmationMessage = sprintf( $confirmationMessage = sprintf(
$languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.deleteClip'), $languageService->sL('LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:mess.deleteClip'),
$elementCount $elementCount
); );
$title = $languageService $title = $languageService
->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.clipboard.delete_elements'); ->sL('LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:labels.clipboard.delete_elements');
$returnUrl = $this->deleteUrl(true, $this->fileMode); $returnUrl = $this->deleteUrl(true, $this->fileMode);
$btnOkText = $languageService $btnOkText = $languageService
->sL('LLL:EXT:lang/Resources/Private/Language/locallang_alt_doc.xlf:buttons.confirm.delete_elements.yes'); ->sL('LLL:EXT:backend/Resources/Private/Language/locallang_alt_doc.xlf:buttons.confirm.delete_elements.yes');
$btnCancelText = $languageService $btnCancelText = $languageService
->sL('LLL:EXT:lang/Resources/Private/Language/locallang_alt_doc.xlf:buttons.confirm.delete_elements.no'); ->sL('LLL:EXT:backend/Resources/Private/Language/locallang_alt_doc.xlf:buttons.confirm.delete_elements.no');
$optionArray[] = [ $optionArray[] = [
'label' => htmlspecialchars($title), 'label' => htmlspecialchars($title),
'uri' => $returnUrl, 'uri' => $returnUrl,
...@@ -323,7 +323,7 @@ class Clipboard ...@@ -323,7 +323,7 @@ class Clipboard
// Clear clipboard // Clear clipboard
$optionArray[] = [ $optionArray[] = [
'label' => $languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.clipboard.clear_clipboard', true), 'label' => $languageService->sL('LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:labels.clipboard.clear_clipboard', true),
'uri' => $removeAllUrl . '#clip_head' 'uri' => $removeAllUrl . '#clip_head'
]; ];
$this->view->assign('optionArray', $optionArray); $this->view->assign('optionArray', $optionArray);
...@@ -694,7 +694,7 @@ class Clipboard ...@@ -694,7 +694,7 @@ class Clipboard
public function confirmMsgText($table, $rec, $type, $clElements, $columnLabel = '') public function confirmMsgText($table, $rec, $type, $clElements, $columnLabel = '')
{ {
if ($this->getBackendUser()->jsConfirmation(JsConfirmation::COPY_MOVE_PASTE)) { if ($this->getBackendUser()->jsConfirmation(JsConfirmation::COPY_MOVE_PASTE)) {
$labelKey = 'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.' . ($this->currentMode() === 'copy' ? 'copy' : 'move') . ($this->current === 'normal' ? '' : 'cb') . '_' . $type; $labelKey = 'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:mess.' . ($this->currentMode() === 'copy' ? 'copy' : 'move') . ($this->current === 'normal' ? '' : 'cb') . '_' . $type;
$msg = $this->getLanguageService()->sL($labelKey . ($columnLabel ? '_colPos' : '')); $msg = $this->getLanguageService()->sL($labelKey . ($columnLabel ? '_colPos' : ''));
if ($table === '_FILE') { if ($table === '_FILE') {
$thisRecTitle = basename($rec); $thisRecTitle = basename($rec);
...@@ -735,7 +735,7 @@ class Clipboard ...@@ -735,7 +735,7 @@ class Clipboard
} }
/** /**
* Clipboard label - getting from "EXT:lang/Resources/Private/Language/locallang_core.xlf:" * Clipboard label - getting from "EXT:core/Resources/Private/Language/locallang_core.xlf:"
* *
* @param string $key Label Key * @param string $key Label Key
* @param string $Akey Alternative key to "labels * @param string $Akey Alternative key to "labels
...@@ -743,7 +743,7 @@ class Clipboard ...@@ -743,7 +743,7 @@ class Clipboard
*/ */
public function clLabel($key, $Akey = 'labels') public function clLabel($key, $Akey = 'labels')
{ {
return htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:' . $Akey . '.' . $key)); return htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:' . $Akey . '.' . $key));
} }
/** /**
......
...@@ -245,9 +245,9 @@ class TranslationConfigurationProvider ...@@ -245,9 +245,9 @@ class TranslationConfigurationProvider
protected function getDefaultLanguageLabel(array $modSharedTSconfig) protected function getDefaultLanguageLabel(array $modSharedTSconfig)
{ {
if (strlen($modSharedTSconfig['properties']['defaultLanguageLabel'])) { if (strlen($modSharedTSconfig['properties']['defaultLanguageLabel'])) {
$defaultLanguageLabel = $modSharedTSconfig['properties']['defaultLanguageLabel'] . ' (' . $this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_mod_web_list.xlf:defaultLanguage') . ')'; $defaultLanguageLabel = $modSharedTSconfig['properties']['defaultLanguageLabel'] . ' (' . $this->getLanguageService()->sL('LLL:EXT:core/Resources/Private/Language/locallang_mod_web_list.xlf:defaultLanguage') . ')';
} else { } else {
$defaultLanguageLabel = $this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_mod_web_list.xlf:defaultLanguage'); $defaultLanguageLabel = $this->getLanguageService()->sL('LLL:EXT:core/Resources/Private/Language/locallang_mod_web_list.xlf:defaultLanguage');
} }
return $defaultLanguageLabel; return $defaultLanguageLabel;
} }
......
...@@ -34,22 +34,22 @@ class PageProvider extends RecordProvider ...@@ -34,22 +34,22 @@ class PageProvider extends RecordProvider
*/ */
protected $itemsConfiguration = [ protected $itemsConfiguration = [
'view' => [ 'view' => [
'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.view', 'label' => 'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:cm.view',
'iconIdentifier' => 'actions-view-page', 'iconIdentifier' => 'actions-view-page',
'callbackAction' => 'viewRecord' 'callbackAction' => 'viewRecord'
], ],
'edit' => [ 'edit' => [
'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.edit', 'label' => 'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:cm.edit',
'iconIdentifier' => 'actions-page-open', 'iconIdentifier' => 'actions-page-open',
'callbackAction' => 'editRecord' 'callbackAction' => 'editRecord'
], ],
'new' => [ 'new' => [
'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.new', 'label' => 'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:cm.new',
'iconIdentifier' => 'actions-page-new', 'iconIdentifier' => 'actions-page-new',
'callbackAction' => 'newRecord' 'callbackAction' => 'newRecord'
], ],
'info' => [ 'info' => [
'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.info', 'label' => 'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:cm.info',
'iconIdentifier' => 'actions-document-info', 'iconIdentifier' => 'actions-document-info',
'callbackAction' => 'openInfoPopUp' 'callbackAction' => 'openInfoPopUp'
], ],
...@@ -57,32 +57,32 @@ class PageProvider extends RecordProvider ...@@ -57,32 +57,32 @@ class PageProvider extends RecordProvider
'type' => 'divider' 'type' => 'divider'
], ],
'copy' => [ 'copy' => [
'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.copy', 'label' => 'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:cm.copy',
'iconIdentifier' => 'actions-edit-copy', 'iconIdentifier' => 'actions-edit-copy',
'callbackAction' => 'copy' 'callbackAction' => 'copy'
], ],
'copyRelease' => [ 'copyRelease' => [
'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.copy', 'label' => 'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:cm.copy',
'iconIdentifier' => 'actions-edit-copy-release', 'iconIdentifier' => 'actions-edit-copy-release',
'callbackAction' => 'clipboardRelease' 'callbackAction' => 'clipboardRelease'
], ],
'cut' => [ 'cut' => [
'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.cut', 'label' => 'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:cm.cut',
'iconIdentifier' => 'actions-edit-cut', 'iconIdentifier' => 'actions-edit-cut',
'callbackAction' => 'cut' 'callbackAction' => 'cut'
], ],
'cutRelease' => [ 'cutRelease' => [
'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.cutrelease', 'label' => 'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:cm.cutrelease',
'iconIdentifier' => 'actions-edit-cut-release', 'iconIdentifier' => 'actions-edit-cut-release',
'callbackAction' => 'clipboardRelease' 'callbackAction' => 'clipboardRelease'
], ],
'pasteAfter' => [ 'pasteAfter' => [
'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.pasteafter', 'label' => 'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:cm.pasteafter',
'iconIdentifier' => 'actions-document-paste-after', 'iconIdentifier' => 'actions-document-paste-after',
'callbackAction' => 'pasteAfter' 'callbackAction' => 'pasteAfter'
], ],
'pasteInto' => [