Merge "Remove these two rights autoreview and torunblocked from mediawiki"

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

diff --git a/resources/Resources.php b/resources/Resources.php
index 343722d..1e80c26 100644 (file)
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -828,6 +828,9 @@ return [
                                'resources/src/moment-locale-overrides.js',
                        ],
                ],
+               'dependencies' => [
+                       'mediawiki.language',
+               ],
                'targets' => [ 'desktop', 'mobile' ],
        ],
 
@@ -1192,6 +1195,9 @@ return [
                        'mediawiki.ForeignUpload',
                        'mediawiki.ForeignStructuredUpload.config',
                ],
+               'messages' => [
+                       'upload-foreign-cant-load-config',
+               ],
        ],
        'mediawiki.Upload.Dialog' => [
                'scripts' => [
@@ -1373,11 +1379,9 @@ return [
        ],
        'mediawiki.checkboxtoggle' => [
                'scripts' => 'resources/src/mediawiki/mediawiki.checkboxtoggle.js',
-               'position' => 'top',
        ],
        'mediawiki.checkboxtoggle.styles' => [
                'styles' => 'resources/src/mediawiki/mediawiki.checkboxtoggle.css',
-               'position' => 'top',
        ],
        'mediawiki.cookie' => [
                'scripts' => 'resources/src/mediawiki/mediawiki.cookie.js',
@@ -1791,10 +1795,6 @@ return [
                'styles' => 'resources/src/mediawiki.special/mediawiki.special.block.css',
                'dependencies' => 'mediawiki.util',
        ],
-       'mediawiki.special.blocklist' => [
-               'styles' => 'resources/src/mediawiki.special/mediawiki.special.blocklist.css',
-               'position' => 'top',
-       ],
        'mediawiki.special.changeslist' => [
                'position' => 'top',
                'styles' => 'resources/src/mediawiki.special/mediawiki.special.changeslist.css',
@@ -1906,7 +1906,6 @@ return [
                        'thumbnail.html' => 'resources/src/mediawiki.special/templates/thumbnail.html',
                ],
                'scripts' => 'resources/src/mediawiki.special/mediawiki.special.upload.js',
-               'styles' => 'resources/src/mediawiki.special/mediawiki.special.upload.css',
                'messages' => [
                        'widthheight',
                        'size-bytes',
@@ -1919,6 +1918,7 @@ return [
                        'prefs-editing',
                ],
                'dependencies' => [
+                       'mediawiki.special.upload.styles',
                        'jquery.spinner',
                        'mediawiki.jqueryMsg',
                        'mediawiki.api',
@@ -1929,6 +1929,9 @@ return [
                        'user.options',
                ],
        ],
+       'mediawiki.special.upload.styles' => [
+               'styles' => 'resources/src/mediawiki.special/mediawiki.special.upload.styles.css',
+       ],
        'mediawiki.special.userlogin.common.styles' => [
                'styles' => [
                        'resources/src/mediawiki.special/mediawiki.special.userlogin.common.css',