Ticket #1484434: roundcube_http-accept-language.patch

program/include/main.inc

@@ -39 +39 @@
   // check client
   $BROWSER = rcube_browser();
 
+  // Get HTTP_ACCEPT_LANGUAGE
+  $accept_lang = explode(',', $_SERVER['HTTP_ACCEPT_LANGUAGE']);
+  $accept_lang = str_replace('-', '_', $accept_lang[0]);
+
   // load config file
   include_once('config/main.inc.php');
   $CONFIG = is_array($rcmail_config) ? $rcmail_config : array();
@@ -92 +96 @@
   // create session and set session vars
   if (!isset($_SESSION['auth_time']))
     {
-    $_SESSION['user_lang'] = rcube_language_prop($CONFIG['locale_string']);
+    if (!empty($accept_lang))
+      $_SESSION['user_lang'] = rcube_language_prop($accept_lang);
+    else
+      $_SESSION['user_lang'] = rcube_language_prop($CONFIG['locale_string']);
+
     $_SESSION['auth_time'] = mktime();
     setcookie('sessauth', rcmail_auth_hash($sess_id, $_SESSION['auth_time']));
     }
@@ -119 +127 @@
 
 
   // set localization
-  if ($CONFIG['locale_string'])
-    setlocale(LC_ALL, $CONFIG['locale_string']);
-  else if ($sess_user_lang)
+  if ($sess_user_lang)
     setlocale(LC_ALL, $sess_user_lang);
+  else if ($CONFIG['locale_string'])
+    setlocale(LC_ALL, $CONFIG['locale_string']);
 
 
   register_shutdown_function('rcmail_shutdown');
@@ -302 +310 @@
 // check the given string and returns language properties
 function rcube_language_prop($lang, $prop='lang')
   {
-  global $INSTALL_PATH;
+  global $INSTALL_PATH, $CONFIG;
   static $rcube_languages, $rcube_language_aliases, $rcube_charsets;
 
   if (empty($rcube_languages))
@@ -319 +327 @@
     $lang = rcube_language_prop($lang);
     }
 
+  if (!isset($rcube_languages[$lang]) && (isset($rcube_languages[$CONFIG['locale_string']]) || isset($rcube_languages[substr($CONFIG['local_string'], 0, 2)])))
+    $lang = rcube_language_prop($CONFIG['locale_string']);
+
   if (!isset($rcube_languages[$lang]))
     $lang = 'en_US';