Changeset 1084 for trunk/wifidog-auth/wifidog/classes/Locale.php

Timestamp:

08/29/06 12:34:21 (6 years ago)

Author:

max-horvath

Message:

"2006-08-29 Max Horvath <max.horvath@…>

• Cleaned up PHPdoc tags
• Updated german translation
• Updated portuguese translation, thanks to Gabriel Hahmann
• Added spanish translation, thanks to Ricardo Jose Guevara Ochoa"

Files:

• trunk/wifidog-auth/wifidog/classes/Locale.php (modified) (3 diffs)

trunk/wifidog-auth/wifidog/classes/Locale.php

@@ -219 +219 @@
          global $AVAIL_LOCALE_ARRAY;
         $retval = false;
- 
+
         // Get new locale ID, assume default if null
         if ($locale != null) {
@@ -245 +245 @@
             $candidate_locale_array[] = $lang_only_locale_id;
 
-             
+
             $current_locale = setlocale(LC_ALL, $candidate_locale_array);
                //echo sprintf("Warning in /classes/Locale.php setCurentLocale: Unable to setlocale() to %s: %s.  I tried %s, %s, %s, %s, and got return value: %s, current locale is: %s",$q, $locale_id, $candidate_locale_array[0], $candidate_locale_array[1], $candidate_locale_array[2], $candidate_locale_array[3], $current_locale, setlocale(LC_ALL, 0))."<br/>";
@@ -381 +381 @@
         switch ($preflang_result['languages_iso_639_1_id']) {
             case ('fr') :
-                {
-                    $str .= "$resultats[french_name], $resultats[country_french_name]";
-                    break;
-                }
+                $str .= "$resultats[french_name], $resultats[country_french_name]";
+                break;
+
             case ('en') :
-                {
-                    $str .= "$resultats[english_name], $resultats[country_english_name]";
-                    break;
-                }
+                $str .= "$resultats[english_name], $resultats[country_english_name]";
+                break;
+
+            case ('es') :
+                $str .= "$resultats[spanish_name], $resultats[country_spanish_name]";
+                break;
+
             case ('de') :
-                {
-                    $str .= "$resultats[german_name], $resultats[country_german_name]";
-                    break;
-                }
+                $str .= "$resultats[german_name], $resultats[country_german_name]";
+                break;
+
+            case ('ja') :
+                $str .= "$resultats[japanese_name], $resultats[country_japanese_name]";
+                break;
+
             case ('pt') :
-                {
-                    $str .= "$resultats[portuguese_name], $resultats[country_portuguese_name]";
-                    break;
-                }
+                $str .= "$resultats[portuguese_name], $resultats[country_portuguese_name]";
+                break;
+
             default :
-                {
-                    $str .= "$resultats[french_name], $resultats[country_french_name]";
-                    break;
-                }
+                $str .= "$resultats[french_name], $resultats[country_french_name]";
+                break;
         }