Commit 2e93e516 authored by Wouter Wolters's avatar Wouter Wolters Committed by Jan Helke
Browse files

[TASK] Move language files in ext:lang to Resources folder

Move languages files from the root of ext:lang to
Resources/Private/Language/

Resolves: #78647
Releases: master
Change-Id: I9271442c98f2fcf705a38a639a6d503caeba1759
Reviewed-on: https://review.typo3.org/50584

Reviewed-by: Anja Leichsenring's avatarAnja Leichsenring <aleichsenring@ab-softlab.de>
Tested-by: Anja Leichsenring's avatarAnja Leichsenring <aleichsenring@ab-softlab.de>
Tested-by: default avatarTYPO3com <no-reply@typo3.com>
Reviewed-by: Jan Helke's avatarJan Helke <typo3@helke.de>
Tested-by: Jan Helke's avatarJan Helke <typo3@helke.de>
parent 6a3ee818
......@@ -98,7 +98,7 @@ class ModulesController extends ActionController
'TYPO3Version' => TYPO3_version,
'copyRightNotice' => BackendUtility::TYPO3_copyRightNotice(),
'warningMessages' => $securityWarnings,
'warningTitle' => $this->languageService->sL('LLL:EXT:lang/locallang_core.xlf:warning.header'),
'warningTitle' => $this->languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:warning.header'),
'modules' => $this->getModulesData()
]
);
......
<p>
{f:translate(key: 'LLL:EXT:lang/locallang_mod_help_about.xlf:cms_description',
{f:translate(key: 'LLL:EXT:lang/Resources/Private/Language/locallang_mod_help_about.xlf:cms_description',
arguments: '{
0: TYPO3Version,
1: "&copy; {TYPO3CopyrightYear}",
......
<div class="panel panel-default">
<div class="panel-body panel-body-highlightlinks">
<h2 class="h4">
<f:translate key="LLL:EXT:lang/locallang_mod_help_about.xlf:coredevs" />
<f:translate key="LLL:EXT:lang/Resources/Private/Language/locallang_mod_help_about.xlf:coredevs" />
</h2>
<p>
{f:translate(key: 'LLL:EXT:lang/locallang_mod_help_about.xlf:coredevs_detail') -> f:format.raw()}
{f:translate(key: 'LLL:EXT:lang/Resources/Private/Language/locallang_mod_help_about.xlf:coredevs_detail') -> f:format.raw()}
</p>
</div>
</div>
<div class="panel panel-default">
<div class="panel-body panel-body-highlightlinks">
<h2 class="h4">
{f:translate(key: 'LLL:EXT:lang/locallang_mod_help_about.xlf:community_credits') -> f:format.raw()}
{f:translate(key: 'LLL:EXT:lang/Resources/Private/Language/locallang_mod_help_about.xlf:community_credits') -> f:format.raw()}
</h2>
<p>
{f:translate(key: 'LLL:EXT:lang/locallang_mod_help_about.xlf:information_detail') -> f:format.raw()}
{f:translate(key: 'LLL:EXT:lang/Resources/Private/Language/locallang_mod_help_about.xlf:information_detail') -> f:format.raw()}
</p>
</div>
</div>
<div class="panel panel-default">
<div class="panel-body panel-body-highlightlinks">
<h2 class="h4">
<f:translate key="LLL:EXT:lang/locallang_mod_help_about.xlf:donation_header" />
<f:translate key="LLL:EXT:lang/Resources/Private/Language/locallang_mod_help_about.xlf:donation_header" />
</h2>
<p>
{f:translate(key: 'LLL:EXT:lang/locallang_mod_help_about.xlf:donation_message') -> f:format.raw()}
{f:translate(key: 'LLL:EXT:lang/Resources/Private/Language/locallang_mod_help_about.xlf:donation_message') -> f:format.raw()}
</p>
<a href="{TYPO3UrlDonate}" class="btn btn-default" title="{f:translate(key:'LLL:EXT:lang/locallang_mod_help_about.xlf:donation_button')}" target="_blank">
<f:translate key="LLL:EXT:lang/locallang_mod_help_about.xlf:donation_button" />
<a href="{TYPO3UrlDonate}" class="btn btn-default" title="{f:translate(key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_help_about.xlf:donation_button')}" target="_blank">
<f:translate key="LLL:EXT:lang/Resources/Private/Language/locallang_mod_help_about.xlf:donation_button" />
</a>
</div>
</div>
......@@ -2,17 +2,17 @@
<div class="panel panel-default">
<div class="panel-body panel-body-highlightlinks">
<h2 class="h3">
<f:translate key="LLL:EXT:lang/locallang_mod_help_about.xlf:extension_authors" />
<f:translate key="LLL:EXT:lang/Resources/Private/Language/locallang_mod_help_about.xlf:extension_authors" />
</h2>
<p>
<f:translate key="LLL:EXT:lang/locallang_mod_help_about.xlf:extension_list_info" />
<f:translate key="LLL:EXT:lang/Resources/Private/Language/locallang_mod_help_about.xlf:extension_list_info" />
</p>
</div>
<table class="table panel-table">
<thead>
<tr>
<th width="35%"><f:translate key="LLL:EXT:lang/locallang_mod_help_about.xlf:extension" /></th>
<th><f:translate key="LLL:EXT:lang/locallang_mod_help_about.xlf:extension_author" /></th>
<th width="35%"><f:translate key="LLL:EXT:lang/Resources/Private/Language/locallang_mod_help_about.xlf:extension" /></th>
<th><f:translate key="LLL:EXT:lang/Resources/Private/Language/locallang_mod_help_about.xlf:extension_author" /></th>
</tr>
</thead>
<tbody>
......
<div class="panel panel-default">
<div class="panel-body panel-body-highlightlinks">
<h2 class="h3">
<f:translate key="LLL:EXT:lang/locallang_mod_help_about.xlf:external_libraries" />
<f:translate key="LLL:EXT:lang/Resources/Private/Language/locallang_mod_help_about.xlf:external_libraries" />
</h2>
<p>
<f:translate key="LLL:EXT:lang/locallang_mod_help_about.xlf:external_thanks" />
<f:translate key="LLL:EXT:lang/Resources/Private/Language/locallang_mod_help_about.xlf:external_thanks" />
</p>
</div>
<table class="table panel-table">
......
<img src="{f:uri.resource(path: 'Images/typo3-transparent@2x.png', extensionName: 'backend')}" width="150"
alt="{f:translate(key:'LLL:EXT:lang/locallang_mod_help_about.xlf:typo3_logo')}" />
alt="{f:translate(key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_help_about.xlf:typo3_logo')}" />
<br>
<br>
<h1>
TYPO3 CMS {TYPO3Version}<br>
<f:translate key="LLL:EXT:lang/locallang_alt_intro.xlf:introtext" />
<f:translate key="LLL:EXT:lang/Resources/Private/Language/locallang_alt_intro.xlf:introtext" />
</h1>
......@@ -5,7 +5,7 @@
<div class="container-small">
<f:render partial="Logo" arguments="{_all}" />
<p>
<f:translate key="LLL:EXT:lang/locallang_alt_intro.xlf:introtext2" />
<f:translate key="LLL:EXT:lang/Resources/Private/Language/locallang_alt_intro.xlf:introtext2" />
</p>
<f:if condition="{warningMessages}">
<f:be.infobox title="{warningTitle}" state="2">{warningMessages -> f:format.raw()}</f:be.infobox>
......@@ -57,7 +57,7 @@
</div>
</f:if>
</f:for>
<p><em class="text-muted"><f:translate key="LLL:EXT:lang/locallang_alt_intro.xlf:endText" /></em></p>
<p><em class="text-muted"><f:translate key="LLL:EXT:lang/Resources/Private/Language/locallang_alt_intro.xlf:endText" /></em></p>
<p>{copyRightNotice -> f:format.raw()}</p>
</div>
......
......@@ -12,7 +12,7 @@ if (TYPO3_MODE === 'BE' && !(TYPO3_REQUESTTYPE & TYPO3_REQUESTTYPE_INSTALL)) {
[
'access' => 'user,group',
'icon' => 'EXT:about/Resources/Public/Icons/module-about.svg',
'labels' => 'LLL:EXT:lang/locallang_mod_help_about.xlf'
'labels' => 'LLL:EXT:lang/Resources/Private/Language/locallang_mod_help_about.xlf'
]
);
......
......@@ -60,8 +60,8 @@ class ClearCacheToolbarItem implements ToolbarItemInterface
if ($backendUser->isAdmin() || $backendUser->getTSConfigVal('options.clearCache.pages')) {
$this->cacheActions[] = [
'id' => 'pages',
'title' => htmlspecialchars($languageService->sL('LLL:EXT:lang/locallang_core.xlf:flushPageCachesTitle')),
'description' => htmlspecialchars($languageService->sL('LLL:EXT:lang/locallang_core.xlf:flushPageCachesDescription')),
'title' => htmlspecialchars($languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:flushPageCachesTitle')),
'description' => htmlspecialchars($languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:flushPageCachesDescription')),
'href' => BackendUtility::getModuleUrl('tce_db', ['vC' => $backendUser->veriCode(), 'cacheCmd' => 'pages']),
'icon' => $this->iconFactory->getIcon('actions-system-cache-clear-impact-low', Icon::SIZE_SMALL)->render()
];
......@@ -74,8 +74,8 @@ class ClearCacheToolbarItem implements ToolbarItemInterface
if ($backendUser->getTSConfigVal('options.clearCache.all') || ($backendUser->isAdmin() && $backendUser->getTSConfigVal('options.clearCache.all') !== '0')) {
$this->cacheActions[] = [
'id' => 'all',
'title' => htmlspecialchars($languageService->sL('LLL:EXT:lang/locallang_core.xlf:flushAllCachesTitle2')),
'description' => htmlspecialchars($languageService->sL('LLL:EXT:lang/locallang_core.xlf:flushAllCachesDescription2')),
'title' => htmlspecialchars($languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:flushAllCachesTitle2')),
'description' => htmlspecialchars($languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:flushAllCachesDescription2')),
'href' => BackendUtility::getModuleUrl('tce_db', ['vC' => $backendUser->veriCode(), 'cacheCmd' => 'all']),
'icon' => $this->iconFactory->getIcon('actions-system-cache-clear-impact-high', Icon::SIZE_SMALL)->render()
];
......@@ -126,7 +126,7 @@ class ClearCacheToolbarItem implements ToolbarItemInterface
$templateReference = 'ClearCacheToolbarItem.html';
$icon = $this->iconFactory->getIcon('apps-toolbar-menu-cache', Icon::SIZE_SMALL)->render('inline');
$variables = [
'title' => 'LLL:EXT:lang/locallang_core.xlf:rm.clearCache_clearCache',
'title' => 'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:rm.clearCache_clearCache',
'icon' => $icon
];
} else {
......@@ -151,7 +151,7 @@ class ClearCacheToolbarItem implements ToolbarItemInterface
{
$view = $this->getFluidTemplateObject('ClearCacheToolbarItemDropDown.html');
$view->assignMultiple([
'title' => 'LLL:EXT:lang/locallang_core.xlf:rm.clearCache_clearCache',
'title' => 'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:rm.clearCache_clearCache',
'cacheActions' => $this->cacheActions,
]
);
......
......@@ -73,7 +73,7 @@ class HelpToolbarItem implements ToolbarItemInterface
$view = $this->getFluidTemplateObject('HelpToolbarItem.html');
$view->assignMultiple([
'title' => 'LLL:EXT:lang/locallang_core.xlf:toolbarItems.help',
'title' => 'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:toolbarItems.help',
'icon' => $icon
]
);
......@@ -90,7 +90,7 @@ class HelpToolbarItem implements ToolbarItemInterface
{
$view = $this->getFluidTemplateObject('HelpToolbarItemDropDown.html');
$view->assignMultiple([
'title' => 'LLL:EXT:lang/locallang_core.xlf:rm.clearCache_clearCache',
'title' => 'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:rm.clearCache_clearCache',
'modules' => $this->helpModuleMenu->getChildren()
]
);
......
......@@ -72,7 +72,7 @@ class LiveSearchToolbarItem implements ToolbarItemInterface
<div class="form-control-icon">
' . $this->iconFactory->getIcon('apps-toolbar-menu-search', Icon::SIZE_SMALL)->render('inline') . '
</div>
<input type="text" class="form-control toolbar-item-search-field t3js-topbar-navigation-search-field" placeholder="' . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:toolbarItems.search')) . '" id="live-search-box" autocomplete="off">
<input type="text" class="form-control toolbar-item-search-field t3js-topbar-navigation-search-field" placeholder="' . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:toolbarItems.search')) . '" id="live-search-box" autocomplete="off">
</div>
</div>
</form>
......
......@@ -86,7 +86,7 @@ class ShortcutToolbarItem implements ToolbarItemInterface
public function __construct()
{
$this->iconFactory = GeneralUtility::makeInstance(IconFactory::class);
$this->getLanguageService()->includeLLFile('EXT:lang/locallang_misc.xlf');
$this->getLanguageService()->includeLLFile('EXT:lang/Resources/Private/Language/locallang_misc.xlf');
// Needed to get the correct icons when reloading the menu after saving it
$this->moduleLoader = GeneralUtility::makeInstance(ModuleLoader::class);
$this->moduleLoader->load($GLOBALS['TBE_MODULES']);
......@@ -105,11 +105,11 @@ class ShortcutToolbarItem implements ToolbarItemInterface
$this->getPageRenderer()->loadRequireJsModule('TYPO3/CMS/Backend/Toolbar/ShortcutMenu');
$languageService = $this->getLanguageService();
$this->getPageRenderer()->addInlineLanguageLabelArray([
'bookmark.delete' => $languageService->sL('LLL:EXT:lang/locallang_core.xlf:toolbarItems.bookmarksDelete'),
'bookmark.confirmDelete' => $languageService->sL('LLL:EXT:lang/locallang_core.xlf:toolbarItems.confirmBookmarksDelete'),
'bookmark.create' => $languageService->sL('LLL:EXT:lang/locallang_core.xlf:toolbarItems.createBookmark'),
'bookmark.savedTitle' => $languageService->sL('LLL:EXT:lang/locallang_core.xlf:toolbarItems.bookmarkSavedTitle'),
'bookmark.savedMessage' => $languageService->sL('LLL:EXT:lang/locallang_core.xlf:toolbarItems.bookmarkSavedMessage'),
'bookmark.delete' => $languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:toolbarItems.bookmarksDelete'),
'bookmark.confirmDelete' => $languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:toolbarItems.confirmBookmarksDelete'),
'bookmark.create' => $languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:toolbarItems.createBookmark'),
'bookmark.savedTitle' => $languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:toolbarItems.bookmarkSavedTitle'),
'bookmark.savedMessage' => $languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:toolbarItems.bookmarkSavedMessage'),
]);
}
......@@ -130,7 +130,7 @@ class ShortcutToolbarItem implements ToolbarItemInterface
*/
public function getItem()
{
$title = htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:toolbarItems.bookmarks'));
$title = htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:toolbarItems.bookmarks'));
$icon = $this->iconFactory->getIcon('apps-toolbar-menu-shortcut', Icon::SIZE_SMALL)->render('inline');
return '
<span class="toolbar-item-icon" title="' . $title . '">' . $icon . '</span>
......@@ -146,15 +146,15 @@ class ShortcutToolbarItem implements ToolbarItemInterface
public function getDropDown()
{
$languageService = $this->getLanguageService();
$shortcutEdit = htmlspecialchars($languageService->sL('LLL:EXT:lang/locallang_core.xlf:toolbarItems.bookmarksEdit'));
$shortcutDelete = htmlspecialchars($languageService->sL('LLL:EXT:lang/locallang_core.xlf:toolbarItems.bookmarksDelete'));
$shortcutEdit = htmlspecialchars($languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:toolbarItems.bookmarksEdit'));
$shortcutDelete = htmlspecialchars($languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:toolbarItems.bookmarksDelete'));
$editIcon = '<a href="#" class="dropdown-table-actions-btn dropdown-table-actions-btn-edit t3js-shortcut-edit" title="' . $shortcutEdit . '">'
. $this->iconFactory->getIcon('actions-open', Icon::SIZE_SMALL)->render('inline') . '</a>';
$deleteIcon = '<a href="#" class="dropdown-table-actions-btn dropdown-table-actions-btn-delete t3js-shortcut-delete" title="' . $shortcutDelete . '">'
. $this->iconFactory->getIcon('actions-delete', Icon::SIZE_SMALL)->render('inline') . '</a>';
$shortcutMenu = [];
$shortcutMenu[] = '<h3 class="dropdown-headline">' . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:toolbarItems.bookmarks')) . '</h3>';
$shortcutMenu[] = '<h3 class="dropdown-headline">' . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:toolbarItems.bookmarks')) . '</h3>';
$shortcutMenu[] = '<hr>';
// Render groups and the contained shortcuts
......@@ -193,9 +193,9 @@ class ShortcutToolbarItem implements ToolbarItemInterface
$compiledShortcutMenu = implode(LF, $shortcutMenu);
if (count($shortcutMenu) === 2) {
// No shortcuts added yet, show a small help message how to add shortcuts
$title = htmlspecialchars($languageService->sL('LLL:EXT:lang/locallang_core.xlf:toolbarItems.bookmarks'));
$title = htmlspecialchars($languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:toolbarItems.bookmarks'));
$icon = '<span title="' . $title . '">' . $this->iconFactory->getIcon('actions-system-shortcut-new', Icon::SIZE_SMALL)->render('inline') . '</span>';
$label = str_replace('%icon%', $icon, htmlspecialchars($languageService->sL('LLL:EXT:lang/locallang_misc.xlf:bookmarkDescription')));
$label = str_replace('%icon%', $icon, htmlspecialchars($languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_misc.xlf:bookmarkDescription')));
$compiledShortcutMenu .= '<p>' . $label . '</p>';
}
......@@ -461,7 +461,7 @@ class ShortcutToolbarItem implements ToolbarItemInterface
$groupId = (int)$groupId;
$label = $groupLabel;
if ($groupLabel == '1') {
$label = htmlspecialchars($languageService->sL('LLL:EXT:lang/locallang_misc.xlf:bookmark_group_' . abs($groupId)));
$label = htmlspecialchars($languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_misc.xlf:bookmark_group_' . abs($groupId)));
if (empty($label)) {
// Fallback label
$label = htmlspecialchars($languageService->getLL('bookmark_group')) . ' ' . abs($groupId);
......@@ -469,7 +469,7 @@ class ShortcutToolbarItem implements ToolbarItemInterface
}
if ($groupId < 0) {
// Global group
$label = htmlspecialchars($languageService->sL('LLL:EXT:lang/locallang_misc.xlf:bookmark_global')) . ': ' . (!empty($label) ? $label : abs($groupId));
$label = htmlspecialchars($languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_misc.xlf:bookmark_global')) . ': ' . (!empty($label) ? $label : abs($groupId));
if ($groupId === self::SUPERGLOBAL_GROUP) {
$label = htmlspecialchars($languageService->getLL('bookmark_global')) . ': ' . htmlspecialchars($languageService->getLL('bookmark_all'));
}
......@@ -509,7 +509,7 @@ class ShortcutToolbarItem implements ToolbarItemInterface
$content = '
<form class="shortcut-form" role="form" data-shortcutid="' . (int)$selectedShortcutId . '">
<h3 class="dropdown-headline">
' . htmlspecialchars($languageService->sL('LLL:EXT:lang/locallang_core.xlf:toolbarItems.bookmarksEdit')) . '
' . htmlspecialchars($languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:toolbarItems.bookmarksEdit')) . '
</h3>
<hr>
<div class="form-group">
......@@ -847,7 +847,7 @@ class ShortcutToolbarItem implements ToolbarItemInterface
protected function getShortcutIcon($row, $shortcut)
{
$languageService = $this->getLanguageService();
$titleAttribute = htmlspecialchars($languageService->sL('LLL:EXT:lang/locallang_core.xlf:toolbarItems.shortcut'));
$titleAttribute = htmlspecialchars($languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:toolbarItems.shortcut'));
switch ($row['module_name']) {
case 'xMOD_alt_doc.php':
$table = $shortcut['table'];
......
......@@ -156,7 +156,7 @@ class SystemInformationToolbarItem implements ToolbarItemInterface
protected function getPhpVersion()
{
$this->systemInformation[] = [
'title' => htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:toolbarItems.sysinfo.phpversion')),
'title' => htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:toolbarItems.sysinfo.phpversion')),
'value' => PHP_VERSION,
'icon' => $this->iconFactory->getIcon('sysinfo-php-version', Icon::SIZE_SMALL)->render()
];
......@@ -172,7 +172,7 @@ class SystemInformationToolbarItem implements ToolbarItemInterface
foreach (GeneralUtility::makeInstance(ConnectionPool::class)->getConnectionNames() as $connectionName) {
$this->systemInformation[] = [
'title' => $this->getLanguageService()
->sL('LLL:EXT:lang/locallang_core.xlf:toolbarItems.sysinfo.database')
->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:toolbarItems.sysinfo.database')
. ' (' . htmlspecialchars($connectionName) . ')',
'value' => GeneralUtility::makeInstance(ConnectionPool::class)
->getConnectionByName($connectionName)
......@@ -191,7 +191,7 @@ class SystemInformationToolbarItem implements ToolbarItemInterface
{
$applicationContext = GeneralUtility::getApplicationContext();
$this->systemInformation[] = [
'title' => htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:toolbarItems.sysinfo.applicationcontext')),
'title' => htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:toolbarItems.sysinfo.applicationcontext')),
'value' => (string)$applicationContext,
'status' => $applicationContext->isProduction() ? InformationStatus::STATUS_OK : InformationStatus::STATUS_WARNING,
'icon' => $this->iconFactory->getIcon('sysinfo-application-context', Icon::SIZE_SMALL)->render()
......@@ -209,8 +209,8 @@ class SystemInformationToolbarItem implements ToolbarItemInterface
$languageService = $this->getLanguageService();
$this->systemInformation[] = [
'title' => htmlspecialchars($languageService->sL('LLL:EXT:lang/locallang_core.xlf:toolbarItems.sysinfo.composerMode')),
'value' => htmlspecialchars($languageService->sL('LLL:EXT:lang/locallang_core.xlf:labels.enabled')),
'title' => htmlspecialchars($languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:toolbarItems.sysinfo.composerMode')),
'value' => htmlspecialchars($languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.enabled')),
'icon' => $this->iconFactory->getIcon('sysinfo-composer-mode', Icon::SIZE_SMALL)->render()
];
}
......@@ -236,7 +236,7 @@ class SystemInformationToolbarItem implements ToolbarItemInterface
$branch = trim(CommandUtility::exec('git rev-parse --abbrev-ref HEAD'));
if (!empty($revision) && !empty($branch)) {
$this->systemInformation[] = [
'title' => htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:toolbarItems.sysinfo.gitrevision')),
'title' => htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:toolbarItems.sysinfo.gitrevision')),
'value' => sprintf('%s [%s]', $revision, $branch),
'icon' => $this->iconFactory->getIcon('sysinfo-git', Icon::SIZE_SMALL)->render()
];
......@@ -262,7 +262,7 @@ class SystemInformationToolbarItem implements ToolbarItemInterface
$icon = 'windows';
}
$this->systemInformation[] = [
'title' => htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:toolbarItems.sysinfo.operatingsystem')),
'title' => htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:toolbarItems.sysinfo.operatingsystem')),
'value' => $kernelName . ' ' . php_uname('r'),
'icon' => $this->iconFactory->getIcon('sysinfo-os-' . $icon, Icon::SIZE_SMALL)->render()
];
......@@ -274,7 +274,7 @@ class SystemInformationToolbarItem implements ToolbarItemInterface
protected function getWebServer()
{
$this->systemInformation[] = [
'title' => htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:toolbarItems.sysinfo.webserver')),
'title' => htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:toolbarItems.sysinfo.webserver')),
'value' => htmlspecialchars($_SERVER['SERVER_SOFTWARE']),
'icon' => $this->iconFactory->getIcon('sysinfo-webserver', Icon::SIZE_SMALL)->render()
];
......@@ -286,7 +286,7 @@ class SystemInformationToolbarItem implements ToolbarItemInterface
protected function getTypo3Version()
{
$this->systemInformation[] = [
'title' => htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:toolbarItems.sysinfo.typo3-version')),
'title' => htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:toolbarItems.sysinfo.typo3-version')),
'value' => htmlspecialchars(VersionNumberUtility::getCurrentTypo3Version()),
'icon' => $this->iconFactory->getIcon('sysinfo-typo3-version', Icon::SIZE_SMALL)->render()
];
......@@ -376,7 +376,7 @@ class SystemInformationToolbarItem implements ToolbarItemInterface
*/
public function getItem()
{
$title = htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:toolbarItems.sysinfo'));
$title = htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:toolbarItems.sysinfo'));
$icon = $this->iconFactory->getIcon('actions-system-list-open', Icon::SIZE_SMALL)->render('inline');
return '
<span class="toolbar-item-icon" title="' . $title . '">' . $icon . '</span>
......
......@@ -538,10 +538,10 @@ class ClickMenu
. $this->frameLocation($loc . '.document') . '.search);';
if ($this->backendUser->jsConfirmation(JsConfirmation::COPY_MOVE_PASTE)) {
$title = $this->languageService->sL('LLL:EXT:lang/locallang_mod_web_list.xlf:clip_paste');
$title = $this->languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_mod_web_list.xlf:clip_paste');
$lllKey = ($elInfo[2] === 'copy' ? 'copy' : 'move') . '_' . $type;
$confirmMessage = sprintf(
$this->languageService->sL('LLL:EXT:lang/locallang_core.xlf:mess.' . $lllKey),
$this->languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.' . $lllKey),
$elInfo[0],
$elInfo[1]
);
......@@ -797,7 +797,7 @@ class ClickMenu
*
* @param string $table Table name
* @param int $uid UID for the current record.
* @param array $elInfo Label for including in the confirmation message, EXT:lang/locallang_core.xlf:mess.delete
* @param array $elInfo Label for including in the confirmation message, EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.delete
* @return array Item array, element in $menuItems
* @internal
*/
......@@ -817,20 +817,20 @@ class ClickMenu
}
if ($this->backendUser->jsConfirmation(JsConfirmation::DELETE)) {
$title = $this->languageService->sL('LLL:EXT:lang/locallang_mod_web_list.xlf:delete');
$title = $this->languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_mod_web_list.xlf:delete');
$confirmMessage = sprintf(
$this->languageService->sL('LLL:EXT:lang/locallang_core.xlf:mess.delete'),
$this->languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.delete'),
$elInfo[0]
);
$confirmMessage .= BackendUtility::referenceCount(
$table,
$uid,
' ' . $this->languageService->sL('LLL:EXT:lang/locallang_core.xlf:labels.referencesToRecord')
' ' . $this->languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.referencesToRecord')
);
$confirmMessage .= BackendUtility::translationCount(
$table,
$uid,
' ' . $this->languageService->sL('LLL:EXT:lang/locallang_core.xlf:labels.translationsOfRecord')
' ' . $this->languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.translationsOfRecord')
);
$jsCode = 'top.TYPO3.Modal.confirm(' . GeneralUtility::quoteJSvalue($title) . ', '
. GeneralUtility::quoteJSvalue($confirmMessage) . ')'
......@@ -1144,15 +1144,15 @@ class ClickMenu
);
if ($this->backendUser->jsConfirmation(JsConfirmation::DELETE)) {
$fileOrFolderObject = ResourceFactory::getInstance()->retrieveFileOrFolderObject($path);
$title = $this->languageService->sL('LLL:EXT:lang/locallang_mod_web_list.xlf:delete');
$title = $this->languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_mod_web_list.xlf:delete');
$confirmMessage = sprintf(
$this->languageService->sL('LLL:EXT:lang/locallang_core.xlf:mess.delete'),
$this->languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.delete'),
$fileOrFolderObject->getName()
);
if ($fileOrFolderObject instanceof Folder) {
$confirmMessage .= BackendUtility::referenceCount('_FILE', $fileOrFolderObject->getIdentifier(), ' ' . $this->languageService->sL('LLL:EXT:lang/locallang_core.xlf:labels.referencesToFolder'));
$confirmMessage .= BackendUtility::referenceCount('_FILE', $fileOrFolderObject->getIdentifier(), ' ' . $this->languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.referencesToFolder'));
} else {
$confirmMessage .= BackendUtility::referenceCount('sys_file', $fileOrFolderObject->getUid(), ' ' . $this->languageService->sL('LLL:EXT:lang/locallang_core.xlf:labels.referencesToFile'));
$confirmMessage .= BackendUtility::referenceCount('sys_file', $fileOrFolderObject->getUid(), ' ' . $this->languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.referencesToFile'));
}
$jsCode = 'top.TYPO3.Modal.confirm(' . GeneralUtility::quoteJSvalue($title) . ', '
. GeneralUtility::quoteJSvalue($confirmMessage) . ')'
......@@ -1187,10 +1187,10 @@ class ClickMenu
. '.pathname+' . $this->frameLocation($loc . '.document') . '.search); top.nav.refresh();';
if ($this->backendUser->jsConfirmation(JsConfirmation::COPY_MOVE_PASTE)) {
$title = $this->languageService->sL('LLL:EXT:lang/locallang_mod_web_list.xlf:clip_paste');
$title = $this->languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_mod_web_list.xlf:clip_paste');
$confirmMessage = sprintf(
$this->languageService->sL('LLL:EXT:lang/locallang_core.xlf:mess.'
$this->languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.'
. ($elInfo[2] === 'copy' ? 'copy' : 'move') . '_into'),
$elInfo[0],
$elInfo[1]
......@@ -1582,7 +1582,7 @@ class ClickMenu
*/
public function label($label)
{
return htmlspecialchars($this->languageService->sL('LLL:EXT:lang/locallang_core.xlf:cm.' . $label));
return htmlspecialchars($this->languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.' . $label));
}
/**
......
......@@ -256,8 +256,8 @@ class Clipboard
$elementCount = count($this->elFromTable($this->fileMode ? '_FILE' : ''));
// Copymode Selector menu
$copymodeUrl = GeneralUtility::linkThisScript();
$moveLabel = htmlspecialchars($languageService->sL('LLL:EXT:lang/locallang_misc.xlf:moveElements'));
$copyLabel = htmlspecialchars($languageService->sL('LLL:EXT:lang/locallang_misc.xlf:copyElements'));
$moveLabel = htmlspecialchars($languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_misc.xlf:moveElements'));
$copyLabel = htmlspecialchars($languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_misc.xlf:copyElements'));
$copymodeSelector = '
<div class="btn-group">
......@@ -295,16 +295,16 @@ class Clipboard
$confirmationCheck = true;
}
$confirmationMessage = sprintf(
$languageService->sL('LLL:EXT:lang/locallang_core.xlf:mess.deleteClip'),
$languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.deleteClip'),
$elementCount
);
$title = $languageService
->sL('LLL:EXT:lang/locallang_core.xlf:labels.clipboard.delete_elements');
->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.clipboard.delete_elements');
$returnUrl = $this->deleteUrl(1, ($this->fileMode ? 1 : 0));
$btnOkText = $languageService
->sL('LLL:EXT:lang/locallang_alt_doc.xlf:buttons.confirm.delete_elements.yes');
->sL('LLL:EXT:lang/Resources/Private/Language/locallang_alt_doc.xlf:buttons.confirm.delete_elements.yes');
$btnCancelText = $languageService
->sL('LLL:EXT:lang/locallang_alt_doc.xlf:buttons.confirm.delete_elements.no');
->sL('LLL:EXT:lang/Resources/Private/Language/locallang_alt_doc.xlf:buttons.confirm.delete_elements.no');
$optionArray[] = '<li><a'
. (($confirmationCheck) ? ' class="t3js-modal-trigger"' : '')
. ' href="' . htmlspecialchars($returnUrl) . '"'
......@@ -316,8 +316,8 @@ class Clipboard
. htmlspecialchars($title) . '</a></li>';
// Clear clipboard
$optionArray[] = '<li><a href="' . htmlspecialchars($removeAllUrl) . '#clip_head">' . htmlspecialchars($languageService->sL('LLL:EXT:lang/locallang_core.xlf:labels.clipboard.clear_clipboard')) . '</a></li>';
$deleteLink = '<a class="btn btn-danger" href="' . htmlspecialchars($removeAllUrl) . '#clip_head" title="' . htmlspecialchars($languageService->sL('LLL:EXT:lang/locallang_core.xlf:buttons.clear')) . '">' . $this->iconFactory->getIcon('actions-document-close', Icon::SIZE_SMALL)->render(SvgIconProvider::MARKUP_IDENTIFIER_INLINE) . '</a>';
$optionArray[] = '<li><a href="' . htmlspecialchars($removeAllUrl) . '#clip_head">' . htmlspecialchars($languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.clipboard.clear_clipboard')) . '</a></li>';
$deleteLink = '<a class="btn btn-danger" href="' . htmlspecialchars($removeAllUrl) . '#clip_head" title="' . htmlspecialchars($languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:buttons.clear')) . '">' . $this->iconFactory->getIcon('actions-document-close', Icon::SIZE_SMALL)->render(SvgIconProvider::MARKUP_IDENTIFIER_INLINE) . '</a>';
// menuSelector
$menuSelector = '
......@@ -751,7 +751,7 @@ class Clipboard
public function confirmMsgText($table, $rec, $type, $clElements, $columnLabel = '')
{
if ($this->getBackendUser()->jsConfirmation(JsConfirmation::COPY_MOVE_PASTE)) {
$labelKey = 'LLL:EXT:lang/locallang_core.xlf:mess.' . ($this->currentMode() == 'copy' ? 'copy' : 'move') . ($this->current == 'normal' ? '' : 'cb') . '_' . $type;
$labelKey = 'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.' . ($this->currentMode() == 'copy' ? 'copy' : 'move') . ($this->current == 'normal' ? '' : 'cb') . '_' . $type;
$msg = $this->getLanguageService()->sL($labelKey . ($columnLabel ? '_colPos': ''));
if ($table == '_FILE') {
$thisRecTitle = basename($rec);
......@@ -792,7 +792,7 @@ class Clipboard
}
/**
* Clipboard label - getting from "EXT:lang/locallang_core.xlf:"
* Clipboard label - getting from "EXT:lang/Resources/Private/Language/locallang_core.xlf:"
*
* @param string $key Label Key
* @param string $Akey Alternative key to "labels
......@@ -800,7 +800,7 @@ class Clipboard
*/
public function clLabel($key, $Akey = 'labels')
{
return htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:' . $Akey . '.' . $key));
return htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:' . $Akey . '.' . $key));
}
/**
......
......@@ -249,9 +249,9 @@ class TranslationConfigurationProvider
protected function getDefaultLanguageLabel(array $modSharedTSconfig)
{
if (strlen($modSharedTSconfig['properties']['defaultLanguageLabel'])) {
$defaultLanguageLabel = $modSharedTSconfig['properties']['defaultLanguageLabel'] . ' (' . $this->getLanguageService()->sL('LLL:EXT:lang/locallang_mod_web_list.xlf:defaultLanguage') . ')';
$defaultLanguageLabel = $modSharedTSconfig['properties']['defaultLanguageLabel'] . ' (' . $this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_mod_web_list.xlf:defaultLanguage') . ')';
} else {
$defaultLanguageLabel = $this->getLanguageService()->sL('LLL:EXT:lang/locallang_mod_web_list.xlf:defaultLanguage');
$defaultLanguageLabel = $this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_mod_web_list.xlf:defaultLanguage');
}
return $defaultLanguageLabel;
}
......