From bed64c6572e1a6d28c747081f73240219fd2d7f5 Mon Sep 17 00:00:00 2001
From: Benni Mack <benni@typo3.org>
Date: Wed, 19 Apr 2023 16:51:12 +0200
Subject: [PATCH] [TASK] Avoid getLL() usages in various system extensions
Using sL() instead of getLL() shows direct dependencies
on labels and their label files within the code.
This change replaces all usages in
* extensionmanager
* form
* impexp
* install
* reports
* setup
* filelist
with sL() calls.
Resolves: #100668
Releases: main
Change-Id: Ic3cb1e307c9312a2fc2e0b21b3149c4baddebfe3
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/78755
Tested-by: core-ci <typo3@b13.com>
Reviewed-by: Georg Ringer <georg.ringer@gmail.com>
Reviewed-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
Tested-by: Georg Ringer <georg.ringer@gmail.com>
Tested-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
---
.../Language/locallang_t3lib_fullsearch.xlf | 6 --
.../Report/ExtensionComposerStatus.php | 10 ++--
.../Classes/Report/ExtensionStatus.php | 53 +++++++++--------
.../Classes/Utility/FileHandlingUtility.php | 9 ++-
typo3/sysext/filelist/Classes/FileList.php | 34 ++++++-----
.../Processors/FinisherOptionGenerator.php | 4 +-
typo3/sysext/impexp/Classes/ImportExport.php | 35 ++++++-----
.../Classes/Report/InstallStatusReport.php | 4 +-
.../Classes/Report/SecurityStatusReport.php | 4 +-
.../DatabaseIntegrityController.php | 50 ++++++++--------
.../Report/Status/ConfigurationStatus.php | 48 +++++++--------
.../Classes/Report/Status/FalStatus.php | 8 +--
.../Classes/Report/Status/SecurityStatus.php | 58 +++++++++----------
.../reports/Classes/Report/Status/Status.php | 12 ++--
.../Classes/Report/Status/SystemStatus.php | 12 ++--
.../Classes/Report/Status/Typo3Status.php | 10 ++--
.../Classes/Task/SystemStatusUpdateTask.php | 8 +--
.../Controller/SetupModuleController.php | 37 ++++++------
18 files changed, 197 insertions(+), 205 deletions(-)
diff --git a/typo3/sysext/core/Resources/Private/Language/locallang_t3lib_fullsearch.xlf b/typo3/sysext/core/Resources/Private/Language/locallang_t3lib_fullsearch.xlf
index c417a9725dba..b73914c0b4ae 100644
--- a/typo3/sysext/core/Resources/Private/Language/locallang_t3lib_fullsearch.xlf
+++ b/typo3/sysext/core/Resources/Private/Language/locallang_t3lib_fullsearch.xlf
@@ -6,15 +6,9 @@
<trans-unit id="query_loaded" resname="query_loaded">
<source>Query "%s" loaded!</source>
</trans-unit>
- <trans-unit id="query_from_action_loaded" resname="query_from_action_loaded">
- <source>Query from action "%s" loaded!</source>
- </trans-unit>
<trans-unit id="query_saved" resname="query_saved">
<source>Query saved!</source>
</trans-unit>
- <trans-unit id="query_notsaved" resname="query_notsaved">
- <source>No query saved!</source>
- </trans-unit>
<trans-unit id="query_removed" resname="query_removed">
<source>"%s" query entry removed!</source>
</trans-unit>
diff --git a/typo3/sysext/extensionmanager/Classes/Report/ExtensionComposerStatus.php b/typo3/sysext/extensionmanager/Classes/Report/ExtensionComposerStatus.php
index 29e625e06814..c36922e5a14e 100644
--- a/typo3/sysext/extensionmanager/Classes/Report/ExtensionComposerStatus.php
+++ b/typo3/sysext/extensionmanager/Classes/Report/ExtensionComposerStatus.php
@@ -44,8 +44,6 @@ class ExtensionComposerStatus implements RequestAwareStatusProviderInterface
$status = [];
$extensionsWithComposerDeficit = $this->composerDeficitDetector->getExtensionsWithComposerDeficit();
$languageService = $this->getLanguageService();
- $languageService->includeLLFile('EXT:extensionmanager/Resources/Private/Language/locallang.xlf');
- $labelPrefix = 'report.status.composerManifest.';
$deficits = [
ComposerDeficitDetector::EXTENSION_COMPOSER_MANIFEST_MISSING => 'composerJsonMissing',
ComposerDeficitDetector::EXTENSION_KEY_MISSING => 'extensionKeyMissing',
@@ -74,7 +72,7 @@ class ExtensionComposerStatus implements RequestAwareStatusProviderInterface
}));
if ($extensionsToReport) {
- $title = $languageService->getLL($labelPrefix . 'update');
+ $title = $languageService->sL('LLL:EXT:extensionmanager/Resources/Private/Language/locallang.xlf:report.status.composerManifest.update');
$attributes = GeneralUtility::implodeAttributes([
'type' => 'button',
'title' => $title,
@@ -83,14 +81,14 @@ class ExtensionComposerStatus implements RequestAwareStatusProviderInterface
'data-dispatch-action' => $dispatchAction,
'data-dispatch-args' => GeneralUtility::jsonEncodeForHtmlAttribute($dispatchArgs),
], true);
- $message = sprintf($languageService->getLL($labelPrefix . $deficit . '.message'), $extensionsToReport)
+ $message = sprintf($languageService->sL('LLL:EXT:extensionmanager/Resources/Private/Language/locallang.xlf:report.status.composerManifest.' . $deficit . '.message'), $extensionsToReport)
. '<br /><button ' . $attributes . '>' . htmlspecialchars($title) . '</button>';
}
$status[] = GeneralUtility::makeInstance(
ReportStatus::class,
- $this->getLanguageService()->getLL($labelPrefix . $deficit),
- $this->getLanguageService()->getLL($extensionsToReport ? 'status_checkFailed' : 'status_none'),
+ $this->getLanguageService()->sL('LLL:EXT:extensionmanager/Resources/Private/Language/locallang.xlf:report.status.composerManifest.' . $deficit),
+ $this->getLanguageService()->sL($extensionsToReport ? 'LLL:EXT:reports/Resources/Private/Language/locallang_reports.xlf:status_checkFailed' : 'LLL:EXT:reports/Resources/Private/Language/locallang_reports.xlf:status_none'),
$message,
$extensionsToReport ? ContextualFeedbackSeverity::WARNING : ContextualFeedbackSeverity::OK
);
diff --git a/typo3/sysext/extensionmanager/Classes/Report/ExtensionStatus.php b/typo3/sysext/extensionmanager/Classes/Report/ExtensionStatus.php
index 5655e4e0a1b1..162e65b42964 100644
--- a/typo3/sysext/extensionmanager/Classes/Report/ExtensionStatus.php
+++ b/typo3/sysext/extensionmanager/Classes/Report/ExtensionStatus.php
@@ -43,7 +43,6 @@ class ExtensionStatus implements StatusProviderInterface
protected readonly LanguageServiceFactory $languageServiceFactory,
) {
$this->languageService = $this->languageServiceFactory->createFromUserPreferences($GLOBALS['BE_USER'] ?? null);
- $this->languageService->includeLLFile('EXT:extensionmanager/Resources/Private/Language/locallang.xlf');
}
/**
@@ -81,22 +80,22 @@ class ExtensionStatus implements StatusProviderInterface
protected function getMainRepositoryStatus()
{
if (!$this->remoteRegistry->hasDefaultRemote()) {
- $value = $this->languageService->getLL('report.status.mainRepository.notFound.value');
- $message = $this->languageService->getLL('report.status.mainRepository.notFound.message');
+ $value = $this->languageService->sL('LLL:EXT:extensionmanager/Resources/Private/Language/locallang.xlf:report.status.mainRepository.notFound.value');
+ $message = $this->languageService->sL('LLL:EXT:extensionmanager/Resources/Private/Language/locallang.xlf:report.status.mainRepository.notFound.message');
$severity = ContextualFeedbackSeverity::ERROR;
} elseif ($this->remoteRegistry->getDefaultRemote()->needsUpdate()) {
- $value = $this->languageService->getLL('report.status.mainRepository.notUpToDate.value');
- $message = $this->languageService->getLL('report.status.mainRepository.notUpToDate.message');
+ $value = $this->languageService->sL('LLL:EXT:extensionmanager/Resources/Private/Language/locallang.xlf:report.status.mainRepository.notUpToDate.value');
+ $message = $this->languageService->sL('LLL:EXT:extensionmanager/Resources/Private/Language/locallang.xlf:report.status.mainRepository.notUpToDate.message');
$severity = ContextualFeedbackSeverity::NOTICE;
} else {
- $value = $this->languageService->getLL('report.status.mainRepository.upToDate.value');
+ $value = $this->languageService->sL('LLL:EXT:extensionmanager/Resources/Private/Language/locallang.xlf:report.status.mainRepository.upToDate.value');
$message = '';
$severity = ContextualFeedbackSeverity::OK;
}
$status = GeneralUtility::makeInstance(
Status::class,
- $this->languageService->getLL('report.status.mainRepository.title'),
+ $this->languageService->sL('LLL:EXT:extensionmanager/Resources/Private/Language/locallang.xlf:report.status.mainRepository.title'),
$value,
$message,
$severity
@@ -161,124 +160,124 @@ class ExtensionStatus implements StatusProviderInterface
$result = new \stdClass();
if (empty($loadedInsecure)) {
- $value = $this->languageService->getLL('report.status.loadedExtensions.noInsecureExtensionLoaded.value');
+ $value = $this->languageService->sL('LLL:EXT:extensionmanager/Resources/Private/Language/locallang.xlf:report.status.loadedExtensions.noInsecureExtensionLoaded.value');
$message = '';
$severity = ContextualFeedbackSeverity::OK;
} else {
$value = sprintf(
- $this->languageService->getLL('report.status.loadedExtensions.insecureExtensionLoaded.value'),
+ $this->languageService->sL('LLL:EXT:extensionmanager/Resources/Private/Language/locallang.xlf:report.status.loadedExtensions.insecureExtensionLoaded.value'),
count($loadedInsecure)
);
$extensionList = [];
foreach ($loadedInsecure as $insecureExtension) {
$extensionList[] = sprintf(
- $this->languageService->getLL('report.status.loadedExtensions.insecureExtensionLoaded.message.extension'),
+ $this->languageService->sL('LLL:EXT:extensionmanager/Resources/Private/Language/locallang.xlf:report.status.loadedExtensions.insecureExtensionLoaded.message.extension'),
$insecureExtension['extensionKey'],
$insecureExtension['version']
);
}
$message = sprintf(
- $this->languageService->getLL('report.status.loadedExtensions.insecureExtensionLoaded.message'),
+ $this->languageService->sL('LLL:EXT:extensionmanager/Resources/Private/Language/locallang.xlf:report.status.loadedExtensions.insecureExtensionLoaded.message'),
implode('', $extensionList)
);
$severity = ContextualFeedbackSeverity::ERROR;
}
$result->loaded = GeneralUtility::makeInstance(
Status::class,
- $this->languageService->getLL('report.status.loadedExtensions.title'),
+ $this->languageService->sL('LLL:EXT:extensionmanager/Resources/Private/Language/locallang.xlf:report.status.loadedExtensions.title'),
$value,
$message,
$severity
);
if (empty($existingInsecure)) {
- $value = $this->languageService->getLL('report.status.existingExtensions.noInsecureExtensionExists.value');
+ $value = $this->languageService->sL('LLL:EXT:extensionmanager/Resources/Private/Language/locallang.xlf:report.status.existingExtensions.noInsecureExtensionExists.value');
$message = '';
$severity = ContextualFeedbackSeverity::OK;
} else {
$value = sprintf(
- $this->languageService->getLL('report.status.existingExtensions.insecureExtensionExists.value'),
+ $this->languageService->sL('LLL:EXT:extensionmanager/Resources/Private/Language/locallang.xlf:report.status.existingExtensions.insecureExtensionExists.value'),
count($existingInsecure)
);
$extensionList = [];
foreach ($existingInsecure as $insecureExtension) {
$extensionList[] = sprintf(
- $this->languageService->getLL('report.status.existingExtensions.insecureExtensionExists.message.extension'),
+ $this->languageService->sL('LLL:EXT:extensionmanager/Resources/Private/Language/locallang.xlf:report.status.existingExtensions.insecureExtensionExists.message.extension'),
$insecureExtension['extensionKey'],
$insecureExtension['version']
);
}
$message = sprintf(
- $this->languageService->getLL('report.status.existingExtensions.insecureExtensionExists.message'),
+ $this->languageService->sL('LLL:EXT:extensionmanager/Resources/Private/Language/locallang.xlf:report.status.existingExtensions.insecureExtensionExists.message'),
implode('', $extensionList)
);
$severity = ContextualFeedbackSeverity::WARNING;
}
$result->existing = GeneralUtility::makeInstance(
Status::class,
- $this->languageService->getLL('report.status.existingExtensions.title'),
+ $this->languageService->sL('LLL:EXT:extensionmanager/Resources/Private/Language/locallang.xlf:report.status.existingExtensions.title'),
$value,
$message,
$severity
);
if (empty($loadedOutdated)) {
- $value = $this->languageService->getLL('report.status.loadedOutdatedExtensions.noOutdatedExtensionLoaded.value');
+ $value = $this->languageService->sL('LLL:EXT:extensionmanager/Resources/Private/Language/locallang.xlf:report.status.loadedOutdatedExtensions.noOutdatedExtensionLoaded.value');
$message = '';
$severity = ContextualFeedbackSeverity::OK;
} else {
$value = sprintf(
- $this->languageService->getLL('report.status.loadedOutdatedExtensions.outdatedExtensionLoaded.value'),
+ $this->languageService->sL('LLL:EXT:extensionmanager/Resources/Private/Language/locallang.xlf:report.status.loadedOutdatedExtensions.outdatedExtensionLoaded.value'),
count($loadedOutdated)
);
$extensionList = [];
foreach ($loadedOutdated as $outdatedExtension) {
$extensionList[] = sprintf(
- $this->languageService->getLL('report.status.loadedOutdatedExtensions.outdatedExtensionLoaded.message.extension'),
+ $this->languageService->sL('LLL:EXT:extensionmanager/Resources/Private/Language/locallang.xlf:report.status.loadedOutdatedExtensions.outdatedExtensionLoaded.message.extension'),
$outdatedExtension['extensionKey'],
$outdatedExtension['version']
);
}
$message = sprintf(
- $this->languageService->getLL('report.status.loadedOutdatedExtensions.outdatedExtensionLoaded.message'),
+ $this->languageService->sL('LLL:EXT:extensionmanager/Resources/Private/Language/locallang.xlf:report.status.loadedOutdatedExtensions.outdatedExtensionLoaded.message'),
implode('', $extensionList)
);
$severity = ContextualFeedbackSeverity::WARNING;
}
$result->loadedoutdated = GeneralUtility::makeInstance(
Status::class,
- $this->languageService->getLL('report.status.loadedOutdatedExtensions.title'),
+ $this->languageService->sL('LLL:EXT:extensionmanager/Resources/Private/Language/locallang.xlf:report.status.loadedOutdatedExtensions.title'),
$value,
$message,
$severity
);
if (empty($existingOutdated)) {
- $value = $this->languageService->getLL('report.status.existingOutdatedExtensions.noOutdatedExtensionExists.value');
+ $value = $this->languageService->sL('LLL:EXT:extensionmanager/Resources/Private/Language/locallang.xlf:report.status.existingOutdatedExtensions.noOutdatedExtensionExists.value');
$message = '';
$severity = ContextualFeedbackSeverity::OK;
} else {
$value = sprintf(
- $this->languageService->getLL('report.status.existingOutdatedExtensions.outdatedExtensionExists.value'),
+ $this->languageService->sL('LLL:EXT:extensionmanager/Resources/Private/Language/locallang.xlf:report.status.existingOutdatedExtensions.outdatedExtensionExists.value'),
count($existingOutdated)
);
$extensionList = [];
foreach ($existingOutdated as $outdatedExtension) {
$extensionList[] = sprintf(
- $this->languageService->getLL('report.status.existingOutdatedExtensions.outdatedExtensionExists.message.extension'),
+ $this->languageService->sL('LLL:EXT:extensionmanager/Resources/Private/Language/locallang.xlf:report.status.existingOutdatedExtensions.outdatedExtensionExists.message.extension'),
$outdatedExtension['extensionKey'],
$outdatedExtension['version']
);
}
$message = sprintf(
- $this->languageService->getLL('report.status.existingOutdatedExtensions.outdatedExtensionExists.message'),
+ $this->languageService->sL('LLL:EXT:extensionmanager/Resources/Private/Language/locallang.xlf:report.status.existingOutdatedExtensions.outdatedExtensionExists.message'),
implode('', $extensionList)
);
$severity = ContextualFeedbackSeverity::WARNING;
}
$result->existingoutdated = GeneralUtility::makeInstance(
Status::class,
- $this->languageService->getLL('report.status.existingOutdatedExtensions.title'),
+ $this->languageService->sL('LLL:EXT:extensionmanager/Resources/Private/Language/locallang.xlf:report.status.existingOutdatedExtensions.title'),
$value,
$message,
$severity
diff --git a/typo3/sysext/extensionmanager/Classes/Utility/FileHandlingUtility.php b/typo3/sysext/extensionmanager/Classes/Utility/FileHandlingUtility.php
index d655ef524776..5741c019ce8e 100644
--- a/typo3/sysext/extensionmanager/Classes/Utility/FileHandlingUtility.php
+++ b/typo3/sysext/extensionmanager/Classes/Utility/FileHandlingUtility.php
@@ -70,7 +70,6 @@ class FileHandlingUtility implements SingletonInterface, LoggerAwareInterface
public function initializeObject()
{
$this->languageService = $this->languageServiceFactory->createFromUserPreferences($GLOBALS['BE_USER'] ?? null);
- $this->languageService->includeLLFile('EXT:extensionmanager/Resources/Private/Language/locallang.xlf');
}
/**
@@ -131,7 +130,7 @@ class FileHandlingUtility implements SingletonInterface, LoggerAwareInterface
GeneralUtility::mkdir_deep($directory);
} catch (\RuntimeException $exception) {
throw new ExtensionManagerException(
- sprintf($this->languageService->getLL('fileHandling.couldNotCreateDirectory'), $this->getRelativePath($directory)),
+ sprintf($this->languageService->sL('LLL:EXT:extensionmanager/Resources/Private/Language/locallang.xlf:fileHandling.couldNotCreateDirectory'), $this->getRelativePath($directory)),
1337280416
);
}
@@ -182,7 +181,7 @@ class FileHandlingUtility implements SingletonInterface, LoggerAwareInterface
$path = $paths[$pathType] ?? '';
if (!$path || !is_dir($path) || !$extensionKey) {
throw new ExtensionManagerException(
- sprintf($this->languageService->getLL('fileHandling.installPathWasNoDirectory'), $this->getRelativePath($path)),
+ sprintf($this->languageService->sL('LLL:EXT:extensionmanager/Resources/Private/Language/locallang.xlf:fileHandling.installPathWasNoDirectory'), $this->getRelativePath($path)),
1337280417
);
}
@@ -201,7 +200,7 @@ class FileHandlingUtility implements SingletonInterface, LoggerAwareInterface
GeneralUtility::mkdir($extDirPath);
if (!is_dir($extDirPath)) {
throw new ExtensionManagerException(
- sprintf($this->languageService->getLL('fileHandling.couldNotCreateDirectory'), $this->getRelativePath($extDirPath)),
+ sprintf($this->languageService->sL('LLL:EXT:extensionmanager/Resources/Private/Language/locallang.xlf:fileHandling.couldNotCreateDirectory'), $this->getRelativePath($extDirPath)),
1337280418
);
}
@@ -224,7 +223,7 @@ class FileHandlingUtility implements SingletonInterface, LoggerAwareInterface
}
if ($result === false) {
throw new ExtensionManagerException(
- sprintf($this->languageService->getLL('fileHandling.couldNotRemoveDirectory'), $this->getRelativePath($extDirPath)),
+ sprintf($this->languageService->sL('LLL:EXT:extensionmanager/Resources/Private/Language/locallang.xlf:fileHandling.couldNotRemoveDirectory'), $this->getRelativePath($extDirPath)),
1337280415
);
}
diff --git a/typo3/sysext/filelist/Classes/FileList.php b/typo3/sysext/filelist/Classes/FileList.php
index 2ad56a427c82..e922f57ab98d 100644
--- a/typo3/sysext/filelist/Classes/FileList.php
+++ b/typo3/sysext/filelist/Classes/FileList.php
@@ -175,8 +175,6 @@ class FileList
$this->clipObj = GeneralUtility::makeInstance(Clipboard::class);
$this->clipObj->initializeClipboard($request);
$this->resourceFactory = GeneralUtility::makeInstance(ResourceFactory::class);
- $this->getLanguageService()->includeLLFile('EXT:filelist/Resources/Private/Language/locallang_mod_file_list.xlf');
- $this->getLanguageService()->includeLLFile('EXT:core/Resources/Private/Language/locallang_common.xlf');
$this->uriBuilder = GeneralUtility::makeInstance(UriBuilder::class);
// Initialize Resource Download
@@ -410,11 +408,14 @@ class FileList
public function getFolderInfo(): string
{
if ($this->totalItems == 1) {
- $fileLabel = $this->getLanguageService()->getLL('file');
+ $fileLabel = $this->getLanguageService()->sL('LLL:EXT:core/Resources/Private/Language/locallang_common.xlf:file');
} else {
- $fileLabel = $this->getLanguageService()->getLL('files');
+ $fileLabel = $this->getLanguageService()->sL('LLL:EXT:filelist/Resources/Private/Language/locallang_mod_file_list.xlf:files');
}
- return $this->totalItems . ' ' . htmlspecialchars($fileLabel) . ', ' . GeneralUtility::formatSize($this->totalbytes, htmlspecialchars($this->getLanguageService()->getLL('byteSizeUnits')));
+ return $this->totalItems . ' ' . htmlspecialchars($fileLabel) . ', ' . GeneralUtility::formatSize(
+ $this->totalbytes,
+ htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:core/Resources/Private/Language/locallang_common.xlf:byteSizeUnits'))
+ );
}
protected function renderListTableHeader(): string
@@ -659,7 +660,8 @@ class FileList
*/
protected function renderType(ResourceView $resourceView): string
{
- $content = $this->getLanguageService()->getLL($resourceView->getType());
+ $type = $resourceView->getType();
+ $content = $this->getLanguageService()->sL('LLL:EXT:core/Resources/Private/Language/locallang_common.xlf:' . $type);
if ($resourceView->resource instanceof File && $resourceView->resource->getExtension() !== '') {
$content .= ' (' . strtoupper($resourceView->resource->getExtension()) . ')';
}
@@ -691,7 +693,7 @@ class FileList
protected function renderSize(ResourceView $resourceView): string
{
if ($resourceView->resource instanceof File) {
- return GeneralUtility::formatSize((int)$resourceView->resource->getSize(), htmlspecialchars($this->getLanguageService()->getLL('byteSizeUnits')));
+ return GeneralUtility::formatSize((int)$resourceView->resource->getSize(), htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:core/Resources/Private/Language/locallang_common.xlf:byteSizeUnits')));
}
if ($resourceView->resource instanceof Folder) {
@@ -700,8 +702,10 @@ class FileList
} catch (InsufficientFolderAccessPermissionsException $e) {
$numFiles = 0;
}
-
- return $numFiles . ' ' . htmlspecialchars($this->getLanguageService()->getLL(($numFiles === 1 ? 'file' : 'files')));
+ if ($numFiles === 1) {
+ return $numFiles . ' ' . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:core/Resources/Private/Language/locallang_common.xlf:file'));
+ }
+ return $numFiles . ' ' . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:filelist/Resources/Private/Language/locallang_mod_file_list.xlf:files'));
}
return '';
@@ -713,8 +717,8 @@ class FileList
protected function renderPermission(ResourceView $resourceView): string
{
return '<strong class="text-danger">'
- . htmlspecialchars($this->getLanguageService()->getLL('read'))
- . ($resourceView->canWrite() ? htmlspecialchars($this->getLanguageService()->getLL('write')) : '')
+ . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:filelist/Resources/Private/Language/locallang_mod_file_list.xlf:read'))
+ . ($resourceView->canWrite() ? htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:filelist/Resources/Private/Language/locallang_mod_file_list.xlf:write')) : '')
. '</strong>';
}
@@ -1163,7 +1167,7 @@ class FileList
if (isset($existingTranslations[$languageId])) {
// Set options for edit action of an existing translation
- $title = sprintf($this->getLanguageService()->getLL('editMetadataForLanguage'), $language['title']);
+ $title = sprintf($this->getLanguageService()->sL('LLL:EXT:filelist/Resources/Private/Language/locallang_mod_file_list.xlf:editMetadataForLanguage'), $language['title']);
$actionType = 'edit';
$url = (string)$this->uriBuilder->buildUriFromRoute(
'record_edit',
@@ -1178,7 +1182,7 @@ class FileList
);
} else {
// Set options for "create new" action of a new translation
- $title = sprintf($this->getLanguageService()->getLL('createMetadataForLanguage'), $language['title']);
+ $title = sprintf($this->getLanguageService()->sL('LLL:EXT:filelist/Resources/Private/Language/locallang_mod_file_list.xlf:createMetadataForLanguage'), $language['title']);
$actionType = 'new';
$metaDataRecordId = (int)($metaDataRecord['uid'] ?? 0);
$url = (string)$this->uriBuilder->buildUriFromRoute(
@@ -1286,7 +1290,7 @@ class FileList
$elementsToConfirm[$key] = $clipBoardElement->getName();
}
- $pasteTitle = $this->getLanguageService()->getLL('clip_pasteInto');
+ $pasteTitle = $this->getLanguageService()->sL('LLL:EXT:filelist/Resources/Private/Language/locallang_mod_file_list.xlf:clip_pasteInto');
$button = GeneralUtility::makeInstance(LinkButton::class);
$button->setTitle($pasteTitle);
$button->setHref($this->clipObj->pasteUrl('_FILE', $resourceView->getIdentifier()));
@@ -1621,7 +1625,7 @@ class FileList
if ($specialLabel = $lang->sL('LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:labels.' . $field)) {
return $specialLabel;
}
- if ($customLabel = $lang->getLL('c_' . $field)) {
+ if ($customLabel = $lang->sL('LLL:EXT:filelist/Resources/Private/Language/locallang_mod_file_list.xlf:c_' . $field)) {
return $customLabel;
}
diff --git a/typo3/sysext/form/Classes/Domain/Configuration/FlexformConfiguration/Processors/FinisherOptionGenerator.php b/typo3/sysext/form/Classes/Domain/Configuration/FlexformConfiguration/Processors/FinisherOptionGenerator.php
index 874524cc57f1..9a84e0798f45 100644
--- a/typo3/sysext/form/Classes/Domain/Configuration/FlexformConfiguration/Processors/FinisherOptionGenerator.php
+++ b/typo3/sysext/form/Classes/Domain/Configuration/FlexformConfiguration/Processors/FinisherOptionGenerator.php
@@ -79,11 +79,11 @@ class FinisherOptionGenerator extends AbstractProcessor
$languageService = $this->getLanguageService();
$elementConfiguration['label'] = (string)($elementConfiguration['label'] ?? '');
if (empty($optionValue)) {
- $optionValue = $languageService->getLL('empty');
+ $optionValue = $languageService->sL('LLL:EXT:form/Resources/Private/Language/Database.xlf:empty');
} elseif (is_array($optionValue)) {
$optionValue = implode(',', $optionValue);
}
- $elementConfiguration['label'] .= sprintf(' (%s: "%s")', $languageService->getLL('default'), $optionValue);
+ $elementConfiguration['label'] .= sprintf(' (%s: "%s")', $languageService->sL('LLL:EXT:form/Resources/Private/Language/Database.xlf:default'), $optionValue);
$sheetElements = $this->converterDto->getResult();
$sheetElements['settings.finishers.' . $finisherIdentifier . '.' . $optionKey] = $elementConfiguration;
diff --git a/typo3/sysext/impexp/Classes/ImportExport.php b/typo3/sysext/impexp/Classes/ImportExport.php
index 9ed06571c778..310419c68590 100644
--- a/typo3/sysext/impexp/Classes/ImportExport.php
+++ b/typo3/sysext/impexp/Classes/ImportExport.php
@@ -267,7 +267,6 @@ abstract class ImportExport
{
$this->iconFactory = GeneralUtility::makeInstance(IconFactory::class);
$this->lang = $this->getLanguageService();
- $this->lang->includeLLFile('EXT:impexp/Resources/Private/Language/locallang.xlf');
$this->permsClause = $this->getBackendUser()->getPagePermsClause(Permission::PAGE_SHOW);
$this->fetchStorages();
@@ -519,7 +518,7 @@ abstract class ImportExport
if ($table === '_SOFTREF_') {
// Record is a soft reference
$line['preCode'] = $this->renderIndent($indent);
- $line['title'] = '<em>' . htmlspecialchars($this->lang->getLL('impexpcore_singlereco_softReferencesFiles')) . '</em>';
+ $line['title'] = '<em>' . htmlspecialchars($this->lang->sL('LLL:EXT:impexp/Resources/Private/Language/locallang.xlf:impexpcore_singlereco_softReferencesFiles')) . '</em>';
} elseif (!isset($GLOBALS['TCA'][$table])) {
// Record is of unknown table
$line['preCode'] = $this->renderIndent($indent);
@@ -854,7 +853,7 @@ abstract class ImportExport
$line['title'] .= sprintf(
'<br>%s <strong>%s</strong> %s',
$this->renderIndent($indent + 1),
- htmlspecialchars($this->lang->getLL('impexpcore_singlereco_title')),
+ htmlspecialchars($this->lang->sL('LLL:EXT:impexp/Resources/Private/Language/locallang.xlf:impexpcore_singlereco_title')),
htmlspecialchars(GeneralUtility::fixed_lgd_cs($softref['subst']['title'], 60))
);
}
@@ -862,7 +861,7 @@ abstract class ImportExport
$line['title'] .= sprintf(
'<br>%s <strong>%s</strong> %s',
$this->renderIndent($indent + 1),
- htmlspecialchars($this->lang->getLL('impexpcore_singlereco_descr')),
+ htmlspecialchars($this->lang->sL('LLL:EXT:impexp/Resources/Private/Language/locallang.xlf:impexpcore_singlereco_descr')),
htmlspecialchars(GeneralUtility::fixed_lgd_cs($softref['subst']['description'], 60))
);
}
@@ -870,21 +869,21 @@ abstract class ImportExport
$line['title'] .= sprintf(
'<br>%s <strong>%s</strong> %s',
$this->renderIndent($indent + 1),
- htmlspecialchars($this->lang->getLL('impexpcore_softrefsel_record')),
+ htmlspecialchars($this->lang->sL('LLL:EXT:impexp/Resources/Private/Language/locallang.xlf:impexpcore_softrefsel_record')),
$softref['subst']['recordRef']
);
} elseif ($softref['subst']['type'] === 'file') {
$line['title'] .= sprintf(
'<br>%s <strong>%s</strong> %s',
$this->renderIndent($indent + 1),
- htmlspecialchars($this->lang->getLL('impexpcore_singlereco_filename')),
+ htmlspecialchars($this->lang->sL('LLL:EXT:impexp/Resources/Private/Language/locallang.xlf:impexpcore_singlereco_filename')),
$softref['subst']['relFileName']
);
} elseif ($softref['subst']['type'] === 'string') {
$line['title'] .= sprintf(
'<br>%s <strong>%s</strong> %s',
$this->renderIndent($indent + 1),
- htmlspecialchars($this->lang->getLL('impexpcore_singlereco_value')),
+ htmlspecialchars($this->lang->sL('LLL:EXT:impexp/Resources/Private/Language/locallang.xlf:impexpcore_singlereco_value')),
$softref['subst']['tokenValue']
);
}
@@ -961,7 +960,7 @@ abstract class ImportExport
return ''
. '<div class="form-check mb-0">'
. '<input class="form-check-input t3js-exclude-checkbox" type="checkbox" name="tx_impexp[exclude][' . $recordRef . ']" id="checkExclude' . $recordRef . '" value="1" />'
- . '<label class="form-check-label" for="checkExclude' . $recordRef . '">' . htmlspecialchars($this->lang->getLL('impexpcore_singlereco_exclude')) . '</label>'
+ . '<label class="form-check-label" for="checkExclude' . $recordRef . '">' . htmlspecialchars($this->lang->sL('LLL:EXT:impexp/Resources/Private/Language/locallang.xlf:impexpcore_singlereco_exclude')) . '</label>'
. '</div>';
}
@@ -1008,8 +1007,8 @@ abstract class ImportExport
if (isset($softref['subst']['tokenID']) && !isset($fileInfo['RTE_ORIG_ID'])) {
$options = [];
$options[''] = '';
- $options[Import::SOFTREF_IMPORT_MODE_EDITABLE] = $this->lang->getLL('impexpcore_softrefsel_editable');
- $options[Import::SOFTREF_IMPORT_MODE_EXCLUDE] = $this->lang->getLL('impexpcore_softrefsel_exclude');
+ $options[Import::SOFTREF_IMPORT_MODE_EDITABLE] = $this->lang->sL('LLL:EXT:impexp/Resources/Private/Language/locallang.xlf:impexpcore_softrefsel_editable');
+ $options[Import::SOFTREF_IMPORT_MODE_EXCLUDE] = $this->lang->sL('LLL:EXT:impexp/Resources/Private/Language/locallang.xlf:impexpcore_softrefsel_exclude');
$value = $this->softrefCfg[$softref['subst']['tokenID']]['mode'] ?? '';
$selectHtml = $this->renderSelectBox(
'tx_impexp[softrefCfg][' . $softref['subst']['tokenID'] . '][mode]',
@@ -1032,7 +1031,7 @@ abstract class ImportExport
'
%s<br>
<input type="text" name="tx_impexp[softrefCfg][%s][description]" value="%s" />',
- htmlspecialchars($this->lang->getLL('impexpcore_printerror_description')),
+ htmlspecialchars($this->lang->sL('LLL:EXT:impexp/Resources/Private/Language/locallang.xlf:impexpcore_printerror_description')),
$softref['subst']['tokenID'],
htmlspecialchars($this->softrefCfg[$softref['subst']['tokenID']]['description'] ?? '')
);
@@ -1068,20 +1067,20 @@ abstract class ImportExport
{
$options = [];
if (!$doesRecordExist) {
- $options[] = $this->lang->getLL('impexpcore_singlereco_insert');
+ $options[] = $this->lang->sL('LLL:EXT:impexp/Resources/Private/Language/locallang.xlf:impexpcore_singlereco_insert');
if ($this->getBackendUser()->isAdmin()) {
- $options[Import::IMPORT_MODE_FORCE_UID] = sprintf($this->lang->getLL('impexpcore_singlereco_forceUidSAdmin'), $uid);
+ $options[Import::IMPORT_MODE_FORCE_UID] = sprintf($this->lang->sL('LLL:EXT:impexp/Resources/Private/Language/locallang.xlf:impexpcore_singlereco_forceUidSAdmin'), $uid);
}
} else {
- $options[] = $this->lang->getLL('impexpcore_singlereco_update');
- $options[Import::IMPORT_MODE_AS_NEW] = $this->lang->getLL('impexpcore_singlereco_importAsNew');
+ $options[] = $this->lang->sL('LLL:EXT:impexp/Resources/Private/Language/locallang.xlf:impexpcore_singlereco_update');
+ $options[Import::IMPORT_MODE_AS_NEW] = $this->lang->sL('LLL:EXT:impexp/Resources/Private/Language/locallang.xlf:impexpcore_singlereco_importAsNew');
if (!$this->globalIgnorePid) {
- $options[Import::IMPORT_MODE_IGNORE_PID] = $this->lang->getLL('impexpcore_singlereco_ignorePid');
+ $options[Import::IMPORT_MODE_IGNORE_PID] = $this->lang->sL('LLL:EXT:impexp/Resources/Private/Language/locallang.xlf:impexpcore_singlereco_ignorePid');
} else {
- $options[Import::IMPORT_MODE_RESPECT_PID] = $this->lang->getLL('impexpcore_singlereco_respectPid');
+ $options[Import::IMPORT_MODE_RESPECT_PID] = $this->lang->sL('LLL:EXT:impexp/Resources/Private/Language/locallang.xlf:impexpcore_singlereco_respectPid');
}
}
- $options[Import::IMPORT_MODE_EXCLUDE] = $this->lang->getLL('impexpcore_singlereco_exclude');
+ $options[Import::IMPORT_MODE_EXCLUDE] = $this->lang->sL('LLL:EXT:impexp/Resources/Private/Language/locallang.xlf:impexpcore_singlereco_exclude');
return $this->renderSelectBox(
'tx_impexp[import_mode][' . $table . ':' . $uid . ']',
(string)($this->importMode[$table . ':' . $uid] ?? ''),
diff --git a/typo3/sysext/install/Classes/Report/InstallStatusReport.php b/typo3/sysext/install/Classes/Report/InstallStatusReport.php
index f28fba029ac4..08ebc3057cdd 100644
--- a/typo3/sysext/install/Classes/Report/InstallStatusReport.php
+++ b/typo3/sysext/install/Classes/Report/InstallStatusReport.php
@@ -182,7 +182,7 @@ final class InstallStatusReport implements StatusProviderInterface
private function getRemainingUpdatesStatus(): Status
{
$languageService = $this->getLanguageService();
- $value = $languageService->getLL('status_updateComplete');
+ $value = $languageService->sL('LLL:EXT:reports/Resources/Private/Language/locallang_reports.xlf:status_updateComplete');
$message = '';
$severity = ContextualFeedbackSeverity::OK;
$uriBuilder = GeneralUtility::makeInstance(UriBuilder::class);
@@ -190,7 +190,7 @@ final class InstallStatusReport implements StatusProviderInterface
$incompleteWizards = $this->getIncompleteWizards();
if (count($incompleteWizards)) {
// At least one incomplete wizard was found
- $value = $languageService->getLL('status_updateIncomplete');
+ $value = $languageService->sL('LLL:EXT:reports/Resources/Private/Language/locallang_reports.xlf:status_updateIncomplete');
$severity = ContextualFeedbackSeverity::WARNING;
$url = (string)$uriBuilder->buildUriFromRoute('tools_toolsupgrade');
$message = sprintf($languageService->sL('LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:warning.install_update'), '<a href="' . htmlspecialchars($url) . '">', '</a>');
diff --git a/typo3/sysext/install/Classes/Report/SecurityStatusReport.php b/typo3/sysext/install/Classes/Report/SecurityStatusReport.php
index 07222fd6dc61..ef83ab8daec7 100644
--- a/typo3/sysext/install/Classes/Report/SecurityStatusReport.php
+++ b/typo3/sysext/install/Classes/Report/SecurityStatusReport.php
@@ -59,8 +59,8 @@ final class SecurityStatusReport implements RequestAwareStatusProviderInterface
private function getInstallToolProtectionStatus(): Status
{
$enableInstallToolFile = EnableFileService::getBestLocationForInstallToolEnableFile();
- // @todo: Note $this->getLanguageService() is declared to allow null. Calling ->getLL() may fatal?!
- $value = $this->getLanguageService()->getLL('status_disabled');
+ // @todo: Note $this->getLanguageService() is declared to allow null. Calling ->sL() may fatal?!
+ $value = $this->getLanguageService()->sL('LLL:EXT:reports/Resources/Private/Language/locallang_reports.xlf:status_disabled');
$message = '';
$severity = ContextualFeedbackSeverity::OK;
if (EnableFileService::installToolEnableFileExists()) {
diff --git a/typo3/sysext/lowlevel/Classes/Controller/DatabaseIntegrityController.php b/typo3/sysext/lowlevel/Classes/Controller/DatabaseIntegrityController.php
index a0db532d9db9..83ae6604854b 100644
--- a/typo3/sysext/lowlevel/Classes/Controller/DatabaseIntegrityController.php
+++ b/typo3/sysext/lowlevel/Classes/Controller/DatabaseIntegrityController.php
@@ -229,7 +229,6 @@ class DatabaseIntegrityController
public function handleRequest(ServerRequestInterface $request): ResponseInterface
{
$languageService = $this->getLanguageService();
- $languageService->includeLLFile('EXT:lowlevel/Resources/Private/Language/locallang.xlf');
$this->menuConfig($request);
$moduleTemplate = $this->moduleTemplateFactory->create($request);
@@ -238,16 +237,16 @@ class DatabaseIntegrityController
$title = $languageService->sL('LLL:EXT:lowlevel/Resources/Private/Language/locallang.xlf:module.dbint.title');
switch ($this->MOD_SETTINGS['function']) {
case 'search':
- $moduleTemplate->setTitle($title, $languageService->getLL('fullSearch'));
+ $moduleTemplate->setTitle($title, $languageService->sL('LLL:EXT:lowlevel/Resources/Private/Language/locallang.xlf:fullSearch'));
return $this->searchAction($moduleTemplate, $request);
case 'records':
- $moduleTemplate->setTitle($title, $languageService->getLL('recordStatistics'));
+ $moduleTemplate->setTitle($title, $languageService->sL('LLL:EXT:lowlevel/Resources/Private/Language/locallang.xlf:recordStatistics'));
return $this->recordStatisticsAction($moduleTemplate, $request);
case 'relations':
- $moduleTemplate->setTitle($title, $languageService->getLL('databaseRelations'));
+ $moduleTemplate->setTitle($title, $languageService->sL('LLL:EXT:lowlevel/Resources/Private/Language/locallang.xlf:databaseRelations'));
return $this->relationsAction($moduleTemplate);
default:
- $moduleTemplate->setTitle($title, $languageService->getLL('manageRefIndex'));
+ $moduleTemplate->setTitle($title, $languageService->sL('LLL:EXT:lowlevel/Resources/Private/Language/locallang.xlf:manageRefIndex'));
return $this->referenceIndexAction($moduleTemplate, $request);
}
}
@@ -267,14 +266,14 @@ class DatabaseIntegrityController
// Values NOT in this array will not be saved in the settings-array for the module.
$this->MOD_MENU = [
'function' => [
- 'refindex' => htmlspecialchars($lang->getLL('manageRefIndex')),
- 'records' => htmlspecialchars($lang->getLL('recordStatistics')),
- 'relations' => htmlspecialchars($lang->getLL('databaseRelations')),
- 'search' => htmlspecialchars($lang->getLL('fullSearch')),
+ 'refindex' => htmlspecialchars($lang->sL('LLL:EXT:lowlevel/Resources/Private/Language/locallang.xlf:manageRefIndex')),
+ 'records' => htmlspecialchars($lang->sL('LLL:EXT:lowlevel/Resources/Private/Language/locallang.xlf:recordStatistics')),
+ 'relations' => htmlspecialchars($lang->sL('LLL:EXT:lowlevel/Resources/Private/Language/locallang.xlf:databaseRelations')),
+ 'search' => htmlspecialchars($lang->sL('LLL:EXT:lowlevel/Resources/Private/Language/locallang.xlf:fullSearch')),
],
'search' => [
- 'raw' => htmlspecialchars($lang->getLL('rawSearch')),
- 'query' => htmlspecialchars($lang->getLL('advancedQuery')),
+ 'raw' => htmlspecialchars($lang->sL('LLL:EXT:lowlevel/Resources/Private/Language/locallang.xlf:rawSearch')),
+ 'query' => htmlspecialchars($lang->sL('LLL:EXT:lowlevel/Resources/Private/Language/locallang.xlf:advancedQuery')),
],
'search_query_smallparts' => '',
'search_result_labels' => '',
@@ -304,10 +303,10 @@ class DatabaseIntegrityController
'storeQueryConfigs' => '',
// Used to store the available Query configs in memory
'search_query_makeQuery' => [
- 'all' => htmlspecialchars($lang->getLL('selectRecords')),
- 'count' => htmlspecialchars($lang->getLL('countResults')),
- 'explain' => htmlspecialchars($lang->getLL('explainQuery')),
- 'csv' => htmlspecialchars($lang->getLL('csvExport')),
+ 'all' => htmlspecialchars($lang->sL('LLL:EXT:lowlevel/Resources/Private/Language/locallang.xlf:selectRecords')),
+ 'count' => htmlspecialchars($lang->sL('LLL:EXT:lowlevel/Resources/Private/Language/locallang.xlf:countResults')),
+ 'explain' => htmlspecialchars($lang->sL('LLL:EXT:lowlevel/Resources/Private/Language/locallang.xlf:explainQuery')),
+ 'csv' => htmlspecialchars($lang->sL('LLL:EXT:lowlevel/Resources/Private/Language/locallang.xlf:csvExport')),
],
'sword' => '',
];
@@ -419,7 +418,6 @@ class DatabaseIntegrityController
protected function searchAction(ModuleTemplate $view, ServerRequestInterface $request): ResponseInterface
{
$lang = $this->getLanguageService();
- $lang->includeLLFile('EXT:core/Resources/Private/Language/locallang_t3lib_fullsearch.xlf');
$this->showFieldAndTableNames = $this->getBackendUserAuthentication()->shallDisplayDebugInformation();
$searchMode = $this->MOD_SETTINGS['search'];
$this->setFormName('queryform');
@@ -430,11 +428,11 @@ class DatabaseIntegrityController
}
$submenu .= '</div>';
if ($this->MOD_SETTINGS['search'] === 'query') {
- $submenu .= '<div class="form-check">' . self::getFuncCheck(0, 'SET[search_query_smallparts]', $this->MOD_SETTINGS['search_query_smallparts'] ?? '', $request, '', '', 'id="checkSearch_query_smallparts"') . '<label class="form-check-label" for="checkSearch_query_smallparts">' . $lang->getLL('showSQL') . '</label></div>';
- $submenu .= '<div class="form-check">' . self::getFuncCheck(0, 'SET[search_result_labels]', $this->MOD_SETTINGS['search_result_labels'] ?? '', $request, '', '', 'id="checkSearch_result_labels"') . '<label class="form-check-label" for="checkSearch_result_labels">' . $lang->getLL('useFormattedStrings') . '</label></div>';
- $submenu .= '<div class="form-check">' . self::getFuncCheck(0, 'SET[labels_noprefix]', $this->MOD_SETTINGS['labels_noprefix'] ?? '', $request, '', '', 'id="checkLabels_noprefix"') . '<label class="form-check-label" for="checkLabels_noprefix">' . $lang->getLL('dontUseOrigValues') . '</label></div>';
- $submenu .= '<div class="form-check">' . self::getFuncCheck(0, 'SET[options_sortlabel]', $this->MOD_SETTINGS['options_sortlabel'] ?? '', $request, '', '', 'id="checkOptions_sortlabel"') . '<label class="form-check-label" for="checkOptions_sortlabel">' . $lang->getLL('sortOptions') . '</label></div>';
- $submenu .= '<div class="form-check">' . self::getFuncCheck(0, 'SET[show_deleted]', $this->MOD_SETTINGS['show_deleted'] ?? 0, $request, '', '', 'id="checkShow_deleted"') . '<label class="form-check-label" for="checkShow_deleted">' . $lang->getLL('showDeleted') . '</label></div>';
+ $submenu .= '<div class="form-check">' . self::getFuncCheck(0, 'SET[search_query_smallparts]', $this->MOD_SETTINGS['search_query_smallparts'] ?? '', $request, '', '', 'id="checkSearch_query_smallparts"') . '<label class="form-check-label" for="checkSearch_query_smallparts">' . $lang->sL('LLL:EXT:lowlevel/Resources/Private/Language/locallang.xlf:showSQL') . '</label></div>';
+ $submenu .= '<div class="form-check">' . self::getFuncCheck(0, 'SET[search_result_labels]', $this->MOD_SETTINGS['search_result_labels'] ?? '', $request, '', '', 'id="checkSearch_result_labels"') . '<label class="form-check-label" for="checkSearch_result_labels">' . $lang->sL('LLL:EXT:lowlevel/Resources/Private/Language/locallang.xlf:useFormattedStrings') . '</label></div>';
+ $submenu .= '<div class="form-check">' . self::getFuncCheck(0, 'SET[labels_noprefix]', $this->MOD_SETTINGS['labels_noprefix'] ?? '', $request, '', '', 'id="checkLabels_noprefix"') . '<label class="form-check-label" for="checkLabels_noprefix">' . $lang->sL('LLL:EXT:lowlevel/Resources/Private/Language/locallang.xlf:dontUseOrigValues') . '</label></div>';
+ $submenu .= '<div class="form-check">' . self::getFuncCheck(0, 'SET[options_sortlabel]', $this->MOD_SETTINGS['options_sortlabel'] ?? '', $request, '', '', 'id="checkOptions_sortlabel"') . '<label class="form-check-label" for="checkOptions_sortlabel">' . $lang->sL('LLL:EXT:lowlevel/Resources/Private/Language/locallang.xlf:sortOptions') . '</label></div>';
+ $submenu .= '<div class="form-check">' . self::getFuncCheck(0, 'SET[show_deleted]', $this->MOD_SETTINGS['show_deleted'] ?? 0, $request, '', '', 'id="checkShow_deleted"') . '<label class="form-check-label" for="checkShow_deleted">' . $lang->sL('LLL:EXT:lowlevel/Resources/Private/Language/locallang.xlf:showDeleted') . '</label></div>';
}
$view->assign('submenu', $submenu);
$view->assign('searchMode', $searchMode);
@@ -826,7 +824,7 @@ class DatabaseIntegrityController
],
],
'redirect' => (string)$uriBuilder->buildUriFromRoute('system_dbint'),
- ])) . '" title="' . htmlspecialchars($languageService->getLL('undelete_only')) . '">';
+ ])) . '" title="' . htmlspecialchars($languageService->sL('LLL:EXT:core/Resources/Private/Language/locallang_t3lib_fullsearch.xlf:undelete_only')) . '">';
$out .= $this->iconFactory->getIcon('actions-edit-restore', Icon::SIZE_SMALL)->render() . '</a>';
$out .= '</div>';
}
@@ -2378,7 +2376,7 @@ class DatabaseIntegrityController
$saveStoreArray = 1;
$flashMessage = GeneralUtility::makeInstance(
FlashMessage::class,
- sprintf($languageService->getLL('query_loaded'), $storeArray[$storeIndex])
+ sprintf($languageService->sL('LLL:EXT:core/Resources/Private/Language/locallang_t3lib_fullsearch.xlf:query_loaded'), $storeArray[$storeIndex])
);
}
} elseif ($storeControl['SAVE'] ?? false) {
@@ -2394,14 +2392,14 @@ class DatabaseIntegrityController
$saveStoreArray = 1;
$flashMessage = GeneralUtility::makeInstance(
FlashMessage::class,
- $languageService->getLL('query_saved')
+ $languageService->sL('LLL:EXT:core/Resources/Private/Language/locallang_t3lib_fullsearch.xlf:query_saved')
);
}
} elseif ($storeControl['REMOVE'] ?? false) {
if ($storeIndex > 0) {
$flashMessage = GeneralUtility::makeInstance(
FlashMessage::class,
- sprintf($languageService->getLL('query_removed'), $storeArray[$storeControl['STORE']])
+ sprintf($languageService->sL('LLL:EXT:core/Resources/Private/Language/locallang_t3lib_fullsearch.xlf:query_removed'), $storeArray[$storeControl['STORE']])
);
// Removing
unset($storeArray[$storeControl['STORE']]);
@@ -2680,7 +2678,7 @@ class DatabaseIntegrityController
);
$lostRecordList[] =
'<div class="record">' .
- '<a href="' . htmlspecialchars($fixLink) . '" title="' . htmlspecialchars($languageService->getLL('fixLostRecord')) . '">' .
+ '<a href="' . htmlspecialchars($fixLink) . '" title="' . htmlspecialchars($languageService->sL('LLL:EXT:lowlevel/Resources/Private/Language/locallang.xlf:fixLostRecord')) . '">' .
$this->iconFactory->getIcon('status-dialog-error', Icon::SIZE_SMALL)->render() .
'</a>uid:' . $data['uid'] . ', pid:' . $data['pid'] . ', ' . htmlspecialchars(GeneralUtility::fixed_lgd_cs(strip_tags($data['title']), 20)) .
'</div>';
diff --git a/typo3/sysext/reports/Classes/Report/Status/ConfigurationStatus.php b/typo3/sysext/reports/Classes/Report/Status/ConfigurationStatus.php
index 386572a8693d..e26151595cb6 100644
--- a/typo3/sysext/reports/Classes/Report/Status/ConfigurationStatus.php
+++ b/typo3/sysext/reports/Classes/Report/Status/ConfigurationStatus.php
@@ -70,7 +70,7 @@ class ConfigurationStatus implements StatusProviderInterface
*/
protected function getReferenceIndexStatus()
{
- $value = $this->getLanguageService()->getLL('status_ok');
+ $value = $this->getLanguageService()->sL('LLL:EXT:reports/Resources/Private/Language/locallang_reports.xlf:status_ok');
$message = '';
$severity = ContextualFeedbackSeverity::OK;
@@ -86,12 +86,12 @@ class ConfigurationStatus implements StatusProviderInterface
$uriBuilder = GeneralUtility::makeInstance(UriBuilder::class);
if (!$count && $lastRefIndexUpdate) {
- $value = $this->getLanguageService()->getLL('status_empty');
+ $value = $this->getLanguageService()->sL('LLL:EXT:reports/Resources/Private/Language/locallang_reports.xlf:status_empty');
$severity = ContextualFeedbackSeverity::WARNING;
$url = (string)$uriBuilder->buildUriFromRoute('system_dbint', ['id' => 0, 'SET' => ['function' => 'refindex']]);
$message = sprintf($this->getLanguageService()->sL('LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:warning.backend_reference_index'), '<a href="' . htmlspecialchars($url) . '">', '</a>', BackendUtility::datetime($lastRefIndexUpdate));
}
- return GeneralUtility::makeInstance(ReportStatus::class, $this->getLanguageService()->getLL('status_referenceIndex'), $value, $message, $severity);
+ return GeneralUtility::makeInstance(ReportStatus::class, $this->getLanguageService()->sL('LLL:EXT:reports/Resources/Private/Language/locallang_reports.xlf:status_referenceIndex'), $value, $message, $severity);
}
/**
@@ -138,7 +138,7 @@ class ConfigurationStatus implements StatusProviderInterface
*/
protected function getMemcachedConnectionStatus()
{
- $value = $this->getLanguageService()->getLL('status_ok');
+ $value = $this->getLanguageService()->sL('LLL:EXT:reports/Resources/Private/Language/locallang_reports.xlf:status_ok');
$message = '';
$severity = ContextualFeedbackSeverity::OK;
$failedConnections = [];
@@ -172,11 +172,11 @@ class ConfigurationStatus implements StatusProviderInterface
}
}
if (!empty($failedConnections)) {
- $value = $this->getLanguageService()->getLL('status_connectionFailed');
+ $value = $this->getLanguageService()->sL('LLL:EXT:reports/Resources/Private/Language/locallang_reports.xlf:status_connectionFailed');
$severity = ContextualFeedbackSeverity::WARNING;
$message = $this->getLanguageService()->sL('LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:warning.memcache_not_usable') . '<br /><br /><ul><li>' . implode('</li><li>', $failedConnections) . '</li></ul>';
}
- return GeneralUtility::makeInstance(ReportStatus::class, $this->getLanguageService()->getLL('status_memcachedConfiguration'), $value, $message, $severity);
+ return GeneralUtility::makeInstance(ReportStatus::class, $this->getLanguageService()->sL('LLL:EXT:reports/Resources/Private/Language/locallang_reports.xlf:status_memcachedConfiguration'), $value, $message, $severity);
}
/**
@@ -186,15 +186,15 @@ class ConfigurationStatus implements StatusProviderInterface
*/
protected function getCreatedFilesWorldWritableStatus()
{
- $value = $this->getLanguageService()->getLL('status_ok');
+ $value = $this->getLanguageService()->sL('LLL:EXT:reports/Resources/Private/Language/locallang_reports.xlf:status_ok');
$message = '';
$severity = ContextualFeedbackSeverity::OK;
if ((int)$GLOBALS['TYPO3_CONF_VARS']['SYS']['fileCreateMask'] % 10 & 2) {
$value = $GLOBALS['TYPO3_CONF_VARS']['SYS']['fileCreateMask'];
$severity = ContextualFeedbackSeverity::WARNING;
- $message = $this->getLanguageService()->getLL('status_CreatedFilePermissions.writable');
+ $message = $this->getLanguageService()->sL('LLL:EXT:reports/Resources/Private/Language/locallang_reports.xlf:status_CreatedFilePermissions.writable');
}
- return GeneralUtility::makeInstance(ReportStatus::class, $this->getLanguageService()->getLL('status_CreatedFilePermissions'), $value, $message, $severity);
+ return GeneralUtility::makeInstance(ReportStatus::class, $this->getLanguageService()->sL('LLL:EXT:reports/Resources/Private/Language/locallang_reports.xlf:status_CreatedFilePermissions'), $value, $message, $severity);
}
/**
@@ -204,15 +204,15 @@ class ConfigurationStatus implements StatusProviderInterface
*/
protected function getCreatedDirectoriesWorldWritableStatus()
{
- $value = $this->getLanguageService()->getLL('status_ok');
+ $value = $this->getLanguageService()->sL('LLL:EXT:reports/Resources/Private/Language/locallang_reports.xlf:status_ok');
$message = '';
$severity = ContextualFeedbackSeverity::OK;
if ((int)$GLOBALS['TYPO3_CONF_VARS']['SYS']['folderCreateMask'] % 10 & 2) {
$value = $GLOBALS['TYPO3_CONF_VARS']['SYS']['folderCreateMask'];
$severity = ContextualFeedbackSeverity::WARNING;
- $message = $this->getLanguageService()->getLL('status_CreatedDirectoryPermissions.writable');
+ $message = $this->getLanguageService()->sL('LLL:EXT:reports/Resources/Private/Language/locallang_reports.xlf:status_CreatedDirectoryPermissions.writable');
}
- return GeneralUtility::makeInstance(ReportStatus::class, $this->getLanguageService()->getLL('status_CreatedDirectoryPermissions'), $value, $message, $severity);
+ return GeneralUtility::makeInstance(ReportStatus::class, $this->getLanguageService()->sL('LLL:EXT:reports/Resources/Private/Language/locallang_reports.xlf:status_CreatedDirectoryPermissions'), $value, $message, $severity);
}
/**
@@ -253,7 +253,7 @@ class ConfigurationStatus implements StatusProviderInterface
->fetchOne();
$severity = ContextualFeedbackSeverity::OK;
- $statusValue = $this->getLanguageService()->getLL('status_ok');
+ $statusValue = $this->getLanguageService()->sL('LLL:EXT:reports/Resources/Private/Language/locallang_reports.xlf:status_ok');
// also allow utf8mb4
if (!str_starts_with($defaultDatabaseCharset, 'utf8')) {
// If the default character set is e.g. latin1, BUT all tables in the system are UTF-8,
@@ -272,16 +272,16 @@ class ConfigurationStatus implements StatusProviderInterface
if ($nonUtf8TableCollationsFound->rowCount() > 0) {
$message = sprintf($this->getLanguageService()
- ->getLL('status_MysqlDatabaseCharacterSet_Unsupported'), $defaultDatabaseCharset);
+ ->sL('LLL:EXT:reports/Resources/Private/Language/locallang_reports.xlf:status_MysqlDatabaseCharacterSet_Unsupported'), $defaultDatabaseCharset);
$severity = ContextualFeedbackSeverity::ERROR;
- $statusValue = $this->getLanguageService()->getLL('status_wrongValue');
+ $statusValue = $this->getLanguageService()->sL('LLL:EXT:reports/Resources/Private/Language/locallang_reports.xlf:status_wrongValue');
} else {
- $message = $this->getLanguageService()->getLL('status_MysqlDatabaseCharacterSet_Info');
+ $message = $this->getLanguageService()->sL('LLL:EXT:reports/Resources/Private/Language/locallang_reports.xlf:status_MysqlDatabaseCharacterSet_Info');
$severity = ContextualFeedbackSeverity::INFO;
- $statusValue = $this->getLanguageService()->getLL('status_info');
+ $statusValue = $this->getLanguageService()->sL('LLL:EXT:reports/Resources/Private/Language/locallang_reports.xlf:status_info');
}
} elseif (isset($GLOBALS['TYPO3_CONF_VARS']['DB']['Connections'][ConnectionPool::DEFAULT_CONNECTION_NAME]['tableoptions'])) {
- $message = $this->getLanguageService()->getLL('status_MysqlDatabaseCharacterSet_Ok');
+ $message = $this->getLanguageService()->sL('LLL:EXT:reports/Resources/Private/Language/locallang_reports.xlf:status_MysqlDatabaseCharacterSet_Ok');
$tableOptions = $GLOBALS['TYPO3_CONF_VARS']['DB']['Connections'][ConnectionPool::DEFAULT_CONNECTION_NAME]['tableoptions'];
if (isset($tableOptions['collate'])) {
@@ -306,9 +306,9 @@ class ConfigurationStatus implements StatusProviderInterface
->executeQuery();
if ($wrongCollationTablesFound->rowCount() > 0) {
- $message = sprintf($this->getLanguageService()->getLL('status_MysqlDatabaseCharacterSet_MixedCollations'), $charset);
+ $message = sprintf($this->getLanguageService()->sL('LLL:EXT:reports/Resources/Private/Language/locallang_reports.xlf:status_MysqlDatabaseCharacterSet_MixedCollations'), $charset);
$severity = ContextualFeedbackSeverity::ERROR;
- $statusValue = $this->getLanguageService()->getLL('status_checkFailed');
+ $statusValue = $this->getLanguageService()->sL('LLL:EXT:reports/Resources/Private/Language/locallang_reports.xlf:status_checkFailed');
} else {
if (isset($tableOptions['collate'])) {
$collationConstraint = $queryBuilder->expr()->neq('collation_name', $queryBuilder->quote($tableOptions['collate']));
@@ -329,19 +329,19 @@ class ConfigurationStatus implements StatusProviderInterface
->executeQuery();
if ($wrongCollationColumnsFound->rowCount() > 0) {
- $message = sprintf($this->getLanguageService()->getLL('status_MysqlDatabaseCharacterSet_MixedCollations'), $charset);
+ $message = sprintf($this->getLanguageService()->sL('LLL:EXT:reports/Resources/Private/Language/locallang_reports.xlf:status_MysqlDatabaseCharacterSet_MixedCollations'), $charset);
$severity = ContextualFeedbackSeverity::ERROR;
- $statusValue = $this->getLanguageService()->getLL('status_checkFailed');
+ $statusValue = $this->getLanguageService()->sL('LLL:EXT:reports/Resources/Private/Language/locallang_reports.xlf:status_checkFailed');
}
}
}
} else {
- $message = $this->getLanguageService()->getLL('status_MysqlDatabaseCharacterSet_Ok');
+ $message = $this->getLanguageService()->sL('LLL:EXT:reports/Resources/Private/Language/locallang_reports.xlf:status_MysqlDatabaseCharacterSet_Ok');
}
return GeneralUtility::makeInstance(
ReportStatus::class,
- $this->getLanguageService()->getLL('status_MysqlDatabaseCharacterSet'),
+ $this->getLanguageService()->sL('LLL:EXT:reports/Resources/Private/Language/locallang_reports.xlf:status_MysqlDatabaseCharacterSet'),
$statusValue,
$message,
$severity
diff --git a/typo3/sysext/reports/Classes/Report/Status/FalStatus.php b/typo3/sysext/reports/Classes/Report/Status/FalStatus.php
index 96183909cfce..0ac782eff810 100644
--- a/typo3/sysext/reports/Classes/Report/Status/FalStatus.php
+++ b/typo3/sysext/reports/Classes/Report/Status/FalStatus.php
@@ -55,7 +55,7 @@ class FalStatus implements StatusProviderInterface
*/
protected function getMissingFilesStatus()
{
- $value = $this->getLanguageService()->getLL('status_none');
+ $value = $this->getLanguageService()->sL('LLL:EXT:reports/Resources/Private/Language/locallang_reports.xlf:status_none');
$count = 0;
$maxFilesToShow = 100;
$message = '';
@@ -92,7 +92,7 @@ class FalStatus implements StatusProviderInterface
}
if ($count) {
- $value = sprintf($this->getLanguageService()->getLL('status_missingFilesCount'), $count);
+ $value = sprintf($this->getLanguageService()->sL('LLL:EXT:reports/Resources/Private/Language/locallang_reports.xlf:status_missingFilesCount'), $count);
$severity = ContextualFeedbackSeverity::WARNING;
$queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)->getQueryBuilderForTable('sys_file');
@@ -113,7 +113,7 @@ class FalStatus implements StatusProviderInterface
->executeQuery()
->fetchAllAssociative();
- $message = '<p>' . $this->getLanguageService()->getLL('status_missingFilesMessage') . '</p>';
+ $message = '<p>' . $this->getLanguageService()->sL('LLL:EXT:reports/Resources/Private/Language/locallang_reports.xlf:status_missingFilesMessage') . '</p>';
foreach ($files as $file) {
$message .= $storages[$file['storage']]->getName() . ' ' . $file['identifier'] . '<br />';
}
@@ -123,7 +123,7 @@ class FalStatus implements StatusProviderInterface
}
}
- return GeneralUtility::makeInstance(ReportStatus::class, $this->getLanguageService()->getLL('status_missingFiles'), $value, $message, $severity);
+ return GeneralUtility::makeInstance(ReportStatus::class, $this->getLanguageService()->sL('LLL:EXT:reports/Resources/Private/Language/locallang_reports.xlf:status_missingFiles'), $value, $message, $severity);
}
protected function getLanguageService(): LanguageService
diff --git a/typo3/sysext/reports/Classes/Report/Status/SecurityStatus.php b/typo3/sysext/reports/Classes/Report/Status/SecurityStatus.php
index fb6302437564..6d5fcff720e7 100644
--- a/typo3/sysext/reports/Classes/Report/Status/SecurityStatus.php
+++ b/typo3/sysext/reports/Classes/Report/Status/SecurityStatus.php
@@ -81,19 +81,19 @@ class SecurityStatus implements RequestAwareStatusProviderInterface
*/
protected function getEncryptedConnectionStatus(ServerRequestInterface $request): ReportStatus
{
- $value = $this->getLanguageService()->getLL('status_ok');
+ $value = $this->getLanguageService()->sL('LLL:EXT:reports/Resources/Private/Language/locallang_reports.xlf:status_ok');
$message = '';
$severity = ContextualFeedbackSeverity::OK;
$normalizedParams = $request->getAttribute('normalizedParams');
if (!$normalizedParams->isHttps()) {
- $value = $this->getLanguageService()->getLL('status_insecure');
+ $value = $this->getLanguageService()->sL('LLL:EXT:reports/Resources/Private/Language/locallang_reports.xlf:status_insecure');
$severity = ContextualFeedbackSeverity::WARNING;
$message = $this->getLanguageService()->sL('LLL:EXT:reports/Resources/Private/Language/locallang_reports.xlf:status_encryptedConnectionStatus_insecure');
}
- return GeneralUtility::makeInstance(ReportStatus::class, $this->getLanguageService()->getLL('status_encryptedConnectionStatus'), $value, $message, $severity);
+ return GeneralUtility::makeInstance(ReportStatus::class, $this->getLanguageService()->sL('LLL:EXT:reports/Resources/Private/Language/locallang_reports.xlf:status_encryptedConnectionStatus'), $value, $message, $severity);
}
/**
@@ -104,17 +104,17 @@ class SecurityStatus implements RequestAwareStatusProviderInterface
$normalizedParams = $request->getAttribute('normalizedParams');
if ($normalizedParams->isHttps()) {
- $value = $this->getLanguageService()->getLL('status_ok');
+ $value = $this->getLanguageService()->sL('LLL:EXT:reports/Resources/Private/Language/locallang_reports.xlf:status_ok');
$message = '';
$severity = ContextualFeedbackSeverity::OK;
if (!$GLOBALS['TYPO3_CONF_VARS']['BE']['lockSSL']) {
- $value = $this->getLanguageService()->getLL('status_insecure');
- $message = $this->getLanguageService()->getLL('status_lockSslStatus_insecure');
+ $value = $this->getLanguageService()->sL('LLL:EXT:reports/Resources/Private/Language/locallang_reports.xlf:status_insecure');
+ $message = $this->getLanguageService()->sL('LLL:EXT:reports/Resources/Private/Language/locallang_reports.xlf:status_lockSslStatus_insecure');
$severity = ContextualFeedbackSeverity::WARNING;
}
- return GeneralUtility::makeInstance(ReportStatus::class, $this->getLanguageService()->getLL('status_lockSslStatus'), $value, $message, $severity);
+ return GeneralUtility::makeInstance(ReportStatus::class, $this->getLanguageService()->sL('LLL:EXT:reports/Resources/Private/Language/locallang_reports.xlf:status_lockSslStatus'), $value, $message, $severity);
}
return null;
@@ -127,17 +127,17 @@ class SecurityStatus implements RequestAwareStatusProviderInterface
*/
protected function getTrustedHostsPatternStatus(): ReportStatus
{
- $value = $this->getLanguageService()->getLL('status_ok');
+ $value = $this->getLanguageService()->sL('LLL:EXT:reports/Resources/Private/Language/locallang_reports.xlf:status_ok');
$message = '';
$severity = ContextualFeedbackSeverity::OK;
if ($GLOBALS['TYPO3_CONF_VARS']['SYS']['trustedHostsPattern'] === VerifyHostHeader::ENV_TRUSTED_HOSTS_PATTERN_ALLOW_ALL) {
- $value = $this->getLanguageService()->getLL('status_insecure');
+ $value = $this->getLanguageService()->sL('LLL:EXT:reports/Resources/Private/Language/locallang_reports.xlf:status_insecure');
$severity = ContextualFeedbackSeverity::ERROR;
$message = $this->getLanguageService()->sL('LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:warning.install_trustedhosts');
}
- return GeneralUtility::makeInstance(ReportStatus::class, $this->getLanguageService()->getLL('status_trustedHostsPattern'), $value, $message, $severity);
+ return GeneralUtility::makeInstance(ReportStatus::class, $this->getLanguageService()->sL('LLL:EXT:reports/Resources/Private/Language/locallang_reports.xlf:status_trustedHostsPattern'), $value, $message, $severity);
}
/**
@@ -147,7 +147,7 @@ class SecurityStatus implements RequestAwareStatusProviderInterface
*/
protected function getAdminAccountStatus(): ReportStatus
{
- $value = $this->getLanguageService()->getLL('status_ok');
+ $value = $this->getLanguageService()->sL('LLL:EXT:reports/Resources/Private/Language/locallang_reports.xlf:status_ok');
$message = '';
$severity = ContextualFeedbackSeverity::OK;
@@ -175,7 +175,7 @@ class SecurityStatus implements RequestAwareStatusProviderInterface
// If the password for 'admin' user is 'password': bad idea!
// We're checking since the (very) old installer created instances like this in dark old times.
$uriBuilder = GeneralUtility::makeInstance(UriBuilder::class);
- $value = $this->getLanguageService()->getLL('status_insecure');
+ $value = $this->getLanguageService()->sL('LLL:EXT:reports/Resources/Private/Language/locallang_reports.xlf:status_insecure');
$severity = ContextualFeedbackSeverity::ERROR;
$editUserAccountUrl = (string)$uriBuilder->buildUriFromRoute(
'record_edit',
@@ -195,7 +195,7 @@ class SecurityStatus implements RequestAwareStatusProviderInterface
}
}
- return GeneralUtility::makeInstance(ReportStatus::class, $this->getLanguageService()->getLL('status_adminUserAccount'), $value, $message, $severity);
+ return GeneralUtility::makeInstance(ReportStatus::class, $this->getLanguageService()->sL('LLL:EXT:reports/Resources/Private/Language/locallang_reports.xlf:status_adminUserAccount'), $value, $message, $severity);
}
/**
@@ -205,13 +205,13 @@ class SecurityStatus implements RequestAwareStatusProviderInterface
*/
protected function getFileDenyPatternStatus(): ReportStatus
{
- $value = $this->getLanguageService()->getLL('status_ok');
+ $value = $this->getLanguageService()->sL('LLL:EXT:reports/Resources/Private/Language/locallang_reports.xlf:status_ok');
$message = '';
$severity = ContextualFeedbackSeverity::OK;
$fileAccessCheck = GeneralUtility::makeInstance(FileNameValidator::class);
if ($fileAccessCheck->missingImportantPatterns()) {
- $value = $this->getLanguageService()->getLL('status_insecure');
+ $value = $this->getLanguageService()->sL('LLL:EXT:reports/Resources/Private/Language/locallang_reports.xlf:status_insecure');
$severity = ContextualFeedbackSeverity::ERROR;
$message = sprintf(
$this->getLanguageService()->sL('LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:warning.file_deny_pattern_partsNotPresent'),
@@ -219,7 +219,7 @@ class SecurityStatus implements RequestAwareStatusProviderInterface
);
}
- return GeneralUtility::makeInstance(ReportStatus::class, $this->getLanguageService()->getLL('status_fileDenyPattern'), $value, $message, $severity);
+ return GeneralUtility::makeInstance(ReportStatus::class, $this->getLanguageService()->sL('LLL:EXT:reports/Resources/Private/Language/locallang_reports.xlf:status_fileDenyPattern'), $value, $message, $severity);
}
/**
@@ -230,43 +230,43 @@ class SecurityStatus implements RequestAwareStatusProviderInterface
*/
protected function getHtaccessUploadStatus(): ReportStatus
{
- $value = $this->getLanguageService()->getLL('status_ok');
+ $value = $this->getLanguageService()->sL('LLL:EXT:reports/Resources/Private/Language/locallang_reports.xlf:status_ok');
$message = '';
$severity = ContextualFeedbackSeverity::OK;
$fileNameAccess = GeneralUtility::makeInstance(FileNameValidator::class);
if ($fileNameAccess->customFileDenyPatternConfigured()
&& $fileNameAccess->isValid('.htaccess')) {
- $value = $this->getLanguageService()->getLL('status_insecure');
+ $value = $this->getLanguageService()->sL('LLL:EXT:reports/Resources/Private/Language/locallang_reports.xlf:status_insecure');
$severity = ContextualFeedbackSeverity::ERROR;
$message = $this->getLanguageService()->sL('LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:warning.file_deny_htaccess');
}
- return GeneralUtility::makeInstance(ReportStatus::class, $this->getLanguageService()->getLL('status_htaccessUploadProtection'), $value, $message, $severity);
+ return GeneralUtility::makeInstance(ReportStatus::class, $this->getLanguageService()->sL('LLL:EXT:reports/Resources/Private/Language/locallang_reports.xlf:status_htaccessUploadProtection'), $value, $message, $severity);
}
protected function getExceptionHandlerStatus(): ReportStatus
{
- $value = $this->getLanguageService()->getLL('status_ok');
+ $value = $this->getLanguageService()->sL('LLL:EXT:reports/Resources/Private/Language/locallang_reports.xlf:status_ok');
$message = '';
$severity = ContextualFeedbackSeverity::OK;
if (
str_contains($GLOBALS['TYPO3_CONF_VARS']['SYS']['productionExceptionHandler'], 'Debug') ||
(Environment::getContext()->isProduction() && (int)$GLOBALS['TYPO3_CONF_VARS']['SYS']['displayErrors'] === 1)
) {
- $value = $this->getLanguageService()->getLL('status_insecure');
+ $value = $this->getLanguageService()->sL('LLL:EXT:reports/Resources/Private/Language/locallang_reports.xlf:status_insecure');
$severity = ContextualFeedbackSeverity::ERROR;
- $message = $this->getLanguageService()->getLL('status_exceptionHandler_errorMessage');
+ $message = $this->getLanguageService()->sL('LLL:EXT:reports/Resources/Private/Language/locallang_reports.xlf:status_exceptionHandler_errorMessage');
} elseif ((int)$GLOBALS['TYPO3_CONF_VARS']['SYS']['displayErrors'] === 1) {
$severity = ContextualFeedbackSeverity::WARNING;
- $message = $this->getLanguageService()->getLL('status_exceptionHandler_warningMessage');
+ $message = $this->getLanguageService()->sL('LLL:EXT:reports/Resources/Private/Language/locallang_reports.xlf:status_exceptionHandler_warningMessage');
}
- return GeneralUtility::makeInstance(ReportStatus::class, $this->getLanguageService()->getLL('status_exceptionHandler'), $value, $message, $severity);
+ return GeneralUtility::makeInstance(ReportStatus::class, $this->getLanguageService()->sL('LLL:EXT:reports/Resources/Private/Language/locallang_reports.xlf:status_exceptionHandler'), $value, $message, $severity);
}
protected function getExportedFilesStatus(): ReportStatus
{
- $value = $this->getLanguageService()->getLL('status_ok');
+ $value = $this->getLanguageService()->sL('LLL:EXT:reports/Resources/Private/Language/locallang_reports.xlf:status_ok');
$message = '';
$severity = ContextualFeedbackSeverity::OK;
@@ -299,14 +299,14 @@ class SecurityStatus implements RequestAwareStatusProviderInterface
$files[] = '<li>' . htmlspecialchars($exportedFile['storage'] . ':' . $exportedFile['identifier']) . '</li>';
}
- $value = $this->getLanguageService()->getLL('status_insecure');
+ $value = $this->getLanguageService()->sL('LLL:EXT:reports/Resources/Private/Language/locallang_reports.xlf:status_insecure');
$severity = ContextualFeedbackSeverity::WARNING;
- $message = $this->getLanguageService()->getLL('status_exportedFiles_warningMessage');
+ $message = $this->getLanguageService()->sL('LLL:EXT:reports/Resources/Private/Language/locallang_reports.xlf:status_exportedFiles_warningMessage');
$message .= '<ul>' . implode(PHP_EOL, $files) . '</ul>';
- $message .= $this->getLanguageService()->getLL('status_exportedFiles_warningRecommendation');
+ $message .= $this->getLanguageService()->sL('LLL:EXT:reports/Resources/Private/Language/locallang_reports.xlf:status_exportedFiles_warningRecommendation');
}
- return GeneralUtility::makeInstance(ReportStatus::class, $this->getLanguageService()->getLL('status_exportedFiles'), $value, $message, $severity);
+ return GeneralUtility::makeInstance(ReportStatus::class, $this->getLanguageService()->sL('LLL:EXT:reports/Resources/Private/Language/locallang_reports.xlf:status_exportedFiles'), $value, $message, $severity);
}
protected function getLanguageService(): LanguageService
diff --git a/typo3/sysext/reports/Classes/Report/Status/Status.php b/typo3/sysext/reports/Classes/Report/Status/Status.php
index faf4260a7901..f67ca13d6f4f 100644
--- a/typo3/sysext/reports/Classes/Report/Status/Status.php
+++ b/typo3/sysext/reports/Classes/Report/Status/Status.php
@@ -39,6 +39,7 @@ class Status implements RequestAwareReportInterface
protected readonly BackendViewFactory $backendViewFactory,
protected readonly StatusRegistry $statusRegistry
) {
+ // This needs to be kept during v12 as backwards-compatibility for people still using getLL() in their status reports
$this->getLanguageService()->includeLLFile('EXT:reports/Resources/Private/Language/locallang_reports.xlf');
}
@@ -182,10 +183,10 @@ class Status implements RequestAwareReportInterface
// that must appear on top of the status report
// Change their keys to localized collection titles
$primaryStatuses = [
- $this->getLanguageService()->getLL('status_typo3') => $statusCollection['typo3'],
- $this->getLanguageService()->getLL('status_system') => $statusCollection['system'],
- $this->getLanguageService()->getLL('status_security') => $statusCollection['security'],
- $this->getLanguageService()->getLL('status_configuration') => $statusCollection['configuration'],
+ $this->getLanguageService()->sL('LLL:EXT:reports/Resources/Private/Language/locallang_reports.xlf:status_typo3') => $statusCollection['typo3'],
+ $this->getLanguageService()->sL('LLL:EXT:reports/Resources/Private/Language/locallang_reports.xlf:status_system') => $statusCollection['system'],
+ $this->getLanguageService()->sL('LLL:EXT:reports/Resources/Private/Language/locallang_reports.xlf:status_security') => $statusCollection['security'],
+ $this->getLanguageService()->sL('LLL:EXT:reports/Resources/Private/Language/locallang_reports.xlf:status_configuration') => $statusCollection['configuration'],
];
unset($statusCollection['typo3'], $statusCollection['system'], $statusCollection['security'], $statusCollection['configuration']);
// Assemble list of secondary status collections with left-over collections
@@ -197,7 +198,8 @@ class Status implements RequestAwareReportInterface
$label = $this->getLanguageService()->sL($statusProviderId);
} else {
// Generic label
- $label = $this->getLanguageService()->getLL('status_' . $statusProviderId);
+ // @todo phase this out
+ $label = $this->getLanguageService()->sL('LLL:EXT:reports/Resources/Private/Language/locallang_reports.xlf:status_' . $statusProviderId);
}
$providerLabel = empty($label) ? $statusProviderId : $label;
$secondaryStatuses[$providerLabel] = $collection;
diff --git a/typo3/sysext/reports/Classes/Report/Status/SystemStatus.php b/typo3/sysext/reports/Classes/Report/Status/SystemStatus.php
index e0564d096e80..1a86e6bcdc8e 100644
--- a/typo3/sysext/reports/Classes/Report/Status/SystemStatus.php
+++ b/typo3/sysext/reports/Classes/Report/Status/SystemStatus.php
@@ -69,23 +69,23 @@ class SystemStatus implements StatusProviderInterface
}
}
if ($detectedSubmodules === false) {
- $missingPhpModules[] = sprintf($this->getLanguageService()->getLL('status_phpModulesGroup'), '(' . implode(', ', $module) . ')');
+ $missingPhpModules[] = sprintf($this->getLanguageService()->sL('LLL:EXT:reports/Resources/Private/Language/locallang_reports.xlf:status_phpModulesGroup'), '(' . implode(', ', $module) . ')');
}
} elseif (!extension_loaded($module)) {
$missingPhpModules[] = $module;
}
}
if (!empty($missingPhpModules)) {
- $value = $this->getLanguageService()->getLL('status_phpModulesMissing');
- $message = sprintf($this->getLanguageService()->getLL('status_phpModulesList'), implode(', ', $missingPhpModules));
- $message .= ' ' . $this->getLanguageService()->getLL('status_phpModulesInfo');
+ $value = $this->getLanguageService()->sL('LLL:EXT:reports/Resources/Private/Language/locallang_reports.xlf:status_phpModulesMissing');
+ $message = sprintf($this->getLanguageService()->sL('LLL:EXT:reports/Resources/Private/Language/locallang_reports.xlf:status_phpModulesList'), implode(', ', $missingPhpModules));
+ $message .= ' ' . $this->getLanguageService()->sL('LLL:EXT:reports/Resources/Private/Language/locallang_reports.xlf:status_phpModulesInfo');
$severity = ContextualFeedbackSeverity::ERROR;
} else {
- $value = $this->getLanguageService()->getLL('status_phpModulesPresent');
+ $value = $this->getLanguageService()->sL('LLL:EXT:reports/Resources/Private/Language/locallang_reports.xlf:status_phpModulesPresent');
$message = '';
$severity = ContextualFeedbackSeverity::OK;
}
- return GeneralUtility::makeInstance(ReportStatus::class, $this->getLanguageService()->getLL('status_phpModules'), $value, $message, $severity);
+ return GeneralUtility::makeInstance(ReportStatus::class, $this->getLanguageService()->sL('LLL:EXT:reports/Resources/Private/Language/locallang_reports.xlf:status_phpModules'), $value, $message, $severity);
}
protected function getLanguageService(): LanguageService
diff --git a/typo3/sysext/reports/Classes/Report/Status/Typo3Status.php b/typo3/sysext/reports/Classes/Report/Status/Typo3Status.php
index 02eb61b35aaf..6c7ff4ade3c5 100644
--- a/typo3/sysext/reports/Classes/Report/Status/Typo3Status.php
+++ b/typo3/sysext/reports/Classes/Report/Status/Typo3Status.php
@@ -53,7 +53,7 @@ class Typo3Status implements StatusProviderInterface
protected function getRegisteredXclassStatus()
{
$message = '';
- $value = $this->getLanguageService()->getLL('status_none');
+ $value = $this->getLanguageService()->sL('LLL:EXT:reports/Resources/Private/Language/locallang_reports.xlf:status_none');
$severity = ContextualFeedbackSeverity::OK;
$xclassFoundArray = [];
@@ -65,12 +65,12 @@ class Typo3Status implements StatusProviderInterface
}
}
if (!empty($xclassFoundArray)) {
- $value = $this->getLanguageService()->getLL('status_xclassUsageFound');
- $message = $this->getLanguageService()->getLL('status_xclassUsageFound_message') . '<br />';
+ $value = $this->getLanguageService()->sL('LLL:EXT:reports/Resources/Private/Language/locallang_reports.xlf:status_xclassUsageFound');
+ $message = $this->getLanguageService()->sL('LLL:EXT:reports/Resources/Private/Language/locallang_reports.xlf:status_xclassUsageFound_message') . '<br />';
$message .= '<ol>';
foreach ($xclassFoundArray as $originalClass => $xClassName) {
$messageDetail = sprintf(
- (string)($this->getLanguageService()->getLL('status_xclassUsageFound_message_detail')),
+ (string)($this->getLanguageService()->sL('LLL:EXT:reports/Resources/Private/Language/locallang_reports.xlf:status_xclassUsageFound_message_detail')),
'<code>' . htmlspecialchars((string)$originalClass) . '</code>',
'<code>' . htmlspecialchars((string)$xClassName) . '</code>'
);
@@ -82,7 +82,7 @@ class Typo3Status implements StatusProviderInterface
return GeneralUtility::makeInstance(
ReportStatus::class,
- $this->getLanguageService()->getLL('status_xclassUsage'),
+ $this->getLanguageService()->sL('LLL:EXT:reports/Resources/Private/Language/locallang_reports.xlf:status_xclassUsage'),
$value,
$message,
$severity
diff --git a/typo3/sysext/reports/Classes/Task/SystemStatusUpdateTask.php b/typo3/sysext/reports/Classes/Task/SystemStatusUpdateTask.php
index dac890d893a0..b4ffda55a096 100644
--- a/typo3/sysext/reports/Classes/Task/SystemStatusUpdateTask.php
+++ b/typo3/sysext/reports/Classes/Task/SystemStatusUpdateTask.php
@@ -107,12 +107,12 @@ class SystemStatusUpdateTask extends AbstractTask
foreach ($notificationEmails as $notificationEmail) {
$sendEmailsTo[] = new Address($notificationEmail);
}
- $subject = sprintf($this->getLanguageService()->getLL('status_updateTask_email_subject'), $GLOBALS['TYPO3_CONF_VARS']['SYS']['sitename']);
- $message = sprintf($this->getLanguageService()->getLL($this->getNotificationAll() ? 'status_allNotification' : 'status_problemNotification'), '', '');
+ $subject = sprintf($this->getLanguageService()->sL('LLL:EXT:reports/Resources/Private/Language/locallang_reports.xlf:status_updateTask_email_subject'), $GLOBALS['TYPO3_CONF_VARS']['SYS']['sitename']);
+ $message = sprintf($this->getLanguageService()->sL('LLL:EXT:reports/Resources/Private/Language/locallang_reports.xlf:' . ($this->getNotificationAll() ? 'status_allNotification' : 'status_problemNotification')), '', '');
$message .= CRLF . CRLF;
- $message .= $this->getLanguageService()->getLL('status_updateTask_email_site') . ': ' . $GLOBALS['TYPO3_CONF_VARS']['SYS']['sitename'];
+ $message .= $this->getLanguageService()->sL('LLL:EXT:reports/Resources/Private/Language/locallang_reports.xlf:status_updateTask_email_site') . ': ' . $GLOBALS['TYPO3_CONF_VARS']['SYS']['sitename'];
$message .= CRLF . CRLF;
- $message .= $this->getLanguageService()->getLL('status_updateTask_email_issues') . ': ' . CRLF;
+ $message .= $this->getLanguageService()->sL('LLL:EXT:reports/Resources/Private/Language/locallang_reports.xlf:status_updateTask_email_issues') . ': ' . CRLF;
$message .= implode(CRLF, $systemIssues);
$message .= CRLF . CRLF;
diff --git a/typo3/sysext/setup/Classes/Controller/SetupModuleController.php b/typo3/sysext/setup/Classes/Controller/SetupModuleController.php
index e14bde8f458a..94a89eec76b4 100644
--- a/typo3/sysext/setup/Classes/Controller/SetupModuleController.php
+++ b/typo3/sysext/setup/Classes/Controller/SetupModuleController.php
@@ -143,8 +143,7 @@ class SetupModuleController
$this->pageRenderer->addInlineLanguageLabelArray([
'FormEngine.remainingCharacters' => $languageService->sL('LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:labels.remainingCharacters'),
]);
- $languageService->includeLLFile('EXT:setup/Resources/Private/Language/locallang.xlf');
- $view->setTitle($languageService->getLL('UserSettings'));
+ $view->setTitle($languageService->sL('LLL:EXT:setup/Resources/Private/Language/locallang.xlf:UserSettings'));
// Getting the 'override' values as set might be set in user TSconfig
$this->overrideConf = $backendUser->getTSConfig()['setup.']['override.'] ?? [];
// Getting the disabled fields might be set in user TSconfig (eg setup.fields.password.disabled=1)
@@ -542,14 +541,14 @@ class SetupModuleController
$html .= '<div class="btn-group">';
if ($avatarFileUid) {
$html .=
- '<button type="button" id="clear_button_' . htmlspecialchars($fieldName) . '" aria-label="' . htmlspecialchars($this->getLanguageService()->getLL('avatar.clear')) . '" '
+ '<button type="button" id="clear_button_' . htmlspecialchars($fieldName) . '" aria-label="' . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:setup/Resources/Private/Language/locallang.xlf:avatar.clear')) . '" '
. ' class="btn btn-default">'
. $this->iconFactory->getIcon('actions-delete', Icon::SIZE_SMALL)
. '</button>';
}
$html .=
'<button type="button" id="add_button_' . htmlspecialchars($fieldName) . '" class="btn btn-default btn-add-avatar"'
- . ' aria-label="' . htmlspecialchars($this->getLanguageService()->getLL('avatar.openFileBrowser')) . '"'
+ . ' aria-label="' . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:setup/Resources/Private/Language/locallang.xlf:avatar.openFileBrowser')) . '"'
. ' data-setup-avatar-url="' . htmlspecialchars((string)$this->uriBuilder->buildUriFromRoute('wizard_element_browser', ['mode' => 'file', 'bparams' => '||||-0-be_users-avatar-avatar'])) . '"'
. '>' . $this->iconFactory->getIcon('actions-insert-record', Icon::SIZE_SMALL)
. '</button></div>';
@@ -561,19 +560,19 @@ class SetupModuleController
$hasActiveProviders = $this->mfaProviderRegistry->hasActiveProviders($backendUser);
if ($hasActiveProviders) {
if ($this->mfaProviderRegistry->hasLockedProviders($backendUser)) {
- $html .= ' <span class="badge badge-danger">' . htmlspecialchars($lang->getLL('mfaProviders.lockedMfaProviders')) . '</span>';
+ $html .= ' <span class="badge badge-danger">' . htmlspecialchars($lang->sL('LLL:EXT:setup/Resources/Private/Language/locallang.xlf:mfaProviders.lockedMfaProviders')) . '</span>';
} else {
- $html .= ' <span class="badge badge-success">' . htmlspecialchars($lang->getLL('mfaProviders.enabled')) . '</span>';
+ $html .= ' <span class="badge badge-success">' . htmlspecialchars($lang->sL('LLL:EXT:setup/Resources/Private/Language/locallang.xlf:mfaProviders.enabled')) . '</span>';
}
}
- $html .= '<p class="text-body-secondary">' . nl2br(htmlspecialchars($lang->getLL('mfaProviders.description'))) . '</p>';
+ $html .= '<p class="text-body-secondary">' . nl2br(htmlspecialchars($lang->sL('LLL:EXT:setup/Resources/Private/Language/locallang.xlf:mfaProviders.description'))) . '</p>';
if (!$this->mfaProviderRegistry->hasProviders()) {
- $html .= '<span class="badge badge-danger">' . htmlspecialchars($lang->getLL('mfaProviders.notAvailable')) . '</span>';
+ $html .= '<span class="badge badge-danger">' . htmlspecialchars($lang->sL('LLL:EXT:setup/Resources/Private/Language/locallang.xlf:mfaProviders.notAvailable')) . '</span>';
break;
}
$html .= '<a href="' . htmlspecialchars((string)$this->uriBuilder->buildUriFromRoute('mfa')) . '" class="btn btn-' . ($hasActiveProviders ? 'default' : 'success') . '">';
$html .= $this->iconFactory->getIcon($hasActiveProviders ? 'actions-cog' : 'actions-plus', Icon::SIZE_SMALL);
- $html .= ' <span>' . htmlspecialchars($lang->getLL('mfaProviders.' . ($hasActiveProviders ? 'manageLinkTitle' : 'setupLinkTitle'))) . '</span>';
+ $html .= ' <span>' . htmlspecialchars($lang->sL('LLL:EXT:setup/Resources/Private/Language/locallang.xlf:mfaProviders.' . ($hasActiveProviders ? 'manageLinkTitle' : 'setupLinkTitle'))) . '</span>';
$html .= '</a>';
break;
default:
@@ -627,7 +626,7 @@ class SetupModuleController
}
$content = '<select id="field_lang" name="data[be_users][lang]" class="form-select">' . $content . '</select>';
if ($currentSelectedLanguage !== 'default' && !@is_dir(Environment::getLabelsPath() . '/' . $currentSelectedLanguage)) {
- $languageUnavailableWarning = htmlspecialchars(sprintf($languageService->getLL('languageUnavailable'), $languageService->getLL('lang_' . $currentSelectedLanguage))) . ' <br /> ' . htmlspecialchars($languageService->getLL('languageUnavailable.' . ($backendUser->isAdmin() ? 'admin' : 'user')));
+ $languageUnavailableWarning = htmlspecialchars(sprintf($languageService->sL('LLL:EXT:setup/Resources/Private/Language/locallang.xlf:languageUnavailable'), $languageService->sL($officialLanguages->getLabelIdentifier($currentSelectedLanguage)))) . ' <br /> ' . htmlspecialchars($languageService->sL('LLL:EXT:setup/Resources/Private/Language/locallang.xlf:languageUnavailable.' . ($backendUser->isAdmin() ? 'admin' : 'user')));
$content = '<br /><span class="badge badge-danger">' . $languageUnavailableWarning . '</span><br /><br />' . $content;
}
return $content;
@@ -642,7 +641,7 @@ class SetupModuleController
public function renderStartModuleSelect(): string
{
// Load available backend modules
- $startModuleSelect = '<option value="">' . htmlspecialchars($this->getLanguageService()->getLL('startModule.firstInMenu')) . '</option>';
+ $startModuleSelect = '<option value="">' . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:setup/Resources/Private/Language/locallang.xlf:startModule.firstInMenu')) . '</option>';
foreach ($this->moduleProvider->getModules($this->getBackendUser(), false) as $identifier => $module) {
if ($module->hasSubModules() || $module->isStandalone()) {
$modules = '';
@@ -689,7 +688,7 @@ class SetupModuleController
}
/**
- * Returns the label $str from getLL() and grays out the value if the $str/$key is found in $this->overrideConf array
+ * Returns the label $str from sL() and grays out the value if the $str/$key is found in $this->overrideConf array
*
* @param string $str Locallang key
* @param string $key Alternative override-config key
@@ -866,27 +865,27 @@ class SetupModuleController
{
$languageService = $this->getLanguageService();
if ($this->setupIsUpdated && !$this->settingsAreResetToDefault) {
- $view->addFlashMessage($languageService->getLL('setupWasUpdated'), $languageService->getLL('UserSettings'));
+ $view->addFlashMessage($languageService->sL('LLL:EXT:setup/Resources/Private/Language/locallang.xlf:setupWasUpdated'), $languageService->sL('LLL:EXT:setup/Resources/Private/Language/locallang.xlf:UserSettings'));
}
if ($this->settingsAreResetToDefault) {
- $view->addFlashMessage($languageService->getLL('settingsAreReset'), $languageService->getLL('resetConfiguration'));
+ $view->addFlashMessage($languageService->sL('LLL:EXT:setup/Resources/Private/Language/locallang.xlf:settingsAreReset'), $languageService->sL('LLL:EXT:setup/Resources/Private/Language/locallang.xlf:resetConfiguration'));
}
if ($this->setupIsUpdated || $this->settingsAreResetToDefault) {
- $view->addFlashMessage($languageService->getLL('activateChanges'), '', ContextualFeedbackSeverity::INFO);
+ $view->addFlashMessage($languageService->sL('LLL:EXT:setup/Resources/Private/Language/locallang.xlf:activateChanges'), '', ContextualFeedbackSeverity::INFO);
}
if ($this->passwordIsSubmitted) {
switch ($this->passwordIsUpdated) {
case self::PASSWORD_OLD_WRONG:
- $view->addFlashMessage($languageService->getLL('oldPassword_failed'), $languageService->getLL('newPassword'), ContextualFeedbackSeverity::ERROR);
+ $view->addFlashMessage($languageService->sL('LLL:EXT:setup/Resources/Private/Language/locallang.xlf:oldPassword_failed'), $languageService->sL('LLL:EXT:setup/Resources/Private/Language/locallang.xlf:newPassword'), ContextualFeedbackSeverity::ERROR);
break;
case self::PASSWORD_NOT_THE_SAME:
- $view->addFlashMessage($languageService->getLL('newPassword_failed'), $languageService->getLL('newPassword'), ContextualFeedbackSeverity::ERROR);
+ $view->addFlashMessage($languageService->sL('LLL:EXT:setup/Resources/Private/Language/locallang.xlf:newPassword_failed'), $languageService->sL('LLL:EXT:setup/Resources/Private/Language/locallang.xlf:newPassword'), ContextualFeedbackSeverity::ERROR);
break;
case self::PASSWORD_UPDATED:
- $view->addFlashMessage($languageService->getLL('newPassword_ok'), $languageService->getLL('newPassword'));
+ $view->addFlashMessage($languageService->sL('LLL:EXT:setup/Resources/Private/Language/locallang.xlf:newPassword_ok'), $languageService->sL('LLL:EXT:setup/Resources/Private/Language/locallang.xlf:newPassword'));
break;
case self::PASSWORD_POLICY_FAILED:
- $view->addFlashMessage($languageService->getLL('passwordPolicyFailed'), $languageService->getLL('newPassword'), ContextualFeedbackSeverity::ERROR);
+ $view->addFlashMessage($languageService->sL('LLL:EXT:setup/Resources/Private/Language/locallang.xlf:passwordPolicyFailed'), $languageService->sL('LLL:EXT:setup/Resources/Private/Language/locallang.xlf:newPassword'), ContextualFeedbackSeverity::ERROR);
break;
}
}
--
GitLab