| Index: trunk/phase3/maintenance/language/transstat.php |
| — | — | @@ -97,7 +97,7 @@ |
| 98 | 98 | foreach ( $wgLanguages->getLanguages() as $code ) { |
| 99 | 99 | # Don't check English, RTL English or dummy language codes |
| 100 | 100 | if ( $code == 'en' || $code == 'enRTL' || (is_array( $wgDummyLanguageCodes ) && |
| 101 | | - in_array( $code, $wgDummyLanguageCodes ) ) ) { |
| | 101 | + isset( $wgDummyLanguageCodes[$code] ) ) ) { |
| 102 | 102 | continue; |
| 103 | 103 | } |
| 104 | 104 | |
| Index: trunk/phase3/includes/installer/WebInstallerPage.php |
| — | — | @@ -234,9 +234,8 @@ |
| 235 | 235 | |
| 236 | 236 | $languages = Language::getLanguageNames(); |
| 237 | 237 | ksort( $languages ); |
| 238 | | - $dummies = array_flip( $wgDummyLanguageCodes ); |
| 239 | 238 | foreach ( $languages as $code => $lang ) { |
| 240 | | - if ( isset( $dummies[$code] ) ) continue; |
| | 239 | + if ( isset( $wgDummyLanguageCodes[$code] ) ) continue; |
| 241 | 240 | $s .= "\n" . Xml::option( "$code - $lang", $code, $code == $selectedCode ); |
| 242 | 241 | } |
| 243 | 242 | $s .= "\n</select>\n"; |
| Index: trunk/phase3/includes/DefaultSettings.php |
| — | — | @@ -1876,19 +1876,19 @@ |
| 1877 | 1877 | * and excludes them when running the transstat.php script. |
| 1878 | 1878 | */ |
| 1879 | 1879 | $wgDummyLanguageCodes = array( |
| 1880 | | - 'als', # => 'gsw' |
| 1881 | | - 'bat-smg', # => 'sgs' |
| 1882 | | - 'be-x-old', # => 'be-tarask' |
| 1883 | | - 'bh', # => 'bho' |
| 1884 | | - 'fiu-vro', # => 'vro' |
| 1885 | | - 'nb', # => 'no' |
| 1886 | | - 'qqq', # Used for message documentation. |
| 1887 | | - 'qqx', # Used for viewing message keys. |
| 1888 | | - 'roa-rup', # => 'rup' |
| 1889 | | - 'simple', # => 'en' |
| 1890 | | - 'zh-classical', # => 'lzh' |
| 1891 | | - 'zh-min-nan', # => 'nan' |
| 1892 | | - 'zh-yue', # => 'yue' |
| | 1880 | + 'als' => 'gsw', |
| | 1881 | + 'bat-smg' => 'sgs', |
| | 1882 | + 'be-x-old' => 'be-tarask', |
| | 1883 | + 'bh' => 'bho', |
| | 1884 | + 'fiu-vro' => 'vro', |
| | 1885 | + 'nb' => 'no', |
| | 1886 | + 'qqq' => 'qqq', # Used for message documentation. |
| | 1887 | + 'qqx' => 'qqx', # Used for viewing message keys. |
| | 1888 | + 'roa-rup' => 'rup', |
| | 1889 | + 'simple' => 'en', |
| | 1890 | + 'zh-classical' => 'lzh', |
| | 1891 | + 'zh-min-nan' => 'nan', |
| | 1892 | + 'zh-yue' => 'yue', |
| 1893 | 1893 | ); |
| 1894 | 1894 | |
| 1895 | 1895 | /** |
| Index: trunk/extensions/WikimediaIncubator/IncubatorTest.php |
| — | — | @@ -415,7 +415,11 @@ |
| 416 | 416 | } elseif( !$prefix || $prefix['error'] ) { |
| 417 | 417 | return false; # shouldn't be, but you never know |
| 418 | 418 | } |
| 419 | | - global $wmincProjectDatabases; |
| | 419 | + global $wmincProjectDatabases, $wgDummyLanguageCodes; |
| | 420 | + $redirectcode = array_search( $prefix['lang'], $wgDummyLanguageCodes ); |
| | 421 | + if( $redirectcode ) { |
| | 422 | + $prefix['lang'] = $redirectcode; |
| | 423 | + } |
| 420 | 424 | return str_replace('-', '_', $prefix['lang'] ) . |
| 421 | 425 | $wmincProjectDatabases[$prefix['project']]; |
| 422 | 426 | } |