X-Git-Url: https://git.p6c8.net/jirafeau_mojo42.git/blobdiff_plain/9d3160e354918d84b84e6979cbd5215435ef3f5c..9b1e04d31f80fd39c55d710def8eb180918fa33f:/lib/lang.php?ds=sidebyside

diff --git a/lib/lang.php b/lib/lang.php
index 263afb0..cc0a9ac 100644
--- a/lib/lang.php
+++ b/lib/lang.php
@@ -1,66 +1,84 @@
-<?php
-/*
- *  Jirafeau, your web file repository
- *  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
- *  published by the Free Software Foundation, either version 3 of the
- *  License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Affero General Public License for more details.
- *
- *  You should have received a copy of the GNU Affero General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
- global $languages_list;
- $languages_list = array ('auto' => 'Automatic',
-                          'en' => 'English',
-                          'fr' => 'Français');
-
-/* Translation */
-function t ($text)
-{
-    $cfg = $GLOBALS['cfg'];
-    $languages_list = $GLOBALS['languages_list'];
-
-    /* Detect user's langage if we are in automatic mode. */
-    if (strcmp ($cfg['lang'], 'auto') == 0)
-        $l = substr ($_SERVER['HTTP_ACCEPT_LANGUAGE'], 0, 2);
-    else
-        $l = $cfg['lang'];
-
-    /* Is the langage in the list ? */
-    $found = false;
-    foreach ($languages_list as $key => $v)
-        if (strcmp ($l, $key) == 0)
-            $found = true;
-
-    /* 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;
-}
-
-?>
+<?php
+/*
+ *  Jirafeau, your web file repository
+ *  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
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+function t($string_id)
+{
+    $r = t_in($string_id, t_select_lang());
+    if ($r === false) {
+        $r = t_in($string_id, "en");
+        if ($r === false) {
+            return "FIX ME: " . $string_id;
+        }
+    }
+    return $r;
+}
+
+function t_select_lang() {
+    $cfg = $GLOBALS['cfg'];
+    if (strcmp($cfg['lang'], 'auto') != 0) {
+        return $cfg['lang'];
+    }
+    else if (isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
+        return substr($_SERVER['HTTP_ACCEPT_LANGUAGE'], 0, 2);
+    } else {
+        return "en";
+    }
+}
+
+function t_in($string_id, $lang) {
+    $trans = t_get_json($lang);
+    if ($trans === false) {
+        return false;
+    }
+    if (!array_key_exists($string_id, $trans)) {
+        return false;
+    }
+    return $trans[$string_id];
+}
+
+function t_get_raw_json($lang) {
+    $p = JIRAFEAU_ROOT . "lib/locales/$lang.json";
+    if (!file_exists($p)) {
+        return false;
+    }
+    $json = file_get_contents($p);
+    if ($json === false) {
+        return false;
+    }
+    return $json;
+}
+
+function t_get_json($lang) {
+    $raw_j = t_get_raw_json($lang);
+    $array = json_decode($raw_j, true);
+    if ($array === null) {
+        return false;
+    }
+    return $array;
+}
+
+function json_lang_generator($lang) {
+    $r = "";
+    if ($lang === null) {
+        $r = t_get_raw_json(t_select_lang());
+    } else {
+        $r = t_get_raw_json($lang);
+    }
+    return $r === false ? "{}" : $r;
+}