diff options
Diffstat (limited to 'includes/language.inc')
-rw-r--r-- | includes/language.inc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/includes/language.inc b/includes/language.inc index d145fd7f7..0d87f6a2c 100644 --- a/includes/language.inc +++ b/includes/language.inc @@ -11,12 +11,12 @@ */ function language_initialize() { global $user; - + $mode = variable_get('language_negotiation', LANGUAGE_NEGOTIATION_NONE); switch($mode) { case LANGUAGE_NEGOTIATION_NONE: return language_default(); - + case LANGUAGE_NEGOTIATION_DOMAIN: $languages = language_list(); foreach($languages as $language) { @@ -26,7 +26,7 @@ function language_initialize() { } } return language_default(); - + case LANGUAGE_NEGOTIATION_PATH_DEFAULT: case LANGUAGE_NEGOTIATION_PATH: $languages = language_list('prefix'); @@ -41,18 +41,18 @@ function language_initialize() { } break; } - + // User language. $languages = language_list(); if ($user->uid && isset($languages[$user->language])) { return $languages[$user->language]; } - + // Browser accept-language parsing. if ($language = language_from_browser()) { return $language; } - + // Fall back on the default if everything else fails. return language_default(); } @@ -76,7 +76,7 @@ function language_from_browser() { } } } - + // Order the codes by quality arsort($browser_langs); @@ -121,12 +121,12 @@ function language_url_rewrite(&$path, &$options) { // Intentionally no break here. case LANGUAGE_NEGOTIATION_PATH: - if (isset($path_language->prefix) && $path_language->prefix) { + if (isset($path_language->prefix) && $path_language->prefix) { // Get alias if not already aliased. if (!$options['alias']) { $path = drupal_get_path_alias($path, $path_language->language); $options['alias'] = TRUE; - } + } $path = empty($path) ? $path_language->prefix : $path_language->prefix .'/'. $path; } break; |