Merge "mediawiki.cldr: Move file to its own directory"

diff --git a/resources/Resources.php b/resources/Resources.php
index 6fcf370..d6b1ec0 100644 (file)
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1566,7 +1566,7 @@ return [
        ],
 
        'mediawiki.cldr' => [
-               'scripts' => 'resources/src/mediawiki.language/mediawiki.cldr.js',
+               'scripts' => 'resources/src/mediawiki.cldr/index.js',
                'dependencies' => [
                        'mediawiki.libs.pluralruleparser',
                ],

diff --git a/resources/src/mediawiki.cldr/index.js b/resources/src/mediawiki.cldr/index.js
new file mode 100644 (file)
index 0000000..5054810
--- /dev/null
+++ b/resources/src/mediawiki.cldr/index.js
@@ -0,0 +1,32 @@
+( function () {
+       'use strict';
+
+       /**
+        * Namespace for CLDR-related utility methods.
+        *
+        * @class
+        * @singleton
+        */
+       mw.cldr = {
+               /**
+                * Get the plural form index for the number.
+                *
+                * In case none of the rules passed, we return `pluralRules.length` -
+                * that means it is the "other" form.
+                *
+                * @param {number} number
+                * @param {Array} pluralRules
+                * @return {number} plural form index
+                */
+               getPluralForm: function ( number, pluralRules ) {
+                       var i, pluralRuleParser = require( 'mediawiki.libs.pluralruleparser' );
+                       for ( i = 0; i < pluralRules.length; i++ ) {
+                               if ( pluralRuleParser( pluralRules[ i ], number ) ) {
+                                       break;
+                               }
+                       }
+                       return i;
+               }
+       };
+
+}() );

diff --git a/resources/src/mediawiki.language/mediawiki.cldr.js b/resources/src/mediawiki.language/mediawiki.cldr.js
deleted file mode 100644 (file)
index 5054810..0000000
--- a/resources/src/mediawiki.language/mediawiki.cldr.js
+++ /dev/null
@@ -1,32 +0,0 @@
-( function () {
-       'use strict';
-
-       /**
-        * Namespace for CLDR-related utility methods.
-        *
-        * @class
-        * @singleton
-        */
-       mw.cldr = {
-               /**
-                * Get the plural form index for the number.
-                *
-                * In case none of the rules passed, we return `pluralRules.length` -
-                * that means it is the "other" form.
-                *
-                * @param {number} number
-                * @param {Array} pluralRules
-                * @return {number} plural form index
-                */
-               getPluralForm: function ( number, pluralRules ) {
-                       var i, pluralRuleParser = require( 'mediawiki.libs.pluralruleparser' );
-                       for ( i = 0; i < pluralRules.length; i++ ) {
-                               if ( pluralRuleParser( pluralRules[ i ], number ) ) {
-                                       break;
-                               }
-                       }
-                       return i;
-               }
-       };
-
-}() );