Make $wgDummyLanguageCodes an associative array so it maps to the correct codes;...

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index d741b1b..65b9eb1 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -1876,19 +1876,19 @@ $wgExtraLanguageNames = array();
  * and excludes them when running the transstat.php script.
  */
 $wgDummyLanguageCodes = array(
-       'als',          # => 'gsw'
-       'bat-smg',      # => 'sgs'
-       'be-x-old',     # => 'be-tarask'
-       'bh',           # => 'bho'
-       'fiu-vro',      # => 'vro'
-       'nb',           # => 'no'
-       'qqq',          # Used for message documentation.
-       'qqx',          # Used for viewing message keys.
-       'roa-rup',      # => 'rup'
-       'simple',       # => 'en'
-       'zh-classical', # => 'lzh'
-       'zh-min-nan',   # => 'nan'
-       'zh-yue',       # => 'yue'
+       'als' => 'gsw',
+       'bat-smg' => 'sgs',
+       'be-x-old' => 'be-tarask',
+       'bh' => 'bho',
+       'fiu-vro' => 'vro',
+       'nb' => 'no',
+       'qqq' => 'qqq', # Used for message documentation.
+       'qqx' => 'qqx', # Used for viewing message keys.
+       'roa-rup' => 'rup',
+       'simple' => 'en',
+       'zh-classical' => 'lzh',
+       'zh-min-nan' => 'nan',
+       'zh-yue' => 'yue',
 );
 
 /**

diff --git a/includes/installer/WebInstallerPage.php b/includes/installer/WebInstallerPage.php
index 387001e..9237ee3 100644 (file)
--- a/includes/installer/WebInstallerPage.php
+++ b/includes/installer/WebInstallerPage.php
@@ -234,9 +234,8 @@ class WebInstaller_Language extends WebInstallerPage {
 
                $languages = Language::getLanguageNames();
                ksort( $languages );
-               $dummies = array_flip( $wgDummyLanguageCodes );
                foreach ( $languages as $code => $lang ) {
-                       if ( isset( $dummies[$code] ) ) continue;
+                       if ( isset( $wgDummyLanguageCodes[$code] ) ) continue;
                        $s .= "\n" . Xml::option( "$code - $lang", $code, $code == $selectedCode );
                }
                $s .= "\n</select>\n";

diff --git a/maintenance/language/transstat.php b/maintenance/language/transstat.php
index 6063cb9..fb08b7d 100644 (file)
--- a/maintenance/language/transstat.php
+++ b/maintenance/language/transstat.php
@@ -97,7 +97,7 @@ $wgRequiredMessagesNumber = count( $wgGeneralMessages['required'] );
 foreach ( $wgLanguages->getLanguages() as $code ) {
        # Don't check English, RTL English or dummy language codes
        if ( $code == 'en' || $code == 'enRTL' || (is_array( $wgDummyLanguageCodes ) &&
-               in_array( $code, $wgDummyLanguageCodes ) ) ) {
+               isset( $wgDummyLanguageCodes[$code] ) ) ) {
                continue;
        }