From 2c6a233a9981d8f2cc56b6e166d971f63359c519 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Tue, 24 Sep 2013 09:21:27 +0200
Subject: Make sure language code extracted from HTTP_ACCEPT_LANGUAGE is in
 xx_YY format

---
 program/lib/Roundcube/rcube.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'program/lib/Roundcube/rcube.php')

diff --git a/program/lib/Roundcube/rcube.php b/program/lib/Roundcube/rcube.php
index d9c3dd8b9..e43f53526 100644
--- a/program/lib/Roundcube/rcube.php
+++ b/program/lib/Roundcube/rcube.php
@@ -702,7 +702,11 @@ class rcube
         // user HTTP_ACCEPT_LANGUAGE if no language is specified
         if (empty($lang) || $lang == 'auto') {
             $accept_langs = explode(',', $_SERVER['HTTP_ACCEPT_LANGUAGE']);
-            $lang         = str_replace('-', '_', $accept_langs[0]);
+            $lang         = $accept_langs[0];
+
+            if (preg_match('/^([a-z]+)[_-]([a-z]+)$/i', $lang, $m)) {
+                $lang = $m[1] . '_' . strtoupper($m[2]);
+            }
         }
 
         if (empty($rcube_languages)) {
-- 
cgit v1.2.3