Ticket #4651 - Languages with country cannot be used.

inc/classes/BxDolLanguages.php

@@ -459,6 +459,24 @@ function bx_lang_name()
     return BxDolLanguages::getInstance()->getCurrentLanguage();
 }
 
+function bx_lang_code()
+{
+    $sResult = bx_lang_name();
+    if(strpos($sResult, '-') !== false)
+        list($sResult) = explode('-', $sResult);
+
+    return $sResult;
+}
+
+function bx_lang_country()
+{
+    $sResult = bx_lang_name();
+    if(strpos($sResult, '-') !== false)
+        list($sCode, $sResult) = explode('-', $sResult);
+
+    return $sResult;
+}
+
 function bx_lang_direction($sLanguage = '')
 {
     return BxDolLanguages::getInstance()->getLangDirection($sLanguage);

inc/classes/BxDolTemplate.php

@@ -1835,14 +1835,14 @@ class BxDolTemplate extends BxDolFactory implements iBxDolSingleton
                 $sRet = $this->_oTemplateFunctions->getInjectionFooter();
                 break;
             case 'lang':
-                $sRet = bx_lang_name();
+                $sRet = bx_lang_code();
                 break;
             case 'lang_direction':
                 $sRet = bx_lang_direction();
                 break;
             case 'lang_country':
                 if (!($sRet = BxDolLanguages::getInstance()->getLangCountryCode()))
-                    $sRet = bx_lang_name();
+                    $sRet = bx_lang_country();
                 break;                
             case 'main_logo':
                 $sRet = BxTemplFunctions::getInstance()->getMainLogo();