Merge branch 'img' into 'master'

[jirafeau_project.git] / lib / lang.php

diff --git a/lib/lang.php b/lib/lang.php
index 89f890fd637ccdc6fd46a714f813084ed23005d1..cc70b3d35639204369e4937c95fa36d853c720db 100644 (file)
--- a/lib/lang.php
+++ b/lib/lang.php
@@ -19,8 +19,14 @@
 \r
  global $languages_list;\r
  $languages_list = array ('auto' => 'Automatic',\r
 \r
  global $languages_list;\r
  $languages_list = array ('auto' => 'Automatic',\r

+                          'de' => 'Deutsch',\r

                           'en' => 'English',\r
                           'en' => 'English',\r

-                          'fr' => 'Français');\r
+                          'fi' => 'Suomi',\r
+                          'fr' => 'Français',\r
+                          'it' => 'Italiano',\r
+                          'nl' => 'Nederlands',\r
+                          'ro' => 'Limba română',\r
+                          'sk' => 'Slovenčina');\r

 \r
 /* Translation */\r
 function t ($text)\r
 \r
 /* Translation */\r
 function t ($text)\r


@@ -40,18 +46,25 @@ function t ($text)
         if (strcmp ($l, $key) == 0)\r
             $found = true;\r
 \r
         if (strcmp ($l, $key) == 0)\r
             $found = true;\r
 \r

-    /* Get translation execpt for english. */\r
-    if ($found && strcmp ($l, "en"))\r
-    {\r
-        /* $tr is defined in this requirement. */\r
-        require (JIRAFEAU_ROOT . "lib/lang/lang_$l.php");\r
-\r
-        foreach ($tr as $o => $t)\r
-            if (strcmp ($text, $o) == 0)\r
-                return "$t";\r
-    }\r
-    /* Return original text if no translation is found or already in english. */\r
-    return ($text);\r
+    /* Don't translate english. */\r
+    if (!($found && strcmp ($l, "en")))\r
+        return $text;\r
+\r
+    /* Open translation file. */\r
+    $trans_j = file_get_contents (JIRAFEAU_ROOT . "lib/locales/$l.json");\r
+    if ($trans_j === FALSE)\r
+        return $text;\r
+\r
+    /* Decode JSON. */\r
+    $trans = json_decode ($trans_j, true);\r
+    if ($trans === NULL)\r
+        return $text;\r
+\r
+    /* Try to find translation. */\r
+    if (!array_key_exists ($text, $trans))\r
+        return $text;\r
+\r
+    return $trans[$text];\r

 }\r
 \r
 ?>\r
 }\r
 \r
 ?>\r