Merge "ForeignAPIRepo: Fetch thumb error from foreign repo"

[lhc/web/wiklou.git] / languages / classes / LanguageEo.php

diff --git a/languages/classes/LanguageEo.php b/languages/classes/LanguageEo.php
index 8f84322..39bdfb5 100644 (file)
--- a/languages/classes/LanguageEo.php
+++ b/languages/classes/LanguageEo.php
@@ -78,14 +78,14 @@ class LanguageEo extends Language {
         * @return string
         */
        function strrtuxCallback( $matches ) {
-               static $ux = array (
-                       'x' => 'xx' , 'X' => 'Xx' ,
-                       "\xc4\x88" => "Cx" , "\xc4\x89" => "cx" ,
-                       "\xc4\x9c" => "Gx" , "\xc4\x9d" => "gx" ,
-                       "\xc4\xa4" => "Hx" , "\xc4\xa5" => "hx" ,
-                       "\xc4\xb4" => "Jx" , "\xc4\xb5" => "jx" ,
-                       "\xc5\x9c" => "Sx" , "\xc5\x9d" => "sx" ,
-                       "\xc5\xac" => "Ux" , "\xc5\xad" => "ux"
+               static $ux = array(
+                       'x' => 'xx', 'X' => 'Xx',
+                       "\xc4\x88" => "Cx", "\xc4\x89" => "cx",
+                       "\xc4\x9c" => "Gx", "\xc4\x9d" => "gx",
+                       "\xc4\xa4" => "Hx", "\xc4\xa5" => "hx",
+                       "\xc4\xb4" => "Jx", "\xc4\xb5" => "jx",
+                       "\xc5\x9c" => "Sx", "\xc5\x9d" => "sx",
+                       "\xc5\xac" => "Ux", "\xc5\xad" => "ux",
                );
                return strtr( $matches[1], $ux );
        }
@@ -95,21 +95,21 @@ class LanguageEo extends Language {
         * @return string
         */
        function strrtxuCallback( $matches ) {
-               static $xu = array (
-                       'xx' => 'x' , 'xX' => 'x' ,
-                       'Xx' => 'X' , 'XX' => 'X' ,
-                       "Cx" => "\xc4\x88" , "CX" => "\xc4\x88" ,
-                       "cx" => "\xc4\x89" , "cX" => "\xc4\x89" ,
-                       "Gx" => "\xc4\x9c" , "GX" => "\xc4\x9c" ,
-                       "gx" => "\xc4\x9d" , "gX" => "\xc4\x9d" ,
-                       "Hx" => "\xc4\xa4" , "HX" => "\xc4\xa4" ,
-                       "hx" => "\xc4\xa5" , "hX" => "\xc4\xa5" ,
-                       "Jx" => "\xc4\xb4" , "JX" => "\xc4\xb4" ,
-                       "jx" => "\xc4\xb5" , "jX" => "\xc4\xb5" ,
-                       "Sx" => "\xc5\x9c" , "SX" => "\xc5\x9c" ,
-                       "sx" => "\xc5\x9d" , "sX" => "\xc5\x9d" ,
-                       "Ux" => "\xc5\xac" , "UX" => "\xc5\xac" ,
-                       "ux" => "\xc5\xad" , "uX" => "\xc5\xad"
+               static $xu = array(
+                       'xx' => 'x', 'xX' => 'x',
+                       'Xx' => 'X', 'XX' => 'X',
+                       "Cx" => "\xc4\x88", "CX" => "\xc4\x88",
+                       "cx" => "\xc4\x89", "cX" => "\xc4\x89",
+                       "Gx" => "\xc4\x9c", "GX" => "\xc4\x9c",
+                       "gx" => "\xc4\x9d", "gX" => "\xc4\x9d",
+                       "Hx" => "\xc4\xa4", "HX" => "\xc4\xa4",
+                       "hx" => "\xc4\xa5", "hX" => "\xc4\xa5",
+                       "Jx" => "\xc4\xb4", "JX" => "\xc4\xb4",
+                       "jx" => "\xc4\xb5", "jX" => "\xc4\xb5",
+                       "Sx" => "\xc5\x9c", "SX" => "\xc5\x9c",
+                       "sx" => "\xc5\x9d", "sX" => "\xc5\x9d",
+                       "Ux" => "\xc5\xac", "UX" => "\xc5\xac",
+                       "ux" => "\xc5\xad", "uX" => "\xc5\xad",
                );
                return strtr( $matches[1], $xu ) . strtr( $matches[2], $xu );
        }
@@ -127,9 +127,9 @@ class LanguageEo extends Language {
                if ( $ishigh and !$isutf ) {
                        # Assume Latin1
                        $s = utf8_encode( $s );
-               } else {
-                       if ( preg_match( '/(\xc4[\x88\x89\x9c\x9d\xa4\xa5\xb4\xb5]' .
-                               '|\xc5[\x9c\x9d\xac\xad])/', $s ) )
+               } elseif ( preg_match( '/(\xc4[\x88\x89\x9c\x9d\xa4\xa5\xb4\xb5]' .
+                               '|\xc5[\x9c\x9d\xac\xad])/', $s )
+               ) {
                        return $s;
                }