X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=languages%2Fclasses%2FLanguageEo.php;h=0e2d8b4acf2584634620609224efc5999511bf58;hb=6abd85ca9210551ad8f09d2d2424350fc0b21cb3;hp=8f8432242be800cc1d3a49008c06dba606094227;hpb=bcda3de17cbe46994c0e6c7cf614f9c7e82542cb;p=lhc%2Fweb%2Fwiklou.git

diff --git a/languages/classes/LanguageEo.php b/languages/classes/LanguageEo.php
index 8f8432242b..0e2d8b4acf 100644
--- 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,49 +95,25 @@ 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 );
 	}
 
-	/**
-	 * @param $s string
-	 * @return string
-	 */
-	function checkTitleEncoding( $s ) {
-		# Check for X-system backwards-compatibility URLs
-		$ishigh = preg_match( '/[\x80-\xff]/', $s );
-		$isutf = preg_match( '/^([\x00-\x7f]|[\xc0-\xdf][\x80-\xbf]|' .
-			'[\xe0-\xef][\x80-\xbf]{2}|[\xf0-\xf7][\x80-\xbf]{3})+$/', $s );
-
-		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 ) )
-			return $s;
-		}
-
-		// if( preg_match( '/[cghjsu]x/i', $s ) )
-		//	return $this->iconv( 'x', 'utf-8', $s );
-		return $s;
-	}
-
 	function initEncoding() {
 		global $wgEditEncoding;
 		$wgEditEncoding = 'x';