| Index: trunk/phase3/includes/zhtable/tradphrases.manual |
| — | — | @@ -3123,7 +3123,7 @@ |
| 3124 | 3124 | 皆可作澱 |
| 3125 | 3125 | 澱山 |
| 3126 | 3126 | 澱澱 |
| 3127 | | -掛鈎 |
| | 3127 | +掛鉤 |
| 3128 | 3128 | 薴悴 |
| 3129 | 3129 | 絡腮鬍 |
| 3130 | 3130 | 落腮鬍 |
| — | — | @@ -3138,4 +3138,6 @@ |
| 3139 | 3139 | 鬍髯 |
| 3140 | 3140 | 髯鬍 |
| 3141 | 3141 | 髭鬍 |
| 3142 | | -鬚鬍 |
| \ No newline at end of file |
| | 3142 | +鬚鬍 |
| | 3143 | +范文瀾 |
| | 3144 | +發表 |
| \ No newline at end of file |
| Index: trunk/phase3/includes/zhtable/toTrad.manual |
| — | — | @@ -65,4 +65,6 @@ |
| 66 | 66 | 不干預 不干預 |
| 67 | 67 | 不干擾 不干擾 |
| 68 | 68 | 不干牠 不干牠 |
| 69 | | -矽谷 矽谷 |
| \ No newline at end of file |
| | 69 | +矽谷 矽谷 |
| | 70 | +范文瀾 范文瀾 |
| | 71 | +發表 發表 |
| \ No newline at end of file |
| Index: trunk/phase3/includes/zhtable/simpphrases.manual |
| — | — | @@ -2200,4 +2200,5 @@ |
| 2201 | 2201 | 幺谦 |
| 2202 | 2202 | 麴义 |
| 2203 | 2203 | 麴英 |
| 2204 | | -麯崇裕 |
| \ No newline at end of file |
| | 2204 | +麯崇裕 |
| | 2205 | +阿部正瞭 |
| \ No newline at end of file |
| Index: trunk/phase3/includes/ZhConversion.php |
| — | — | @@ -5279,7 +5279,7 @@ |
| 5280 | 5280 | '掌柜' => '掌柜', |
| 5281 | 5281 | '排骨面' => '排骨麵', |
| 5282 | 5282 | '挂帘' => '掛帘', |
| 5283 | | -'挂钩' => '掛鈎', |
| | 5283 | +'挂钩' => '掛鉤', |
| 5284 | 5284 | '挂钟' => '掛鐘', |
| 5285 | 5285 | '采下' => '採下', |
| 5286 | 5286 | '采伐' => '採伐', |
| — | — | @@ -6376,6 +6376,8 @@ |
| 6377 | 6377 | '发签' => '發籤', |
| 6378 | 6378 | '发庄' => '發莊', |
| 6379 | 6379 | '发着' => '發著', |
| | 6380 | +'发表' => '發表', |
| | 6381 | +'發表' => '發表', |
| 6380 | 6382 | '发松' => '發鬆', |
| 6381 | 6383 | '发面' => '發麵', |
| 6382 | 6384 | '白干' => '白乾', |
| — | — | @@ -7055,6 +7057,8 @@ |
| 7056 | 7058 | '英占' => '英佔', |
| 7057 | 7059 | '苹萦' => '苹縈', |
| 7058 | 7060 | '茂都淀' => '茂都澱', |
| | 7061 | +'范文瀾' => '范文瀾', |
| | 7062 | +'范文澜' => '范文瀾', |
| 7059 | 7063 | '范登堡' => '范登堡', |
| 7060 | 7064 | '茶几' => '茶几', |
| 7061 | 7065 | '茶庄' => '茶莊', |
| — | — | @@ -14051,6 +14055,7 @@ |
| 14052 | 14056 | '閑著稱' => '闲著称', |
| 14053 | 14057 | '閑著者' => '闲著者', |
| 14054 | 14058 | '閑著述' => '闲著述', |
| | 14059 | +'阿部正瞭' => '阿部正瞭', |
| 14055 | 14060 | '附著' => '附着', |
| 14056 | 14061 | '附睪' => '附睾', |
| 14057 | 14062 | '附著書' => '附著书', |
| Index: trunk/phase3/languages/LanguageConverter.php |
| — | — | @@ -177,25 +177,22 @@ |
| 178 | 178 | return $this->mPreferredVariant; |
| 179 | 179 | } |
| 180 | 180 | |
| 181 | | - # FIXME rewrite code for parsing http header. The current code |
| 182 | | - # is written specific for detecting zh- variants |
| 183 | 181 | if( !$this->mPreferredVariant ) { |
| 184 | 182 | // see if some supported language variant is set in the |
| 185 | 183 | // http header, but we don't set the mPreferredVariant |
| 186 | 184 | // variable in case this is called before the user's |
| 187 | 185 | // preference is loaded |
| 188 | | - $pv=$this->mMainLanguageCode; |
| 189 | | - if(array_key_exists('HTTP_ACCEPT_LANGUAGE', $_SERVER)) { |
| 190 | | - $header = str_replace( '_', '-', strtolower($_SERVER["HTTP_ACCEPT_LANGUAGE"])); |
| 191 | | - $zh = strstr($header, $pv.'-'); |
| 192 | | - if($zh) { |
| 193 | | - $ary = split("[,;]",$zh); |
| 194 | | - $pv = $ary[0]; |
| | 186 | + $preferredVariant = $this->mMainLanguageCode; |
| | 187 | + if( array_key_exists( 'HTTP_ACCEPT_LANGUAGE', $_SERVER ) ) { |
| | 188 | + $acceptLanguage = str_replace( '_', '-', strtolower($_SERVER["HTTP_ACCEPT_LANGUAGE"])); |
| | 189 | + $languages = preg_split('/[,;]/', $acceptLanguage); |
| | 190 | + foreach( $languages as $language ) { |
| | 191 | + if( in_array( $language, $this->mVariants ) ) { |
| | 192 | + return $language; |
| | 193 | + break; |
| | 194 | + } |
| 195 | 195 | } |
| 196 | 196 | } |
| 197 | | - // don't try to return bad variant |
| 198 | | - if(in_array( $pv, $this->mVariants )) |
| 199 | | - return $pv; |
| 200 | 197 | } |
| 201 | 198 | |
| 202 | 199 | return $this->mMainLanguageCode; |
| — | — | @@ -870,6 +867,9 @@ |
| 871 | 868 | * @public |
| 872 | 869 | */ |
| 873 | 870 | function armourMath($text){ |
| | 871 | + // we need to convert '-{' and '}-' to '-{' and '}-' |
| | 872 | + // to avoid a unwanted '}-' appeared after the math-image. |
| | 873 | + $text = strtr( $text, array('-{' => '-{', '}-' => '}-') ); |
| 874 | 874 | $ret = $this->mMarkup['begin'] . 'R|' . $text . $this->mMarkup['end']; |
| 875 | 875 | return $ret; |
| 876 | 876 | } |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -372,6 +372,8 @@ |
| 373 | 373 | * Added uiprop=changeablegroups to meta=userinfo |
| 374 | 374 | * Added usprop=gender to list=users |
| 375 | 375 | * (bug 18311) action=purge now works for images too |
| | 376 | +* Fixed a bug caused by LanguageConverter.php, which brings an abnormal '}-' |
| | 377 | + after some parsed math syntax. |
| 376 | 378 | |
| 377 | 379 | === Languages updated in 1.15 === |
| 378 | 380 | |