Merge branch 'fix-footer' into 'master'

[jirafeau.git] / lib / lang.php

diff --git a/lib/lang.php b/lib/lang.php
index bf74e8d77a4acef42c7161a547b2e6f4052e81ae..fba5dbed809895926efa5ea90b29bdd8caa88e1a 100644 (file)
--- a/lib/lang.php
+++ b/lib/lang.php
@@ -1,7 +1,7 @@
 <?php\r
 /*\r
  *  Jirafeau, your web file repository\r
 <?php\r
 /*\r
  *  Jirafeau, your web file repository\r

- *  Copyright (C) 2012  Jerome Jutteau <j.jutteau@gmail.com>\r
+ *  Copyright (C) 2015  Jerome Jutteau <j.jutteau@gmail.com>\r

  *\r
  *  This program is free software: you can redistribute it and/or modify\r
  *  it under the terms of the GNU Affero General Public License as\r
  *\r
  *  This program is free software: you can redistribute it and/or modify\r
  *  it under the terms of the GNU Affero General Public License as\r


@@ -19,6 +19,7 @@
 \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
                           'fr' => 'Français');\r
 \r
                           'en' => 'English',\r
                           'fr' => 'Français');\r
 \r


@@ -40,18 +41,27 @@ 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/$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
+    error_log(print_r($trans, true));\r
+    if ($trans === NULL)\r
+        return $text;\r
+\r
+    /* Try to find translation. */\r
+    $translation = $trans[$text];\r
+    if (empty ($translation))\r
+        return $text;\r
+\r
+    return $translation;\r

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