Revert r51128, and its follow-up revisions r51129, r51130, r51390.

[lhc/web/wiklou.git] / languages / LanguageConverter.php

diff --git a/languages/LanguageConverter.php b/languages/LanguageConverter.php
index 10105fe..57af7bc 100644 (file)
--- a/languages/LanguageConverter.php
+++ b/languages/LanguageConverter.php
@@ -176,25 +176,39 @@ class LanguageConverter {
                        return $this->mPreferredVariant;
                }
 
-               # FIXME rewrite code for parsing http header. The current code
-               # is written specific for detecting zh- variants
                if( !$this->mPreferredVariant ) {
                        // see if some supported language variant is set in the
                        // http header, but we don't set the mPreferredVariant
                        // variable in case this is called before the user's
                        // preference is loaded
-                       $pv=$this->mMainLanguageCode;
-                       if(array_key_exists('HTTP_ACCEPT_LANGUAGE', $_SERVER)) {
-                               $header = str_replace( '_', '-', strtolower($_SERVER["HTTP_ACCEPT_LANGUAGE"]));
-                               $zh = strstr($header, $pv.'-');
-                               if($zh) {
-                                       $ary = split("[,;]",$zh);
-                                       $pv = $ary[0];
+                       if( array_key_exists( 'HTTP_ACCEPT_LANGUAGE', $_SERVER ) ) {
+                               $acceptLanguage = strtolower( $_SERVER['HTTP_ACCEPT_LANGUAGE'] );
+                               
+                               // explode by comma
+                               $result = explode(',', $acceptLanguage);
+                               
+                               $languages  = array();
+
+                               foreach( $result as $elem ) {
+                                       // if $elem likes 'zh-cn;q=0.9'
+                                       if(($posi = strpos( $elem, ';' )) !== false ) {
+                                               // get the real language code likes 'zh-cn'
+                                               $languages[] = substr( $elem, 0, $posi );
+                                       }
+                                       else {
+                                               $languages[] = $elem;
+                                       }
+                               }
+
+                               foreach( $languages as $language ) {
+                                       // strip whitespace
+                                       $language = trim( $language );
+                                       if( in_array( $language, $this->mVariants ) ) {
+                                               return $language;
+                                               break;
+                                       }
                                }
                        }
-                       // don't try to return bad variant
-                       if(in_array( $pv, $this->mVariants ))
-                               return $pv;
                }
 
                return $this->mMainLanguageCode;
@@ -866,6 +880,9 @@ class LanguageConverter {
         * @public
         */
        function armourMath($text){ 
+               // we need to convert '-{' and '}-' to '-{' and '}-'
+               // to avoid a unwanted '}-' appeared after the math-image.
+               $text = strtr( $text, array('-{' => '-{', '}-' => '}-') );
                $ret = $this->mMarkup['begin'] . 'R|' . $text . $this->mMarkup['end'];
                return $ret;
        }
@@ -981,7 +998,7 @@ class ConverterRule {
                                if ( in_array($variant, $flags) )
                                        $flags_temp[] = $variant;
                        }
-                       if ( count($flags_temp) == 0 )
+                       if ( count($flags_temp) !== 0 )
                                $flags = $flags_temp;
                }
                if ( count($flags) == 0 )
@@ -1013,11 +1030,15 @@ class ConverterRule {
                //        [2] => ''
                //       )
                $varsep_pattern = '/' . $markup['varsep'] . '\s*' . '(?=';
-               foreach( $variants as $variant )
-                       $varsep_pattern .= $variant . '\s*' . $markup['codesep'] . '|';
+               foreach( $variants as $variant ) {
+                       $varsep_pattern .= $variant . '\s*' . $markup['codesep'] . '|'; // zh-hans:xxx;zh-hant:yyy
+                       $varsep_pattern .= '[^;]*?' . $markup['unidsep'] . '\s*' . $variant
+                                                       . '\s*' . $markup['codesep'] . '|'; // xxx=>zh-hans:yyy; xxx=>zh-hant:zzz
+               }
                $varsep_pattern .= '\s*$)/';
 
                $choice = preg_split($varsep_pattern, $rules);
+
                foreach( $choice as $c ) {
                        $v  = explode($markup['codesep'], $c, 2);
                        if( count($v) != 2 )