Ticket #5205 - HTML5 uploader should get correct pair lang + country.

inc/classes/BxDolLanguages.php

@@ -485,7 +485,12 @@ function bx_lang_code_with_country()
 
 function bx_lang_country()
 {
-    $sResult = bx_lang_name();
+    $oLanguages = BxDolLanguages::getInstance();
+
+    if(($sCountryDb = $oLanguages->getLangCountryCode()))
+        return $sCountryDb;
+
+    $sResult = $oLanguages->getCurrentLanguage();
     if(strpos($sResult, '-') !== false)
         list($sCode, $sResult) = explode('-', $sResult);
 

inc/classes/BxDolTemplate.php

@@ -1919,8 +1919,7 @@ class BxDolTemplate extends BxDolFactory implements iBxDolSingleton
                 $sRet = bx_lang_direction();
                 break;
             case 'lang_country':
-                if (!($sRet = BxDolLanguages::getInstance()->getLangCountryCode()))
-                    $sRet = bx_lang_country();
+                $sRet = bx_lang_country();
                 break;
             case 'lang_with_country':
                 $sRet = bx_lang_code_with_country();

template/scripts/BxBaseUploaderHTML5.php

@@ -31,9 +31,18 @@ class BxBaseUploaderHTML5 extends BxDolUploader
         $this->_sJsTemplate = 'uploader_button_html5_js.html';
         $this->_sUploaderFormTemplate = 'uploader_form_html5.html';
 
-        $aUploaderLangs = array('am-et' => 1, 'ar-ar' => 1, 'az-az' => 1, 'ca-ca' => 1, 'cs-cz' => 1, 'da-dk' => 1, 'de-de' => 1, 'el-el' => 1, 'en-en' => 1, 'es-es' => 1, 'et-ee' => 1, 'fa_ir' => 1, 'fi-fi' => 1, 'fr-fr' => 1, 'he-he' => 1, 'hr-hr' => 1, 'hu-hu' => 1, 'id-id' => 1, 'it-it' => 1, 'ja-ja' => 1, 'km-km' => 1, 'ko-kr' => 1, 'ku-ckb' => 1, 'lt-lt' => 1, 'lv-lv' => 1, 'nl-nl' => 1, 'no_nb' => 1, 'pl-pl' => 1, 'pt-br' => 1, 'pt-pt' => 1, 'ro-ro' => 1, 'ru-ru' => 1, 'sk-sk' => 1, 'sv_se' => 1, 'tr-tr' => 1, 'uk-ua' => 1, 'vi-vi' => 1, 'zh-cn' => 1, 'zh-tw' => 1);
-        $sUploaderLang = BxDolLanguages::getInstance()->getCurrentLanguage() . '-' . BxDolLanguages::getInstance()->getLangFlag();
-        if (!isset($aUploaderLangs[$sUploaderLang]))
+        $aUploaderLangs = [
+            'am-et' => 1, 'ar-ar' => 1, 'az-az' => 1, 'ca-ca' => 1, 'cs-cz' => 1, 
+            'da-dk' => 1, 'de-de' => 1, 'el-el' => 1, 'en-en' => 1, 'es-es' => 1, 
+            'et-ee' => 1, 'fa_ir' => 1, 'fi-fi' => 1, 'fr-fr' => 1, 'he-he' => 1, 
+            'hr-hr' => 1, 'hu-hu' => 1, 'id-id' => 1, 'it-it' => 1, 'ja-ja' => 1, 
+            'km-km' => 1, 'ko-kr' => 1, 'ku-ckb' => 1, 'lt-lt' => 1, 'lv-lv' => 1, 
+            'nl-nl' => 1, 'no_nb' => 1, 'pl-pl' => 1, 'pt-br' => 1, 'pt-pt' => 1, 
+            'ro-ro' => 1, 'ru-ru' => 1, 'sk-sk' => 1, 'sv_se' => 1, 'tr-tr' => 1, 
+            'uk-ua' => 1, 'vi-vi' => 1, 'zh-cn' => 1, 'zh-tw' => 1
+        ];
+        $sUploaderLang = bx_lang_code() . '-' . bx_lang_country();
+        if(!isset($aUploaderLangs[$sUploaderLang]))
             $sUploaderLang = 'en-en';
 
         $this->_sLangJsUrl = $this->_oTemplate->getJsUrlWithRevision('filepond/locale/' . $sUploaderLang . '.js');