Merge "Parser functions now format numbers according to page language (2nd attempt)"

[lhc/web/wiklou.git] / resources / Resources.php

diff --git a/resources/Resources.php b/resources/Resources.php
index b37febd..e8be528 100644 (file)
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -53,9 +53,6 @@ return [
        'user' => [ 'class' => 'ResourceLoaderUserModule' ],
        'user.styles' => [ 'class' => 'ResourceLoaderUserStylesModule' ],
 
-       // Scripts generated based on the current user's preferences
-       'user.cssprefs' => [ 'class' => 'ResourceLoaderUserCSSPrefsModule' ],
-
        // Populate mediawiki.user placeholders with information about the current user
        'user.defaults' => [ 'class' => 'ResourceLoaderUserDefaultsModule' ],
        'user.options' => [ 'class' => 'ResourceLoaderUserOptionsModule' ],
@@ -1177,7 +1174,6 @@ return [
                        'searchsuggest-containing',
                ],
                'dependencies' => [
-                       'jquery.client',
                        'jquery.placeholder',
                        'jquery.suggestions',
                        'jquery.getAttrs',
@@ -1595,15 +1591,12 @@ return [
                        'dsb' => 'resources/src/mediawiki.language/languages/dsb.js',
                        'fi' => 'resources/src/mediawiki.language/languages/fi.js',
                        'ga' => 'resources/src/mediawiki.language/languages/ga.js',
-                       'he' => 'resources/src/mediawiki.language/languages/he.js',
                        'hsb' => 'resources/src/mediawiki.language/languages/hsb.js',
                        'hu' => 'resources/src/mediawiki.language/languages/hu.js',
                        'hy' => 'resources/src/mediawiki.language/languages/hy.js',
                        'la' => 'resources/src/mediawiki.language/languages/la.js',
                        'os' => 'resources/src/mediawiki.language/languages/os.js',
-                       'ru' => 'resources/src/mediawiki.language/languages/ru.js',
                        'sl' => 'resources/src/mediawiki.language/languages/sl.js',
-                       'uk' => 'resources/src/mediawiki.language/languages/uk.js',
                ],
                'dependencies' => [
                        'mediawiki.language.data',
@@ -1741,6 +1734,8 @@ return [
                        'mediawiki.api.watch',
                        'mediawiki.notify',
                        'mediawiki.util',
+                       'mediawiki.Title',
+                       'mediawiki.jqueryMsg',
                        'jquery.accessKeyLabel',
                        'mediawiki.RegExp',
                ],
@@ -1752,6 +1747,10 @@ return [
                        'tooltip-ca-watch',
                        'tooltip-ca-unwatch',
                        'watcherrortext',
+                       'addedwatchtext',
+                       'addedwatchtext-talk',
+                       'removedwatchtext',
+                       'removedwatchtext-talk',
                ],
        ],
        'mediawiki.page.rollback' => [
@@ -2030,6 +2029,11 @@ return [
        ],
        'mediawiki.special.watchlist' => [
                'scripts' => 'resources/src/mediawiki.special/mediawiki.special.watchlist.js',
+               'dependencies' => [
+                       'mediawiki.api',
+                       'oojs-ui-core',
+                       'user.options',
+               ]
        ],
        'mediawiki.special.version' => [
                'styles' => 'resources/src/mediawiki.special/mediawiki.special.version.css',