Index: branches/main/admin/interface/version.php
===================================================================
--- branches/main/admin/interface/version.php	(revision 31)
+++ branches/main/admin/interface/version.php	(revision 32)
@@ -44,7 +44,7 @@
 if (!defined('VERSION_LOADED')) {
     $sInfo = '
         VERSION  = "2.11.0-RC1"
-        REVISION = "31"
+        REVISION = "32"
         SP       = ""
     ';
     foreach (parse_ini_string($sInfo) as $item=>$value) {
Index: branches/main/framework/initialize.php
===================================================================
--- branches/main/framework/initialize.php	(revision 31)
+++ branches/main/framework/initialize.php	(revision 32)
@@ -426,8 +426,9 @@
             $_SESSION['session_started'] = time();
         }
         // Get users language
+        $sLang = $oRequest->issetParam('lang');
         if (
-            ($sLang = $oRequest->issetParam('lang')) == null ||
+            !$sLang ||
             !preg_match('/^([a-z]{2})(?:[\-_]([a-z]{2})(?:[\-_]([a-z\-_]{2,8}))?)?$/i', $sLang, $aMatches)
         ) {
             if (isset($_SESSION['LANGUAGE']) AND $_SESSION['LANGUAGE'] != '') {
@@ -437,20 +438,10 @@
             }
         } else {
             $sLang = strtoupper($aMatches[1]);
-            define('LANGUAGE', $slang);
+            define('LANGUAGE', $sLang);
             $_SESSION['LANGUAGE'] = $sLang;
-//            // strtoupper() is deprecated and for backward compatibility only!
-//            $sLang = strtoupper($oRequest->getParam('lang', FILTER_CALLBACK, [
-//                new \bin\requester\filter\CoreFilters(['default'=>'en', 'seperator'=>'-']),
-//                'FILTER_LANGUAGE_CODE'
-//            ]));
-//            define('LANGUAGE', $slang);
-//            $_SESSION['LANGUAGE'] = $sLang;
         }
-        $sCachePath = dirname(__DIR__).'/temp/cache/';
-        if (!file_exists($sCachePath)) {
-            if (!mkdir($sCachePath, 0777, true)) { $sCachePath = dirname(__DIR__).'/temp/'; }
-        }
+        unset($sLang);
         // Load Language file(s)
         $sCurrLanguage = '';
         $slangFile = WB_PATH.'/languages/EN.php';
@@ -471,9 +462,6 @@
                 require $slangFile;
             }
         }
-// activate Translate --------------------------------------------------------------------
-        $oTrans = Translate::getInstance();
-        $oTrans->initialize(array('EN', DEFAULT_LANGUAGE, LANGUAGE), $sCachePath); // 'none'
 // activate SecureTokens -----------------------------------------------------------------
         $oApp = (object) [
             'oRequester' => $oRequest,
@@ -486,6 +474,13 @@
         ];
         \bin\SecureTokens::getInstance($oApp);
         \bin\SecureTokens::checkFTAN();
+// activate Translate --------------------------------------------------------------------
+        $sCachePath = dirname(__DIR__).'/temp/cache/';
+        if (!file_exists($sCachePath)) {
+            if (!mkdir($sCachePath, 0777, true)) { $sCachePath = dirname(__DIR__).'/temp/'; }
+        }
+        $oTrans = Translate::getInstance();
+        $oTrans->initialize(array('EN', DEFAULT_LANGUAGE, LANGUAGE), $sCachePath); // 'none'
 // ---------------------------------------------------------------------------------------
         // Get users timezone
         if (isset($_SESSION['TIMEZONE'])) {