Merge "(Bug 44987) Allow n=form in plural syntax"

diff --combined languages/Language.php
index 9ae3d29,7611e54..ef6a367
--- 1/languages/Language.php
--- 2/languages/Language.php
+++ b/languages/Language.php
@@@ -3007,18 -3007,6 +3007,18 @@@ class Language 
                return $number;
        }
  
 +      /**
 +       * Front-end for non-commafied formatNum
 +       *
 +       * @param mixed $number the string to be formatted, should be an integer
 +       *        or a floating point number.
 +       * @since 1.21
 +       * @return string
 +       */
 +      public function formatNumNoSeparators( $number ) {
 +              return $this->formatNum( $number, true );
 +      }
 +
        /**
         * @param $number string
         * @return string
@@@ -3532,11 -3520,12 +3532,12 @@@
                        return '';
                }
  
-               // Handle explicit 0= and 1= forms
+               // Handle explicit n=pluralform cases
                foreach ( $forms as $index => $form ) {
-                       if ( isset( $form[1] ) && $form[1] === '=' ) {
-                               if ( $form[0] === (string) $count ) {
-                                       return substr( $form, 2 );
+                       if ( preg_match( '/\d+=/i', $form ) ) {
+                               $pos = strpos( $form, '=' );
+                               if ( substr( $form, 0, $pos ) === (string) $count ) {
+                                       return substr( $form, $pos + 1 );
                                }
                                unset( $forms[$index] );
                        }

diff --combined tests/phpunit/languages/LanguageTest.php
index 3c9ca23,eba63dc..9de6722
--- 1/tests/phpunit/languages/LanguageTest.php
--- 2/tests/phpunit/languages/LanguageTest.php
+++ b/tests/phpunit/languages/LanguageTest.php
@@@ -439,10 -439,10 +439,10 @@@ class LanguageTest extends LanguageClas
  
        function provideLanguageCodes() {
                return array(
 -                      array( 'fr'       , 'Two letters, minor case' ),
 -                      array( 'EN'       , 'Two letters, upper case' ),
 -                      array( 'tyv'      , 'Three letters' ),
 -                      array( 'tokipona'   , 'long language code' ),
 +                      array( 'fr', 'Two letters, minor case' ),
 +                      array( 'EN', 'Two letters, upper case' ),
 +                      array( 'tyv', 'Three letters' ),
 +                      array( 'tokipona', 'long language code' ),
                        array( 'be-tarask', 'With dash' ),
                        array( 'Zh-classical', 'Begin with upper case, dash' ),
                        array( 'Be-x-old', 'With extension (two dashes)' ),
@@@ -455,7 -455,7 +455,7 @@@
         */
        function testKnownLanguageTag( $code, $message = '' ) {
                $this->assertTrue(
 -                      (bool) Language::isKnownLanguageTag( $code ),
 +                      (bool)Language::isKnownLanguageTag( $code ),
                        "validating code $code - $message"
                );
        }
@@@ -473,11 -473,11 +473,11 @@@
         */
        function testKnownCldrLanguageTag() {
                if ( !class_exists( 'LanguageNames' ) ) {
 -                      $this->markTestSkipped( 'reason' );
 +                      $this->markTestSkipped( 'The LanguageNames class is not available. The cldr extension is probably not installed.' );
                }
  
                $this->assertTrue(
 -                      (bool) Language::isKnownLanguageTag( 'pal' ),
 +                      (bool)Language::isKnownLanguageTag( 'pal' ),
                        'validating code "pal" an ancient language, which probably will not appear in Names.php, but appears in CLDR in English'
                );
        }
@@@ -488,7 -488,7 +488,7 @@@
         */
        function testUnknownLanguageTag( $code, $message = '' ) {
                $this->assertFalse(
 -                      (bool) Language::isKnownLanguageTag( $code ),
 +                      (bool)Language::isKnownLanguageTag( $code ),
                        "checking that code $code is invalid - $message"
                );
        }
@@@ -509,7 -509,6 +509,7 @@@
                        "sprintfDate('$format', '$ts'): $msg"
                );
        }
 +
        /**
         * bug 33454. sprintfDate should always use UTC.
         * @dataProvider provideSprintfDateSamples
@@@ -959,6 -958,7 +959,6 @@@
        }
  
  
 -
        /**
         * @dataProvider provideFormatDuration
         */
@@@ -1101,13 -1101,13 +1101,13 @@@
        function testCheckTitleEncoding( $s ) {
                $this->assertEquals(
                        $s,
 -                      $this->getLang()->checkTitleEncoding($s),
 +                      $this->getLang()->checkTitleEncoding( $s ),
                        "checkTitleEncoding('$s')"
                );
        }
  
        function provideCheckTitleEncodingData() {
 -              return array (
 +              return array(
                        array( "" ),
                        array( "United States of America" ), // 7bit ASCII
                        array( rawurldecode( "S%C3%A9rie%20t%C3%A9l%C3%A9vis%C3%A9e" ) ),
@@@ -1212,7 -1212,7 +1212,7 @@@
                        array( 7000, 'MMMMMMM' ),
                        array( 8000, 'MMMMMMMM' ),
                        array( 9000, 'MMMMMMMMM' ),
 -                      array( 9999, 'MMMMMMMMMCMXCIX'),
 +                      array( 9999, 'MMMMMMMMMCMXCIX' ),
                        array( 10000, 'MMMMMMMMMM' ),
                );
        }
@@@ -1227,6 -1227,9 +1227,9 @@@
  
        function providePluralData() {
                return array(
+                       array( 'plural', 0, array(
+                               'singular', 'plural'
+                       ) ),
                        array( 'explicit zero', 0, array(
                                '0=explicit zero', 'singular', 'plural'
                        ) ),
@@@ -1239,6 -1242,15 +1242,15 @@@
                        array( 'plural', 3, array(
                                '0=explicit zero', '1=explicit one', 'singular', 'plural'
                        ) ),
+                       array( 'explicit elevan', 11, array(
+                               'singular', 'plural', '11=explicit elevan',
+                       ) ),
+                       array( 'plural', 12, array(
+                               'singular', 'plural', '11=explicit twelve',
+                       ) ),
+                       array( 'plural', 12, array(
+                               'singular', 'plural', '=explicit form',
+                       ) ),
                );
        }
  
@@@ -1311,7 -1323,7 +1323,7 @@@
                $s = $lang->getMessageFromDB( 'word-separator' );
                $c = $lang->getMessageFromDB( 'comma-separator' );
  
 -              $this->assertEquals( '', $lang->listToText( array( ) ) );
 +              $this->assertEquals( '', $lang->listToText( array() ) );
                $this->assertEquals( 'a', $lang->listToText( array( 'a' ) ) );
                $this->assertEquals( "a{$and}{$s}b", $lang->listToText( array( 'a', 'b' ) ) );
                $this->assertEquals( "a{$c}b{$and}{$s}c", $lang->listToText( array( 'a', 'b', 'c' ) ) );