Fix #12256 #13263 - add Serbian Latin language and change language lists to show script

Author: Bartlomiejsz

lib/internal/Magento/Framework/Locale/Config.php

@@ -91,7 +91,8 @@ class Config implements \Magento\Framework\Locale\ConfigInterface
         'sk_SK', /*Slovak (Slovakia)*/
         'sl_SI', /*Slovenian (Slovenia)*/
         'sq_AL', /*Albanian (Albania)*/
-        'sr_Cyrl_RS', /*Serbian (Serbia)*/
+        'sr_Cyrl_RS', /*Serbian (Cyrillic, Serbia)*/
+        'sr_Latn_RS', /*Serbian (Latin, Serbia)*/
         'sv_SE', /*Swedish (Sweden)*/
         'sv_FI', /*Swedish (Finland)*/
         'sw_KE', /*Swahili (Kenya)*/

lib/internal/Magento/Framework/Locale/Test/Unit/ConfigTest.php

@@ -15,7 +15,7 @@ class ConfigTest extends \PHPUnit\Framework\TestCase
         'es_MX', 'eu_ES', 'es_PE', 'et_EE', 'fa_IR', 'fi_FI', 'fil_PH', 'fr_CA', 'fr_FR', 'gu_IN',
         'he_IL', 'hi_IN', 'hr_HR', 'hu_HU', 'id_ID', 'is_IS', 'it_CH', 'it_IT', 'ja_JP', 'ka_GE',
         'km_KH', 'ko_KR', 'lo_LA', 'lt_LT', 'lv_LV', 'mk_MK', 'mn_Cyrl_MN', 'ms_Latn_MY', 'nl_NL', 'nb_NO',
-        'nn_NO', 'pl_PL', 'pt_BR', 'pt_PT', 'ro_RO', 'ru_RU', 'sk_SK', 'sl_SI', 'sq_AL', 'sr_Cyrl_RS',
+        'nn_NO', 'pl_PL', 'pt_BR', 'pt_PT', 'ro_RO', 'ru_RU', 'sk_SK', 'sl_SI', 'sq_AL', 'sr_Cyrl_RS', 'sr_Latn_RS',
         'sv_SE', 'sw_KE', 'th_TH', 'tr_TR', 'uk_UA', 'vi_VN', 'zh_Hans_CN', 'zh_Hant_HK', 'zh_Hant_TW', 'es_CL',
         'lo_LA', 'es_VE', 'en_IE',
     ];

lib/internal/Magento/Framework/Locale/TranslatedLists.php

@@ -81,17 +81,23 @@ protected function _getOptionLocales($translatedName = false)
             }
             $language = \Locale::getPrimaryLanguage($locale);
             $country = \Locale::getRegion($locale);
+            $script = \Locale::getScript($locale);
+            $scriptTranslated = '';
             if (!$languages[$language] || !$countries[$country]) {
                 continue;
             }
+            if ($script !== '') {
+                $script = \Locale::getDisplayScript($locale) . ', ';
+                $scriptTranslated = \Locale::getDisplayScript($locale, $locale) . ', ';
+            }
             if ($translatedName) {
                 $label = ucwords(\Locale::getDisplayLanguage($locale, $locale))
-                    . ' (' . \Locale::getDisplayRegion($locale, $locale) . ') / '
+                    . ' (' . $scriptTranslated . \Locale::getDisplayRegion($locale, $locale) . ') / '
                     . $languages[$language]
-                    . ' (' . $countries[$country] . ')';
+                    . ' (' . $script . $countries[$country] . ')';
             } else {
                 $label = $languages[$language]
-                    . ' (' . $countries[$country] . ')';
+                    . ' (' . $script . $countries[$country] . ')';
             }
             $options[] = ['value' => $locale, 'label' => $label];
         }

lib/internal/Magento/Framework/Setup/Lists.php

@@ -99,10 +99,14 @@ public function getLocaleList()
             }
             $language = \Locale::getPrimaryLanguage($locale);
             $country = \Locale::getRegion($locale);
+            $script = \Locale::getScript($locale);
             if (!$languages[$language] || !$countries[$country]) {
                 continue;
             }
-            $list[$locale] = $languages[$language] . ' (' . $countries[$country] . ')';
+            if ($script !== '') {
+                $script = \Locale::getDisplayScript($locale) . ', ';
+            }
+            $list[$locale] = $languages[$language] . ' (' . $script . $countries[$country] . ')';
         }
         asort($list);
         return $list;