Merge branch 'master' of gitlab.com:mojo42/Jirafeau

[jirafeau_project.git] / lib / lang.php

diff --git a/lib/lang.php b/lib/lang.php
index fba5dbed809895926efa5ea90b29bdd8caa88e1a..cc70b3d35639204369e4937c95fa36d853c720db 100644 (file)
--- a/lib/lang.php
+++ b/lib/lang.php
@@ -21,7 +21,12 @@
  $languages_list = array ('auto' => 'Automatic',\r
                           'de' => 'Deutsch',\r
                           'en' => 'English',\r
  $languages_list = array ('auto' => 'Automatic',\r
                           'de' => 'Deutsch',\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


@@ -52,16 +57,14 @@ function t ($text)
 \r
     /* Decode JSON. */\r
     $trans = json_decode ($trans_j, true);\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
     if ($trans === NULL)\r
         return $text;\r
 \r
     /* Try to find translation. */\r

-    $translation = $trans[$text];\r
-    if (empty ($translation))\r
+    if (!array_key_exists ($text, $trans))\r

         return $text;\r
 \r
         return $text;\r
 \r

-    return $translation;\r
+    return $trans[$text];\r

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