X-Git-Url: https://git.p6c8.net/jirafeau.git/blobdiff_plain/0a5462c3311b4541a858b8e719ae8548877c7a62..deb9d5b531b7d4e2f314db2fc0defd2a50f8b609:/lib/lang.php?ds=sidebyside

diff --git a/lib/lang.php b/lib/lang.php
old mode 100755
new mode 100644
index bf74e8d..fba5dbe
--- a/lib/lang.php
+++ b/lib/lang.php
@@ -1,7 +1,7 @@
 <?php
 /*
  *  Jirafeau, your web file repository
- *  Copyright (C) 2012  Jerome Jutteau <j.jutteau@gmail.com>
+ *  Copyright (C) 2015  Jerome Jutteau <j.jutteau@gmail.com>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU Affero General Public License as
@@ -19,6 +19,7 @@
 
  global $languages_list;
  $languages_list = array ('auto' => 'Automatic',
+                          'de' => 'Deutsch',
                           'en' => 'English',
                           'fr' => 'Français');
 
@@ -40,18 +41,27 @@ function t ($text)
         if (strcmp ($l, $key) == 0)
             $found = true;
 
-    /* Get translation execpt for english. */
-    if ($found && strcmp ($l, "en"))
-    {
-        /* $tr is defined in this requirement. */
-        require (JIRAFEAU_ROOT . "lib/lang/$l.php");
-
-        foreach ($tr as $o => $t)
-            if (strcmp ($text, $o) == 0)
-                return "$t";
-    }
-    /* Return original text if no translation is found or already in english. */
-    return ($text);
+    /* Don't translate english. */
+    if (!($found && strcmp ($l, "en")))
+        return $text;
+
+    /* Open translation file. */
+    $trans_j = file_get_contents (JIRAFEAU_ROOT . "lib/locales/$l.json");
+    if ($trans_j === FALSE)
+        return $text;
+
+    /* Decode JSON. */
+    $trans = json_decode ($trans_j, true);
+    error_log(print_r($trans, true));
+    if ($trans === NULL)
+        return $text;
+
+    /* Try to find translation. */
+    $translation = $trans[$text];
+    if (empty ($translation))
+        return $text;
+
+    return $translation;
 }
 
 ?>