Merge branch 'master' into 'master'

[jirafeau.git] / lib / lang.php

diff --git a/lib/lang.php b/lib/lang.php
index 225323f3ba67179e4cb3f3a3518196f19280c9d0..d636b8d944424b53672a8aaf28bd338b8dd89e9c 100644 (file)
--- a/lib/lang.php
+++ b/lib/lang.php
@@ -21,12 +21,14 @@ global $languages_list;
 $languages_list = array ('auto' => 'Automatic',\r
                          'de'   => 'Deutsch',\r
                          'en'   => 'English',\r
+                         'hu'   => 'Magyar',\r
                          'fi'   => 'Suomi',\r
                          'fr'   => 'Français',\r
                          'it'   => 'Italiano',\r
                          'nl'   => 'Nederlands',\r
                          'ro'   => 'Limba română',\r
-                         'sk'   => 'Slovenčina');\r
+                         'sk'   => 'Slovenčina',\r
+                         'zh'   => '汉语');\r
 \r
 /* Translation */\r
 function t ($text)\r
@@ -36,7 +38,12 @@ function t ($text)
 \r
     /* Detect user's langage if we are in automatic mode. */\r
     if (strcmp ($cfg['lang'], 'auto') == 0)\r
-        $l = substr ($_SERVER['HTTP_ACCEPT_LANGUAGE'], 0, 2);\r
+    {\r
+        if (isset ($_SERVER['HTTP_ACCEPT_LANGUAGE']))\r
+            $l = substr ($_SERVER['HTTP_ACCEPT_LANGUAGE'], 0, 2);\r
+        else\r
+            $l = "en";\r
+    }\r
     else\r
         $l = $cfg['lang'];\r
 \r
@@ -74,7 +81,12 @@ function json_lang_generator ()
 \r
     /* Detect user's langage if we are in automatic mode. */\r
     if (strcmp ($cfg['lang'], 'auto') == 0)\r
-        $l = substr ($_SERVER['HTTP_ACCEPT_LANGUAGE'], 0, 2);\r
+    {\r
+        if (isset ($_SERVER['HTTP_ACCEPT_LANGUAGE']))\r
+            $l = substr ($_SERVER['HTTP_ACCEPT_LANGUAGE'], 0, 2);\r
+        else\r
+            $l = "en";\r
+    }\r
     else\r
         $l = $cfg['lang'];\r
 \r