Merge pull request #37 from tollwerk/develop

Fix language / locale usage
tollwerk · Sep 11, 2020 · 9e1e9ce · 9e1e9ce
2 parents add0d45 + 4869f8a
commit 9e1e9ce
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 6 deletions.
diff --git a/Classes/Utility/TcaUtility.php b/Classes/Utility/TcaUtility.php
@@ -48,14 +48,14 @@
 class TcaUtility
 {
     /**
-     * Supported languages
+     * Supported locales
      *
      * SELECT CONCAT(`lg_name_local`, " (", lg_name_en, ")") AS label, IF(lg_collate_locale = "", LOWER(lg_iso_2),
      * lg_collate_locale) AS iso FROM `static_languages` ORDER BY lg_name_en ASC
      *
      * @var array
      */
-    public static $languages = [
+    public static $locales = [
         ['LLL:EXT:tw_base/Resources/Private/Language/locallang_db.xlf:pages.tx_twbase_title_language.auto', ''],
         ['Аҧсуа бызшәа (Abkhazian)', 'ab'],
         ['Afaraf (Afar)', 'aa'],
@@ -253,14 +253,25 @@ class TcaUtility
         ['isiZulu (Zulu)', 'zu']
     ];
 
+    /**
+     * Extract a list language subtags from the locales
+     *
+     * @return array[] languages
+     */
+    public static function languages(): array {
+        return array_map(function(array $locale){
+            return [$locale[0], strtok($locale[1], '_')];
+        }, self::$locales);
+    }
+
     /**
      * Add track languages
      *
      * @param array $config
      */
     public function trackLanguages(array &$config)
     {
-        $config['items'] = self::$languages;
+        $config['items'] = self::languages();
         unset($config['items'][0]);
     }
 

diff --git a/Classes/ViewHelpers/LanguageViewHelper.php b/Classes/ViewHelpers/LanguageViewHelper.php
@@ -69,7 +69,7 @@ public static function renderStatic(
         Closure $renderChildrenClosure,
         RenderingContextInterface $renderingContext
     ): string {
-        foreach (TcaUtility::$languages as $language) {
+        foreach (TcaUtility::languages() as $language) {
             if ($arguments['identifier'] == $language[1]) {
                 return $language[0];
             }

diff --git a/Configuration/TCA/Overrides/pages.php b/Configuration/TCA/Overrides/pages.php
@@ -46,7 +46,7 @@
         'config'  => [
             'type'       => 'select',
             'renderType' => 'selectSingle',
-            'items'      => \Tollwerk\TwBase\Utility\TcaUtility::$languages,
+            'items'      => \Tollwerk\TwBase\Utility\TcaUtility::languages(),
             'size'       => 1,
             'minitems'   => 0,
             'maxitems'   => 1

diff --git a/Configuration/TCA/Overrides/tt_content.php b/Configuration/TCA/Overrides/tt_content.php
@@ -48,7 +48,7 @@
             'config'  => [
                 'type'       => 'select',
                 'renderType' => 'selectSingle',
-                'items'      => \Tollwerk\TwBase\Utility\TcaUtility::$languages,
+                'items'      => \Tollwerk\TwBase\Utility\TcaUtility::languages(),
                 'size'       => 1,
                 'minitems'   => 0,
                 'maxitems'   => 1