Merge "Fix calls to Title::getUserPermissionsErrors on SpecialImport"

[lhc/web/wiklou.git] / includes / resourceloader / ResourceLoaderLanguageDataModule.php

diff --git a/includes/resourceloader/ResourceLoaderLanguageDataModule.php b/includes/resourceloader/ResourceLoaderLanguageDataModule.php
index f6716e7..f718e5f 100644 (file)
--- a/includes/resourceloader/ResourceLoaderLanguageDataModule.php
+++ b/includes/resourceloader/ResourceLoaderLanguageDataModule.php
@@ -23,9 +23,9 @@
  */
 
 /**
- * ResourceLoader module for populating language specific data.
+ * ResourceLoader module for populating language specific data, such as grammar forms.
  */
-class ResourceLoaderLanguageDataModule extends ResourceLoaderModule {
+class ResourceLoaderLanguageDataModule extends ResourceLoaderFileModule {
 
        protected $targets = [ 'desktop', 'mobile' ];
 
@@ -46,6 +46,7 @@ class ResourceLoaderLanguageDataModule extends ResourceLoaderModule {
                        'pluralRules' => $language->getPluralRules(),
                        'digitGroupingPattern' => $language->digitGroupingPattern(),
                        'fallbackLanguages' => $language->getFallbackLanguages(),
+                       'bcp47Map' => LanguageCode::getNonstandardLanguageCodeMapping(),
                ];
        }
 
@@ -54,7 +55,8 @@ class ResourceLoaderLanguageDataModule extends ResourceLoaderModule {
         * @return string JavaScript code
         */
        public function getScript( ResourceLoaderContext $context ) {
-               return Xml::encodeJsCall(
+               $fileScript = parent::getScript( $context );
+               $langDataScript = Xml::encodeJsCall(
                        'mw.language.setData',
                        [
                                $context->getLanguage(),
@@ -62,6 +64,7 @@ class ResourceLoaderLanguageDataModule extends ResourceLoaderModule {
                        ],
                        ResourceLoader::inDebugMode()
                );
+               return $fileScript . $langDataScript;
        }
 
        /**
@@ -72,10 +75,9 @@ class ResourceLoaderLanguageDataModule extends ResourceLoaderModule {
        }
 
        /**
-        * @param ResourceLoaderContext|null $context
-        * @return array
+        * @return bool
         */
-       public function getDependencies( ResourceLoaderContext $context = null ) {
-               return [ 'mediawiki.language.init' ];
+       public function supportsURLLoading() {
+               return false;
        }
 }