[BUGFIX] Catch errors in upload form

[jirafeau_project.git] / lib / lang.php

diff --git a/lib/lang.php b/lib/lang.php
index 7748054755777a573c6b40a4ecccb270de450230..4c5bce267e9fb6b76415f0bdd21986ab9961f5b8 100644 (file)
--- a/lib/lang.php
+++ b/lib/lang.php
@@ -18,7 +18,7 @@
  */
 
 global $languages_list;
  */
 
 global $languages_list;

-$languages_list = array ('auto' => 'Automatic',
+$languages_list = array('auto' => 'Automatic',

                          'de'   => 'Deutsch',
                          'en'   => 'English',
                          'el'   => 'Ελληνικά',
                          'de'   => 'Deutsch',
                          'en'   => 'English',
                          'el'   => 'Ελληνικά',


@@ -34,78 +34,85 @@ $languages_list = array ('auto' => 'Automatic',
                          'zh'   => '汉语');
 
 /* Translation */
                          'zh'   => '汉语');
 
 /* Translation */

-function t ($text)
+function t($text)

 {
     $cfg = $GLOBALS['cfg'];
     $languages_list = $GLOBALS['languages_list'];
 
     /* Detect user's langage if we are in automatic mode. */
 {
     $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
+    if (strcmp($cfg['lang'], 'auto') == 0) {
+        if (isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
+            $l = substr($_SERVER['HTTP_ACCEPT_LANGUAGE'], 0, 2);
+        } else {

             $l = "en";
             $l = "en";

-    }
-    else
+        }
+    } else {

         $l = $cfg['lang'];
         $l = $cfg['lang'];

+    }

 
     /* Is the langage in the list ? */
     $found = false;
 
     /* Is the langage in the list ? */
     $found = false;

-    foreach ($languages_list as $key => $v)
-        if (strcmp ($l, $key) == 0)
+    foreach ($languages_list as $key => $v) {
+        if (strcmp($l, $key) == 0) {

             $found = true;
             $found = true;

+        }
+    }

 
     /* Don't translate english. */
 
     /* Don't translate english. */

-    if (!($found && strcmp ($l, "en")))
+    if (!($found && strcmp($l, "en"))) {

         return $text;
         return $text;

+    }

 
     /* Open translation file. */
 
     /* Open translation file. */

-    $trans_j = file_get_contents (JIRAFEAU_ROOT . "lib/locales/$l.json");
-    if ($trans_j === FALSE)
+    $trans_j = file_get_contents(JIRAFEAU_ROOT . "lib/locales/$l.json");
+    if ($trans_j === false) {

         return $text;
         return $text;

+    }

 
     /* Decode JSON. */
 
     /* Decode JSON. */

-    $trans = json_decode ($trans_j, true);
-    if ($trans === NULL)
+    $trans = json_decode($trans_j, true);
+    if ($trans === null) {

         return $text;
         return $text;

+    }

 
     /* Try to find translation. */
 
     /* Try to find translation. */

-    if (!array_key_exists ($text, $trans))
+    if (!array_key_exists($text, $trans)) {

         return $text;
         return $text;

+    }

 
     return $trans[$text];
 }
 
 
     return $trans[$text];
 }
 

-function json_lang_generator ()
+function json_lang_generator()

 {
     $cfg = $GLOBALS['cfg'];
     $languages_list = $GLOBALS['languages_list'];
 
     /* Detect user's langage if we are in automatic mode. */
 {
     $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
+    if (strcmp($cfg['lang'], 'auto') == 0) {
+        if (isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
+            $l = substr($_SERVER['HTTP_ACCEPT_LANGUAGE'], 0, 2);
+        } else {

             $l = "en";
             $l = "en";

-    }
-    else
+        }
+    } else {

         $l = $cfg['lang'];
         $l = $cfg['lang'];

+    }

 
     /* Is the langage in the list ? */
     $found = false;
 
     /* Is the langage in the list ? */
     $found = false;

-    foreach ($languages_list as $key => $v)
-        if (strcmp ($l, $key) == 0)
+    foreach ($languages_list as $key => $v) {
+        if (strcmp($l, $key) == 0) {

             $found = true;
             $found = true;

+        }
+    }

 
     /* Don't translate english. */
 
     /* Don't translate english. */

-    if (!($found && strcmp ($l, "en")))
+    if (!($found && strcmp($l, "en"))) {

         return "{}";
         return "{}";

+    }

 
     /* Open translation file. */
 
     /* Open translation file. */

-    $trans_j = file_get_contents (JIRAFEAU_ROOT . "lib/locales/$l.json");
+    $trans_j = file_get_contents(JIRAFEAU_ROOT . "lib/locales/$l.json");

     return $trans_j;
 }
     return $trans_j;
 }

-
-?>