Skip to content

[BUGFIX] Use LanguageService instead of Extbase LocalizationUtility #145

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
twojtylak wants to merge 1 commit into
base: master
Choose a base branch
from
+17 −7
Open

[BUGFIX] Use LanguageService instead of Extbase LocalizationUtility #145

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 17 additions & 7 deletions Classes/Service/ImageResizer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@
use TYPO3\CMS\Core\Authentication\BackendUserAuthentication;
use TYPO3\CMS\Core\Core\Environment;
use TYPO3\CMS\Core\Information\Typo3Version;
use TYPO3\CMS\Core\Localization\LanguageService;
use TYPO3\CMS\Core\Resource\Exception\FolderDoesNotExistException;
use TYPO3\CMS\Core\Resource\File;
use TYPO3\CMS\Core\Resource\Index\Indexer;
use TYPO3\CMS\Core\Resource\ResourceStorage;
use TYPO3\CMS\Core\Type\ContextualFeedbackSeverity;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Core\Utility\PathUtility;
use TYPO3\CMS\Extbase\Utility\LocalizationUtility;

/**
* This is a utility class to resize pictures based on rules.
Expand Down Expand Up @@ -227,7 +227,7 @@ public function processFile(
if ($fileExtension === 'png' && !($ruleset['resize_png_with_alpha'] ?? false)) {
if (ImageUtility::isTransparentPng($fileName)) {
$message = sprintf(
LocalizationUtility::translate('message.imageTransparent', 'image_autoresize'),
$this->getTranslatedLabel('LLL:EXT:image_autoresize/Resources/Private/Language/locallang.xlf:message.imageTransparent'),
$targetFileName
);
$this->notify($callbackNotification, $message, \TYPO3\CMS\Core\Type\ContextualFeedbackSeverity::WARNING);
Expand All @@ -236,7 +236,7 @@ public function processFile(
}
if ($fileExtension === 'gif' && ImageUtility::isAnimatedGif($fileName)) {
$message = sprintf(
LocalizationUtility::translate('message.imageAnimated', 'image_autoresize'),
$this->getTranslatedLabel('LLL:EXT:image_autoresize/Resources/Private/Language/locallang.xlf:message.imageAnimated'),
$targetFileName
);
$this->notify($callbackNotification, $message, \TYPO3\CMS\Core\Type\ContextualFeedbackSeverity::WARNING);
Expand All @@ -251,7 +251,7 @@ public function processFile(

if (!is_writable($fileName)) {
$message = sprintf(
LocalizationUtility::translate('message.imageNotWritable', 'image_autoresize'),
$this->getTranslatedLabel('LLL:EXT:image_autoresize/Resources/Private/Language/locallang.xlf:message.imageNotWritable'),
$targetFileName
);
$this->notify($callbackNotification, $message, \TYPO3\CMS\Core\Type\ContextualFeedbackSeverity::ERROR);
Expand Down Expand Up @@ -350,7 +350,7 @@ public function processFile(
$tempFileInfo = $gifCreator->imageMagickConvert($fileName, $destExtension, '', '', $imParams, '', $options, true);
}
if ($tempFileInfo === null) {
$message = LocalizationUtility::translate('message.cannotResize', 'image_autoresize');
$message = $this->getTranslatedLabel('LLL:EXT:image_autoresize/Resources/Private/Language/locallang.xlf:message.cannotResize');
$this->notify($callbackNotification, $message, \TYPO3\CMS\Core\Type\ContextualFeedbackSeverity::ERROR);
} elseif (!$isRotated && filesize($tempFileInfo[3]) >= $originalFileSize - 10240 && $destExtension === $fileExtension) {
// Conversion leads to same or bigger file (rounded to 10KB to accommodate tiny variations in compression) => skip!
Expand Down Expand Up @@ -379,12 +379,12 @@ public function processFile(

if ($fileName === $destFileName) {
$message = sprintf(
LocalizationUtility::translate('message.imageResized', 'image_autoresize'),
$this->getTranslatedLabel('LLL:EXT:image_autoresize/Resources/Private/Language/locallang.xlf:message.imageResized'),
$targetFileName, $tempFileInfo[0], $tempFileInfo[1]
);
} else {
$message = sprintf(
LocalizationUtility::translate('message.imageResizedAndRenamed', 'image_autoresize'),
$this->getTranslatedLabel('LLL:EXT:image_autoresize/Resources/Private/Language/locallang.xlf:message.imageResizedAndRenamed'),
$targetFileName, $tempFileInfo[0], $tempFileInfo[1], PathUtility::basename($targetDestFileName)
);
}
Expand Down Expand Up @@ -686,4 +686,14 @@ protected function getIndexer(\TYPO3\CMS\Core\Resource\ResourceStorage $storage)
return GeneralUtility::makeInstance(Indexer::class, $storage);
}

private function getTranslatedLabel(string $key): string
{
$languageService = $GLOBALS['LANG'] ?? null;

if ($languageService instanceof LanguageService) {
return $languageService->sL($key);
}

return $key;
}
}