X-Git-Url: https://git.p6c8.net/jirafeau.git/blobdiff_plain/9a9c9a8bf83241c193c5bef6361d41893e72dfd3..6cdb006ec660dc477c857a95601e3ba50244add0:/lib/lang.php

diff --git a/lib/lang.php b/lib/lang.php
index 4c5bce2..c3f9485 100644
--- a/lib/lang.php
+++ b/lib/lang.php
@@ -28,91 +28,77 @@ $languages_list = array('auto' => 'Automatic',
                          'fr'   => 'Français',
                          'it'   => 'Italiano',
                          'nl'   => 'Nederlands',
+                         'pl'   => 'Polszczyzna',
+                         'pt'   => 'português',
+                         'pt_BR'   => 'português (Brasil)',
                          'ro'   => 'Limba română',
                          'ru'   => 'ру́сский',
                          'sk'   => 'Slovenčina',
+                         'tr'   => 'Türkçe',
                          'zh'   => '汉语');
 
-/* Translation */
-function t($text)
+function t($string_id)
 {
-    $cfg = $GLOBALS['cfg'];
-    $languages_list = $GLOBALS['languages_list'];
-
-    /* Detect user's langage if we are in automatic mode. */
-    if (strcmp($cfg['lang'], 'auto') == 0) {
-        if (isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
-            $l = substr($_SERVER['HTTP_ACCEPT_LANGUAGE'], 0, 2);
-        } else {
-            $l = "en";
-        }
-    } 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;
+    $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;
+}
 
-    /* Don't translate english. */
-    if (!($found && strcmp($l, "en"))) {
-        return $text;
+function t_select_lang() {
+    $cfg = $GLOBALS['cfg'];
+    if (strcmp($cfg['lang'], 'auto') != 0) {
+        return $cfg['lang'];
     }
-
-    /* Open translation file. */
-    $trans_j = file_get_contents(JIRAFEAU_ROOT . "lib/locales/$l.json");
-    if ($trans_j === false) {
-        return $text;
+    else if (isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
+        return substr($_SERVER['HTTP_ACCEPT_LANGUAGE'], 0, 2);
+    } else {
+        return "en";
     }
+}
 
-    /* Decode JSON. */
-    $trans = json_decode($trans_j, true);
-    if ($trans === null) {
-        return $text;
+function t_in($string_id, $lang) {
+    $trans = t_get_json($lang);
+    if ($trans === false) {
+        return false;
     }
-
-    /* Try to find translation. */
-    if (!array_key_exists($text, $trans)) {
-        return $text;
+    if (!array_key_exists($string_id, $trans)) {
+        return false;
     }
-
-    return $trans[$text];
+    return $trans[$string_id];
 }
 
-function json_lang_generator()
-{
-    $cfg = $GLOBALS['cfg'];
-    $languages_list = $GLOBALS['languages_list'];
-
-    /* Detect user's langage if we are in automatic mode. */
-    if (strcmp($cfg['lang'], 'auto') == 0) {
-        if (isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
-            $l = substr($_SERVER['HTTP_ACCEPT_LANGUAGE'], 0, 2);
-        } else {
-            $l = "en";
-        }
-    } else {
-        $l = $cfg['lang'];
+function t_get_raw_json($lang) {
+    $p = JIRAFEAU_ROOT . "lib/locales/$lang.json";
+    if (!file_exists($p)) {
+        return false;
     }
-
-    /* Is the langage in the list ? */
-    $found = false;
-    foreach ($languages_list as $key => $v) {
-        if (strcmp($l, $key) == 0) {
-            $found = true;
-        }
+    $json = file_get_contents($p);
+    if ($json === false) {
+        return false;
     }
+    return $json;
+}
 
-    /* Don't translate english. */
-    if (!($found && strcmp($l, "en"))) {
-        return "{}";
+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;
+}
 
-    /* Open translation file. */
-    $trans_j = file_get_contents(JIRAFEAU_ROOT . "lib/locales/$l.json");
-    return $trans_j;
+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;
 }