Merge "mediawiki.language: Implement non-digit-grouping of four-digit numbers"

diff --combined tests/qunit/suites/resources/mediawiki/mediawiki.language.test.js
index 7da1502,31548b6..e4db771
--- 1/tests/qunit/suites/resources/mediawiki/mediawiki.language.test.js
--- 2/tests/qunit/suites/resources/mediawiki/mediawiki.language.test.js
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.language.test.js
@@@ -49,11 -49,20 +49,20 @@@
                mw.language.setData( 'en', 'digitGroupingPattern', null );
                mw.language.setData( 'en', 'digitTransformTable', null );
                mw.language.setData( 'en', 'separatorTransformTable', { ',': '.', '.': ',' } );
+               mw.language.setData( 'en', 'minimumGroupingDigits', null );
                mw.config.set( 'wgUserLanguage', 'en' );
                mw.config.set( 'wgTranslateNumerals', true );
  
-               assert.equal( mw.language.convertNumber( 1800 ), '1.800', 'formatting' );
+               assert.equal( mw.language.convertNumber( 180 ), '180', 'formatting 3-digit' );
+               assert.equal( mw.language.convertNumber( 1800 ), '1.800', 'formatting 4-digit' );
+               assert.equal( mw.language.convertNumber( 18000 ), '18.000', 'formatting 5-digit' );
+ 
                assert.equal( mw.language.convertNumber( '1.800', true ), '1800', 'unformatting' );
+ 
+               mw.language.setData( 'en', 'minimumGroupingDigits', 2 );
+               assert.equal( mw.language.convertNumber( 180 ), '180', 'formatting 3-digit with minimumGroupingDigits=2' );
+               assert.equal( mw.language.convertNumber( 1800 ), '1800', 'formatting 4-digit with minimumGroupingDigits=2' );
+               assert.equal( mw.language.convertNumber( 18000 ), '18.000', 'formatting 5-digit with minimumGroupingDigits=2' );
        } );
  
        QUnit.test( 'mw.language.convertNumber - digitTransformTable', function ( assert ) {
@@@ -61,6 -70,7 +70,7 @@@
                mw.config.set( 'wgTranslateNumerals', true );
                mw.language.setData( 'hi', 'digitGroupingPattern', null );
                mw.language.setData( 'hi', 'separatorTransformTable', { ',': '.', '.': ',' } );
+               mw.language.setData( 'hi', 'minimumGroupingDigits', null );
  
                // Example from Hindi (MessagesHi.php)
                mw.language.setData( 'hi', 'digitTransformTable', {
@@@ -302,18 -312,6 +312,18 @@@
                                expected: 'привилегии',
                                description: 'Grammar test for prepositional case, привилегия -> привилегии'
                        },
 +                      {
 +                              word: 'университет',
 +                              grammarForm: 'prepositional',
 +                              expected: 'университете',
 +                              description: 'Grammar test for prepositional case, университет -> университете'
 +                      },
 +                      {
 +                              word: 'университет',
 +                              grammarForm: 'genitive',
 +                              expected: 'университета',
 +                              description: 'Grammar test for prepositional case, университет -> университете'
 +                      },
                        {
                                word: 'установка',
                                grammarForm: 'prepositional',