Fixed issue #11445: Better identification of language variants for au…

…tomatic language detection in administration
LimeSurvey · Jul 25, 2016 · 839bbae · 839bbae
1 parent aae8c5f
commit 839bbae
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/application/helpers/common_helper.php b/application/helpers/common_helper.php
@@ -7623,6 +7623,12 @@ function getBrowserLanguage()
     if (!isset($aLanguages[$sLanguage]))
     {
         $sLanguage=str_replace('_','-',$sLanguage);
+        if (strpos($sLanguage,'-')!==false)
+        {
+          $aLanguage=explode('-',$sLanguage);
+          $aLanguage[1]=strtoupper($aLanguage[1]);
+          $sLanguage=implode('-',$aLanguage);
+        }
         if (!isset($aLanguages[$sLanguage]))
         {
             $sLanguage=substr($sLanguage,0,strpos($sLanguage,'-'));