If lang is set by menu then force the use of that language see BT#13183

jmontoyaa · jmontoyaa · commit 6136a53d82f7 · 2017-08-10T10:37:16.000+02:00
diff --git a/main/inc/global.inc.php b/main/inc/global.inc.php
@@ -431,7 +431,6 @@
 $valid_languages = api_get_languages();
 
 if (!empty($valid_languages)) {
-
     if (!in_array($user_language, $valid_languages['folder'])) {
         $user_language = api_get_setting('platformLanguage');
     }
@@ -484,6 +483,12 @@
     if (isset($_GET['language'])) {
         $language_interface = $user_language;
     }
+
+    $allow = api_get_configuration_value('show_language_selector_in_menu');
+    // Overwrite all lang configs and use the menu language
+    if ($allow) {
+        $language_interface = $_SESSION['user_language_choice'];
+    }
 }
 
 // Sometimes the variable $language_interface is changed

Original file line number	Diff line number	Diff line change
`@@ -431,7 +431,6 @@`
`431`	`431`	`$valid_languages = api_get_languages();`
`432`	`432`
`433`	`433`	`if (!empty($valid_languages)) {`
`434`		`-`
`435`	`434`	`if (!in_array($user_language, $valid_languages['folder'])) {`
`436`	`435`	`$user_language = api_get_setting('platformLanguage');`
`437`	`436`	`}`
`@@ -484,6 +483,12 @@`
`484`	`483`	`if (isset($_GET['language'])) {`
`485`	`484`	`$language_interface = $user_language;`
`486`	`485`	`}`
	`486`	`+`
	`487`	`+ $allow = api_get_configuration_value('show_language_selector_in_menu');`
	`488`	`+ // Overwrite all lang configs and use the menu language`
	`489`	`+ if ($allow) {`
	`490`	`+ $language_interface = $_SESSION['user_language_choice'];`
	`491`	`+ }`
`487`	`492`	`}`
`488`	`493`
`489`	`494`	`// Sometimes the variable $language_interface is changed`