Merge "Cleaning up function definitions in Language.php"

diff --combined languages/Language.php
index 8c68b60,fb73b1e..2b98a18
--- 1/languages/Language.php
--- 2/languages/Language.php
+++ b/languages/Language.php
@@@ -261,10 -261,7 +261,10 @@@ class Language 
         * @since 1.21
         */
        public static function isSupportedLanguage( $code ) {
 -              return $code === strtolower( $code ) && is_readable( self::getMessagesFileName( $code ) );
 +              return self::isValidBuiltInCode( $code )
 +                      && ( is_readable( self::getMessagesFileName( $code ) )
 +                              || is_readable( self::getJsonMessagesFileName( $code ) )
 +              );
        }
  
        /**
@@@ -354,7 -351,7 +354,7 @@@
  
        /**
         * Returns true if a language code is of a valid form for the purposes of
 -       * internal customisation of MediaWiki, via Messages*.php.
 +       * internal customisation of MediaWiki, via Messages*.php or *.json.
         *
         * @param $code string
         *
@@@ -612,6 -609,7 +612,7 @@@
  
        /**
         * Returns gender-dependent namespace alias if available.
+        * See https://www.mediawiki.org/wiki/Manual:$wgExtraGenderNamespaces
         * @param $index Int: namespace index
         * @param $gender String: gender key (male, female... )
         * @return String
@@@ -625,8 -623,8 +626,8 @@@
        }
  
        /**
-        * Whether this language makes distinguishes genders for example in
-        * namespaces.
+        * Whether this language uses gender-dependent namespace aliases.
+        * See https://www.mediawiki.org/wiki/Manual:$wgExtraGenderNamespaces
         * @return bool
         * @since 1.18
         */
@@@ -913,16 -911,12 +914,16 @@@
                        # We do this using a foreach over the codes instead of a directory
                        # loop so that messages files in extensions will work correctly.
                        foreach ( $returnMw as $code => $value ) {
 -                              if ( is_readable( self::getMessagesFileName( $code ) ) ) {
 +                              if ( is_readable( self::getMessagesFileName( $code ) )
 +                                      || is_readable( self::getJsonMessagesFileName( $code ) )
 +                              ) {
                                        $namesMwFile[$code] = $names[$code];
                                }
                        }
 +
                        return $namesMwFile;
                }
 +
                # 'mw' option; default if it's not one of the other two options (all/mwfile)
                return $returnMw;
        }
@@@ -3590,7 -3584,7 +3591,7 @@@
        }
        /**
         * Provides an alternative text depending on specified gender.
-        * Usage {{gender:username|masculine|feminine|neutral}}.
+        * Usage {{gender:username|masculine|feminine|unknown}}.
         * username is optional, in which case the gender of current user is used,
         * but only in (some) interface messages; otherwise default gender is used.
         *
@@@ -3598,9 -3592,9 +3599,9 @@@
         * given, it will be returned unconditionally. These details are implied by
         * the caller and cannot be overridden in subclasses.
         *
-        * If more than one form is given, the default is to use the neutral one
-        * if it is specified, and to use the masculine one otherwise. These
-        * details can be overridden in subclasses.
+        * If three forms are given, the default is to use the third (unknown) form.
+        * If fewer than three forms are given, the default is to use the first (masculine) form.
+        * These details can be overridden in subclasses.
         *
         * @param $gender string
         * @param $forms array
@@@ -4055,7 -4049,10 +4056,7 @@@
         * @return string $prefix . $mangledCode . $suffix
         */
        public static function getFileName( $prefix = 'Language', $code, $suffix = '.php' ) {
 -              // Protect against path traversal
 -              if ( !Language::isValidCode( $code )
 -                      || strcspn( $code, ":/\\\000" ) !== strlen( $code )
 -              ) {
 +              if ( !self::isValidBuiltInCode( $code ) ) {
                        throw new MWException( "Invalid language code \"$code\"" );
                }
  
@@@ -4090,21 -4087,6 +4091,21 @@@
                return $file;
        }
  
 +      /**
 +       * @param $code string
 +       * @return string
 +       * @since 1.23
 +       */
 +      public static function getJsonMessagesFileName( $code ) {
 +              global $IP;
 +
 +              if ( !self::isValidBuiltInCode( $code ) ) {
 +                      throw new MWException( "Invalid language code \"$code\"" );
 +              }
 +
 +              return "$IP/languages/i18n/$code.json" ;
 +      }
 +
        /**
         * @param $code string
         * @return string