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 ...@@ -98,7 +98,7 @@ class ModulesController extends ActionController
'TYPO3Version' => TYPO3_version, 'TYPO3Version' => TYPO3_version,
'copyRightNotice' => BackendUtility::TYPO3_copyRightNotice(), 'copyRightNotice' => BackendUtility::TYPO3_copyRightNotice(),
'warningMessages' => $securityWarnings, '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() 'modules' => $this->getModulesData()
] ]
); );
......
<p> <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: '{ arguments: '{
0: TYPO3Version, 0: TYPO3Version,
1: "&copy; {TYPO3CopyrightYear}", 1: "&copy; {TYPO3CopyrightYear}",
......
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-body panel-body-highlightlinks"> <div class="panel-body panel-body-highlightlinks">
<h2 class="h4"> <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> </h2>
<p> <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> </p>
</div> </div>
</div> </div>
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-body panel-body-highlightlinks"> <div class="panel-body panel-body-highlightlinks">
<h2 class="h4"> <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> </h2>
<p> <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> </p>
</div> </div>
</div> </div>
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-body panel-body-highlightlinks"> <div class="panel-body panel-body-highlightlinks">
<h2 class="h4"> <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> </h2>
<p> <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> </p>
<a href="{TYPO3UrlDonate}" class="btn btn-default" title="{f:translate(key:'LLL:EXT:lang/locallang_mod_help_about.xlf:donation_button')}" target="_blank"> <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/locallang_mod_help_about.xlf:donation_button" /> <f:translate key="LLL:EXT:lang/Resources/Private/Language/locallang_mod_help_about.xlf:donation_button" />
</a> </a>
</div> </div>
</div> </div>
...@@ -2,17 +2,17 @@ ...@@ -2,17 +2,17 @@
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-body panel-body-highlightlinks"> <div class="panel-body panel-body-highlightlinks">
<h2 class="h3"> <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> </h2>
<p> <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> </p>
</div> </div>
<table class="table panel-table"> <table class="table panel-table">
<thead> <thead>
<tr> <tr>
<th width="35%"><f:translate key="LLL:EXT:lang/locallang_mod_help_about.xlf:extension" /></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/locallang_mod_help_about.xlf:extension_author" /></th> <th><f:translate key="LLL:EXT:lang/Resources/Private/Language/locallang_mod_help_about.xlf:extension_author" /></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
......
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-body panel-body-highlightlinks"> <div class="panel-body panel-body-highlightlinks">
<h2 class="h3"> <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> </h2>
<p> <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> </p>
</div> </div>
<table class="table panel-table"> <table class="table panel-table">
......
<img src="{f:uri.resource(path: 'Images/typo3-transparent@2x.png', extensionName: 'backend')}" width="150" <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>
<br> <br>
<h1> <h1>
TYPO3 CMS {TYPO3Version}<br> 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> </h1>
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<div class="container-small"> <div class="container-small">
<f:render partial="Logo" arguments="{_all}" /> <f:render partial="Logo" arguments="{_all}" />
<p> <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> </p>
<f:if condition="{warningMessages}"> <f:if condition="{warningMessages}">
<f:be.infobox title="{warningTitle}" state="2">{warningMessages -> f:format.raw()}</f:be.infobox> <f:be.infobox title="{warningTitle}" state="2">{warningMessages -> f:format.raw()}</f:be.infobox>
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
</div> </div>
</f:if> </f:if>
</f:for> </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> <p>{copyRightNotice -> f:format.raw()}</p>
</div> </div>
......
...@@ -12,7 +12,7 @@ if (TYPO3_MODE === 'BE' && !(TYPO3_REQUESTTYPE & TYPO3_REQUESTTYPE_INSTALL)) { ...@@ -12,7 +12,7 @@ if (TYPO3_MODE === 'BE' && !(TYPO3_REQUESTTYPE & TYPO3_REQUESTTYPE_INSTALL)) {
[ [
'access' => 'user,group', 'access' => 'user,group',
'icon' => 'EXT:about/Resources/Public/Icons/module-about.svg', '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 ...@@ -60,8 +60,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' => htmlspecialchars($languageService->sL('LLL:EXT:lang/locallang_core.xlf:flushPageCachesTitle')), 'title' => htmlspecialchars($languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:flushPageCachesTitle')),
'description' => htmlspecialchars($languageService->sL('LLL:EXT:lang/locallang_core.xlf:flushPageCachesDescription')), 'description' => htmlspecialchars($languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:flushPageCachesDescription')),
'href' => BackendUtility::getModuleUrl('tce_db', ['vC' => $backendUser->veriCode(), 'cacheCmd' => 'pages']), 'href' => BackendUtility::getModuleUrl('tce_db', ['vC' => $backendUser->veriCode(), 'cacheCmd' => 'pages']),
'icon' => $this->iconFactory->getIcon('actions-system-cache-clear-impact-low', Icon::SIZE_SMALL)->render() 'icon' => $this->iconFactory->getIcon('actions-system-cache-clear-impact-low', Icon::SIZE_SMALL)->render()
]; ];
...@@ -74,8 +74,8 @@ class ClearCacheToolbarItem implements ToolbarItemInterface ...@@ -74,8 +74,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' => htmlspecialchars($languageService->sL('LLL:EXT:lang/locallang_core.xlf:flushAllCachesTitle2')), 'title' => htmlspecialchars($languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:flushAllCachesTitle2')),
'description' => htmlspecialchars($languageService->sL('LLL:EXT:lang/locallang_core.xlf:flushAllCachesDescription2')), 'description' => htmlspecialchars($languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:flushAllCachesDescription2')),
'href' => BackendUtility::getModuleUrl('tce_db', ['vC' => $backendUser->veriCode(), 'cacheCmd' => 'all']), 'href' => BackendUtility::getModuleUrl('tce_db', ['vC' => $backendUser->veriCode(), 'cacheCmd' => 'all']),
'icon' => $this->iconFactory->getIcon('actions-system-cache-clear-impact-high', Icon::SIZE_SMALL)->render() 'icon' => $this->iconFactory->getIcon('actions-system-cache-clear-impact-high', Icon::SIZE_SMALL)->render()
]; ];
...@@ -126,7 +126,7 @@ class ClearCacheToolbarItem implements ToolbarItemInterface ...@@ -126,7 +126,7 @@ class ClearCacheToolbarItem implements ToolbarItemInterface
$templateReference = 'ClearCacheToolbarItem.html'; $templateReference = 'ClearCacheToolbarItem.html';
$icon = $this->iconFactory->getIcon('apps-toolbar-menu-cache', Icon::SIZE_SMALL)->render('inline'); $icon = $this->iconFactory->getIcon('apps-toolbar-menu-cache', Icon::SIZE_SMALL)->render('inline');
$variables = [ $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 'icon' => $icon
]; ];
} else { } else {
...@@ -151,7 +151,7 @@ class ClearCacheToolbarItem implements ToolbarItemInterface ...@@ -151,7 +151,7 @@ class ClearCacheToolbarItem implements ToolbarItemInterface
{ {
$view = $this->getFluidTemplateObject('ClearCacheToolbarItemDropDown.html'); $view = $this->getFluidTemplateObject('ClearCacheToolbarItemDropDown.html');
$view->assignMultiple([ $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, 'cacheActions' => $this->cacheActions,
] ]
); );
......
...@@ -73,7 +73,7 @@ class HelpToolbarItem implements ToolbarItemInterface ...@@ -73,7 +73,7 @@ class HelpToolbarItem implements ToolbarItemInterface
$view = $this->getFluidTemplateObject('HelpToolbarItem.html'); $view = $this->getFluidTemplateObject('HelpToolbarItem.html');
$view->assignMultiple([ $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 'icon' => $icon
] ]
); );
...@@ -90,7 +90,7 @@ class HelpToolbarItem implements ToolbarItemInterface ...@@ -90,7 +90,7 @@ class HelpToolbarItem implements ToolbarItemInterface
{ {
$view = $this->getFluidTemplateObject('HelpToolbarItemDropDown.html'); $view = $this->getFluidTemplateObject('HelpToolbarItemDropDown.html');
$view->assignMultiple([ $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() 'modules' => $this->helpModuleMenu->getChildren()
] ]
); );
......
...@@ -72,7 +72,7 @@ class LiveSearchToolbarItem implements ToolbarItemInterface ...@@ -72,7 +72,7 @@ class LiveSearchToolbarItem implements ToolbarItemInterface
<div class="form-control-icon"> <div class="form-control-icon">
' . $this->iconFactory->getIcon('apps-toolbar-menu-search', Icon::SIZE_SMALL)->render('inline') . ' ' . $this->iconFactory->getIcon('apps-toolbar-menu-search', Icon::SIZE_SMALL)->render('inline') . '
</div> </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>
</div> </div>
</form> </form>
......
...@@ -86,7 +86,7 @@ class ShortcutToolbarItem implements ToolbarItemInterface ...@@ -86,7 +86,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/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 // 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']);
...@@ -105,11 +105,11 @@ class ShortcutToolbarItem implements ToolbarItemInterface ...@@ -105,11 +105,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/locallang_core.xlf:toolbarItems.bookmarksDelete'), 'bookmark.delete' => $languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:toolbarItems.bookmarksDelete'),
'bookmark.confirmDelete' => $languageService->sL('LLL:EXT:lang/locallang_core.xlf:toolbarItems.confirmBookmarksDelete'), 'bookmark.confirmDelete' => $languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:toolbarItems.confirmBookmarksDelete'),
'bookmark.create' => $languageService->sL('LLL:EXT:lang/locallang_core.xlf:toolbarItems.createBookmark'), 'bookmark.create' => $languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:toolbarItems.createBookmark'),
'bookmark.savedTitle' => $languageService->sL('LLL:EXT:lang/locallang_core.xlf:toolbarItems.bookmarkSavedTitle'), 'bookmark.savedTitle' => $languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:toolbarItems.bookmarkSavedTitle'),
'bookmark.savedMessage' => $languageService->sL('LLL:EXT:lang/locallang_core.xlf:toolbarItems.bookmarkSavedMessage'), 'bookmark.savedMessage' => $languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:toolbarItems.bookmarkSavedMessage'),
]); ]);
} }
...@@ -130,7 +130,7 @@ class ShortcutToolbarItem implements ToolbarItemInterface ...@@ -130,7 +130,7 @@ class ShortcutToolbarItem implements ToolbarItemInterface
*/ */
public function getItem() 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'); $icon = $this->iconFactory->getIcon('apps-toolbar-menu-shortcut', Icon::SIZE_SMALL)->render('inline');
return ' return '
<span class="toolbar-item-icon" title="' . $title . '">' . $icon . '</span> <span class="toolbar-item-icon" title="' . $title . '">' . $icon . '</span>
...@@ -146,15 +146,15 @@ class ShortcutToolbarItem implements ToolbarItemInterface ...@@ -146,15 +146,15 @@ class ShortcutToolbarItem implements ToolbarItemInterface
public function getDropDown() public function getDropDown()
{ {
$languageService = $this->getLanguageService(); $languageService = $this->getLanguageService();
$shortcutEdit = htmlspecialchars($languageService->sL('LLL:EXT:lang/locallang_core.xlf:toolbarItems.bookmarksEdit')); $shortcutEdit = htmlspecialchars($languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:toolbarItems.bookmarksEdit'));
$shortcutDelete = htmlspecialchars($languageService->sL('LLL:EXT:lang/locallang_core.xlf:toolbarItems.bookmarksDelete')); $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 . '">' $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>'; . $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 . '">' $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>'; . $this->iconFactory->getIcon('actions-delete', Icon::SIZE_SMALL)->render('inline') . '</a>';
$shortcutMenu = []; $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>'; $shortcutMenu[] = '<hr>';
// Render groups and the contained shortcuts // Render groups and the contained shortcuts
...@@ -193,9 +193,9 @@ class ShortcutToolbarItem implements ToolbarItemInterface ...@@ -193,9 +193,9 @@ class ShortcutToolbarItem implements ToolbarItemInterface
$compiledShortcutMenu = implode(LF, $shortcutMenu); $compiledShortcutMenu = implode(LF, $shortcutMenu);
if (count($shortcutMenu) === 2) { if (count($shortcutMenu) === 2) {
// No shortcuts added yet, show a small help message how to add shortcuts // 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>'; $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>'; $compiledShortcutMenu .= '<p>' . $label . '</p>';
} }
...@@ -461,7 +461,7 @@ class ShortcutToolbarItem implements ToolbarItemInterface ...@@ -461,7 +461,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/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)) { if (empty($label)) {
// Fallback label // Fallback label
$label = htmlspecialchars($languageService->getLL('bookmark_group')) . ' ' . abs($groupId); $label = htmlspecialchars($languageService->getLL('bookmark_group')) . ' ' . abs($groupId);
...@@ -469,7 +469,7 @@ class ShortcutToolbarItem implements ToolbarItemInterface ...@@ -469,7 +469,7 @@ class ShortcutToolbarItem implements ToolbarItemInterface
} }
if ($groupId < 0) { if ($groupId < 0) {
// Global group // 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) { 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'));
} }
...@@ -509,7 +509,7 @@ class ShortcutToolbarItem implements ToolbarItemInterface ...@@ -509,7 +509,7 @@ class ShortcutToolbarItem implements ToolbarItemInterface
$content = ' $content = '
<form class="shortcut-form" role="form" data-shortcutid="' . (int)$selectedShortcutId . '"> <form class="shortcut-form" role="form" data-shortcutid="' . (int)$selectedShortcutId . '">
<h3 class="dropdown-headline"> <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> </h3>
<hr> <hr>
<div class="form-group"> <div class="form-group">
...@@ -847,7 +847,7 @@ class ShortcutToolbarItem implements ToolbarItemInterface ...@@ -847,7 +847,7 @@ class ShortcutToolbarItem implements ToolbarItemInterface
protected function getShortcutIcon($row, $shortcut) protected function getShortcutIcon($row, $shortcut)
{ {
$languageService = $this->getLanguageService(); $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']) { switch ($row['module_name']) {
case 'xMOD_alt_doc.php': case 'xMOD_alt_doc.php':
$table = $shortcut['table']; $table = $shortcut['table'];
......
...@@ -156,7 +156,7 @@ class SystemInformationToolbarItem implements ToolbarItemInterface ...@@ -156,7 +156,7 @@ class SystemInformationToolbarItem implements ToolbarItemInterface
protected function getPhpVersion() protected function getPhpVersion()
{ {
$this->systemInformation[] = [ $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, 'value' => PHP_VERSION,
'icon' => $this->iconFactory->getIcon('sysinfo-php-version', Icon::SIZE_SMALL)->render() 'icon' => $this->iconFactory->getIcon('sysinfo-php-version', Icon::SIZE_SMALL)->render()
]; ];
...@@ -172,7 +172,7 @@ class SystemInformationToolbarItem implements ToolbarItemInterface ...@@ -172,7 +172,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' => $this->getLanguageService() '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) . ')', . ' (' . htmlspecialchars($connectionName) . ')',
'value' => GeneralUtility::makeInstance(ConnectionPool::class) 'value' => GeneralUtility::makeInstance(ConnectionPool::class)
->getConnectionByName($connectionName) ->getConnectionByName($connectionName)
...@@ -191,7 +191,7 @@ class SystemInformationToolbarItem implements ToolbarItemInterface ...@@ -191,7 +191,7 @@ class SystemInformationToolbarItem implements ToolbarItemInterface
{ {
$applicationContext = GeneralUtility::getApplicationContext(); $applicationContext = GeneralUtility::getApplicationContext();
$this->systemInformation[] = [ $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, 'value' => (string)$applicationContext,
'status' => $applicationContext->isProduction() ? InformationStatus::STATUS_OK : InformationStatus::STATUS_WARNING, 'status' => $applicationContext->isProduction() ? InformationStatus::STATUS_OK : InformationStatus::STATUS_WARNING,
'icon' => $this->iconFactory->getIcon('sysinfo-application-context', Icon::SIZE_SMALL)->render() 'icon' => $this->iconFactory->getIcon('sysinfo-application-context', Icon::SIZE_SMALL)->render()
...@@ -209,8 +209,8 @@ class SystemInformationToolbarItem implements ToolbarItemInterface ...@@ -209,8 +209,8 @@ class SystemInformationToolbarItem implements ToolbarItemInterface
$languageService = $this->getLanguageService(); $languageService = $this->getLanguageService();
$this->systemInformation[] = [ $this->systemInformation[] = [
'title' => htmlspecialchars($languageService->sL('LLL:EXT:lang/locallang_core.xlf:toolbarItems.sysinfo.composerMode')), 'title' => htmlspecialchars($languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:toolbarItems.sysinfo.composerMode')),
'value' => htmlspecialchars($languageService->sL('LLL:EXT:lang/locallang_core.xlf:labels.enabled')), '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() 'icon' => $this->iconFactory->getIcon('sysinfo-composer-mode', Icon::SIZE_SMALL)->render()
]; ];
} }
...@@ -236,7 +236,7 @@ class SystemInformationToolbarItem implements ToolbarItemInterface ...@@ -236,7 +236,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' => 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), 'value' => sprintf('%s [%s]', $revision, $branch),
'icon' => $this->iconFactory->getIcon('sysinfo-git', Icon::SIZE_SMALL)->render() 'icon' => $this->iconFactory->getIcon('sysinfo-git', Icon::SIZE_SMALL)->render()
]; ];
...@@ -262,7 +262,7 @@ class SystemInformationToolbarItem implements ToolbarItemInterface ...@@ -262,7 +262,7 @@ class SystemInformationToolbarItem implements ToolbarItemInterface
$icon = 'windows'; $icon = 'windows';
} }
$this->systemInformation[] = [ $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'), 'value' => $kernelName . ' ' . php_uname('r'),
'icon' => $this->iconFactory->getIcon('sysinfo-os-' . $icon, Icon::SIZE_SMALL)->render() 'icon' => $this->iconFactory->getIcon('sysinfo-os-' . $icon, Icon::SIZE_SMALL)->render()
]; ];
...@@ -274,7 +274,7 @@ class SystemInformationToolbarItem implements ToolbarItemInterface ...@@ -274,7 +274,7 @@ class SystemInformationToolbarItem implements ToolbarItemInterface
protected function getWebServer() protected function getWebServer()
{ {
$this->systemInformation[] = [ $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']), 'value' => htmlspecialchars($_SERVER['SERVER_SOFTWARE']),
'icon' => $this->iconFactory->getIcon('sysinfo-webserver', Icon::SIZE_SMALL)->render() 'icon' => $this->iconFactory->getIcon('sysinfo-webserver', Icon::SIZE_SMALL)->render()
]; ];
...@@ -286,7 +286,7 @@ class SystemInformationToolbarItem implements ToolbarItemInterface ...@@ -286,7 +286,7 @@ class SystemInformationToolbarItem implements ToolbarItemInterface
protected function getTypo3Version() protected function getTypo3Version()
{ {
$this->systemInformation[] = [ $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()), 'value' => htmlspecialchars(VersionNumberUtility::