Merge remote-tracking branch 'origin/master'

[jirafeau_project.git] / lib / lang.php

diff --git a/lib/lang.php b/lib/lang.php
index 263afb07f172827341fb0cbc985dfc321dc13629..0aec1e4fa63e958aef4ecf01cb8e71ed03c04478 100644 (file)
--- a/lib/lang.php
+++ b/lib/lang.php
@@ -19,8 +19,13 @@
 \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
                           '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

 \r
 /* Translation */\r
 function t ($text)\r
 \r
 /* Translation */\r
 function t ($text)\r


@@ -51,16 +56,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