[BUGFIX] Do not resolve languageFilePath to absolutePath 24/59024/7
authorAchim Fritz <af@achimfritz.de>
Tue, 4 Dec 2018 11:06:54 +0000 (12:06 +0100)
committerGeorg Ringer <georg.ringer@gmail.com>
Sat, 8 Dec 2018 11:30:22 +0000 (12:30 +0100)
Resolving the path here breaks the localization Override
in the LocalizationFactory Class

Resolves: #86683
Releases: master
Change-Id: Ib7037bcfba0dd02cf46c1b31f98d7808e7974b3c
Reviewed-on: https://review.typo3.org/59024
Reviewed-by: Daniel Goerz <daniel.goerz@posteo.de>
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Helmut Hummel <typo3@helhum.io>
Tested-by: Helmut Hummel <typo3@helhum.io>
Reviewed-by: Georg Ringer <georg.ringer@gmail.com>
Tested-by: Georg Ringer <georg.ringer@gmail.com>
typo3/sysext/extbase/Classes/Utility/LocalizationUtility.php
typo3/sysext/extbase/Tests/Unit/Utility/LocalizationUtilityTest.php

index 238b453..3a7027e 100644 (file)
@@ -86,7 +86,6 @@ class LocalizationUtility
             }
             $languageFilePath = static::getLanguageFilePath($extensionName);
         }
-        $languageFilePath = GeneralUtility::getFileAbsFileName($languageFilePath);
         $languageKeys = static::getLanguageKeys();
         if ($languageKey === null) {
             $languageKey = $languageKeys['languageKey'];
index 3e17481..d5eb578 100644 (file)
@@ -16,7 +16,6 @@ namespace TYPO3\CMS\Extbase\Tests\Unit\Utility;
 
 use Prophecy\Argument;
 use TYPO3\CMS\Core\Authentication\BackendUserAuthentication;
-use TYPO3\CMS\Core\Core\Environment;
 use TYPO3\CMS\Core\Localization\LocalizationFactory;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface;
@@ -205,7 +204,7 @@ class LocalizationUtilityTest extends UnitTestCase
      */
     protected function getLanguageFilePath(string $extensionName): string
     {
-        return Environment::getFrameworkBasePath() . '/' . $extensionName . '/Resources/Private/Language/locallang.xlf';
+        return  'EXT:' . $extensionName . '/Resources/Private/Language/locallang.xlf';
     }
 
     /**