|
@@ -405,13 +405,15 @@ if (!empty($valid_languages)) {
|
|
|
if (!in_array($user_language, $valid_languages['folder'])) {
|
|
|
$user_language = api_get_setting('platformLanguage');
|
|
|
}
|
|
|
+
|
|
|
$language_priority1 = api_get_setting('languagePriority1');
|
|
|
$language_priority2 = api_get_setting('languagePriority2');
|
|
|
$language_priority3 = api_get_setting('languagePriority3');
|
|
|
$language_priority4 = api_get_setting('languagePriority4');
|
|
|
|
|
|
- if (in_array($user_language, $valid_languages['folder']) &&
|
|
|
- (isset($_GET['language']) || isset($_POST['language_list']) || !empty($browser_language))
|
|
|
+ if (isset($_GET['language']) ||
|
|
|
+ (isset($_POST['language_list']) && !empty($_POST['language_list'])) ||
|
|
|
+ !empty($browser_language)
|
|
|
) {
|
|
|
$user_selected_language = $user_language; // $_GET['language']; or HTTP_ACCEPT_LANGUAGE
|
|
|
$_SESSION['user_language_choice'] = $user_selected_language;
|
|
@@ -419,13 +421,13 @@ if (!empty($valid_languages)) {
|
|
|
}
|
|
|
|
|
|
if (!empty($language_priority4) && api_get_language_from_type($language_priority4) !== false) {
|
|
|
- $language_interface = api_get_language_from_type($language_priority4);
|
|
|
+ $language_interface = api_get_language_from_type($language_priority4);
|
|
|
} else {
|
|
|
$language_interface = api_get_setting('platformLanguage');
|
|
|
}
|
|
|
|
|
|
if (!empty($language_priority3) && api_get_language_from_type($language_priority3) !== false) {
|
|
|
- $language_interface = api_get_language_from_type($language_priority3);
|
|
|
+ $language_interface = api_get_language_from_type($language_priority3);
|
|
|
} else {
|
|
|
if (isset($_SESSION['user_language_choice'])) {
|
|
|
$language_interface = $_SESSION['user_language_choice'];
|
|
@@ -433,12 +435,13 @@ if (!empty($valid_languages)) {
|
|
|
}
|
|
|
|
|
|
if (!empty($language_priority2) && api_get_language_from_type($language_priority2) !== false) {
|
|
|
- $language_interface = api_get_language_from_type($language_priority2);
|
|
|
+ $language_interface = api_get_language_from_type($language_priority2);
|
|
|
} else {
|
|
|
if (isset($_user['language'])) {
|
|
|
$language_interface = $_user['language'];
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
if (!empty($language_priority1) && api_get_language_from_type($language_priority1) !== false) {
|
|
|
$language_interface = api_get_language_from_type($language_priority1);
|
|
|
} else {
|
|
@@ -446,6 +449,7 @@ if (!empty($valid_languages)) {
|
|
|
$language_interface = $_course['language'];
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
}
|
|
|
|
|
|
// Sometimes the variable $language_interface is changed
|
|
@@ -454,8 +458,6 @@ if (!empty($valid_languages)) {
|
|
|
// to use it within the function get_lang(...).
|
|
|
$language_interface_initial_value = $language_interface;
|
|
|
|
|
|
-
|
|
|
-
|
|
|
/**
|
|
|
* Include the trad4all language file
|
|
|
*/
|