Merge branch 'feature/add-typo3v14-support'

Author: xperseguers

Classes/Backend/ToolbarItems/CrowdinToolbarItem.php

@@ -139,7 +139,19 @@ protected function createToggleSwitch(string $name, bool $enabled): string
 
         $GLOBALS['TYPO3_CONF_VARS']['BE']['debug'] = $backupDebug;
 
-        return $result['html'];
+        if ($this->typo3Version >= 13) {
+            // We need to get rid of a "form-wizards-item-element" class that is useless and
+            // breaks or hand-crafted layout by enforcing a 120px minimum width (backend.css)
+            // for the toggle usually part of a TCA form
+            $checkboxHtml = str_replace('<div class="form-wizards-item-element">', '<div>', $result['html']);
+        } else {
+            // We need to get rid of a "form-wizards-element" class that is useless and
+            // breaks or hand-crafted layout by enforcing a 120px minimum width (backend.css)
+            // for the toggle usually part of a TCA form
+            $checkboxHtml = str_replace('<div class="form-wizards-element">', '<div>', $result['html']);
+        }
+
+        return $checkboxHtml;
     }
 
     protected function getExtensionsCompatibleWithCrowdin(): array

Classes/ViewHelpers/Override/V14/TranslateViewHelper.php

@@ -157,24 +157,31 @@ private static function overrideLocale(Locale|string|null $locale, string $id, s
             self::$userConfiguration = GeneralUtility::makeInstance(UserConfiguration::class);
         }
 
+        if (str_contains($extensionName, '.')) {
+            [$extensionName,] = explode('.', $extensionName, 2);
+        }
+
         if (self::$userConfiguration->usedForCore) {
-            $isCoreExt = false;
-            foreach (LanguageServiceXclassed::CORE_EXTENSIONS as $extension) {
-                if (str_contains($id, 'EXT:' . $extension)) {
-                    $isCoreExt = true;
+            $isCoreExt = in_array($extensionName, LanguageServiceXclassed::CORE_EXTENSIONS, true);
+            if (!$isCoreExt) {
+                foreach (LanguageServiceXclassed::CORE_EXTENSIONS as $extension) {
+                    if (str_contains($id, 'EXT:' . $extension)) {
+                        $isCoreExt = true;
+                        break;
+                    }
                 }
             }
             if ($isCoreExt) {
                 $locale = 't3';
             } else {
-                $locale = 'default';
+                $locale = 'en';
             }
         } elseif (self::$userConfiguration->crowdinIdentifier) {
             if ($extensionName === self::$userConfiguration->extensionKey
                 || str_contains($id, 'EXT:' . self::$userConfiguration->extensionKey)) {
                 $locale = 't3';
             } else {
-                $locale = 'default';
+                $locale = 'en';
             }
         }
 

Classes/Xclass/LanguageServiceXclassed.php

@@ -63,13 +63,6 @@ public function sL($input): string
         return parent::sL($input);
     }
 
-    protected function includeLanguageFileRaw($fileRef)
-    {
-        $this->reinitLanguage($fileRef);
-
-        return parent::includeLanguageFileRaw($fileRef);
-    }
-
     protected function readLLfile($fileRef): array
     {
         $this->reinitLanguage($fileRef);
@@ -84,18 +77,34 @@ protected function reinitLanguage($path): void
         }
         $typo3Version = (new Typo3Version())->getMajorVersion();
 
+        // TYPO3 v14 switched from "default" to "en" as default language, which makes more sense
+        $defaultLanguageCode = $typo3Version >= 14 ? 'en' : 'default';
+        $resetLanguageCode = null;
+
         $this->loadUserConfiguration();
         if ($this->userConfiguration->usedForCore) {
             $isCoreExt = false;
-            foreach (self::CORE_EXTENSIONS as $extension) {
-                if (str_contains($path, 'EXT:' . $extension)) {
-                    $isCoreExt = true;
+            $extensionName = null;
+            if ($typo3Version >= 14) {
+                if (!str_contains($path, ':') && str_contains($path, '.')) {
+                    // This looks like a domain string
+                    [$extensionName,] = explode('.', $path, 2);
+                }
+            }
+            if ($extensionName !== null) {
+                $isCoreExt = in_array($extensionName, self::CORE_EXTENSIONS, true);
+            } else {
+                foreach (self::CORE_EXTENSIONS as $extension) {
+                    if (str_contains($path, 'EXT:' . $extension)) {
+                        $isCoreExt = true;
+                        break;
+                    }
                 }
             }
             if ($isCoreExt) {
-                $this->lang = 't3';
+                $resetLanguageCode = 't3';
             } else {
-                $this->lang = $typo3Version >= 14 ? 'en' : 'default';
+                $resetLanguageCode = $defaultLanguageCode;
             }
         } elseif ($this->userConfiguration->crowdinIdentifier) {
             $useT3 = str_contains($path, 'EXT:' . $this->userConfiguration->extensionKey);
@@ -104,11 +113,16 @@ protected function reinitLanguage($path): void
                 $useT3 = str_starts_with($path, $this->userConfiguration->extensionKey . '.');
             }
             if ($useT3) {
-                $this->lang = 't3';
+                $resetLanguageCode = 't3';
             } else {
-                $this->lang = $typo3Version >= 14 ? 'en' : 'default';
+                $resetLanguageCode = $defaultLanguageCode;
             }
         }
+
+        // Actually reinitialize if needed
+        if ($resetLanguageCode !== null) {
+            $this->init($resetLanguageCode);
+        }
     }
 
     protected function loadUserConfiguration(): void