Merge "Add SessionManager::invalidateSessionsForUser"

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

diff --git a/resources/Resources.php b/resources/Resources.php
index cb7adbe..cf2abdb 100644 (file)
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -735,7 +735,6 @@ return [
                'scripts' => [
                        'resources/lib/moment/moment.js',
                        'resources/src/moment-global.js',
-                       'resources/src/moment-local-dmy.js',
                ],
                'languageScripts' => [
                        'af' => 'resources/lib/moment/locale/af.js',
@@ -817,6 +816,13 @@ return [
                        'zh-hans' => 'resources/lib/moment/locale/zh-cn.js',
                        'zh-hant' => 'resources/lib/moment/locale/zh-tw.js',
                ],
+               // HACK: skinScripts come after languageScripts, and we need locale overrides to come
+               // after locale definitions
+               'skinScripts' => [
+                       'default' => [
+                               'resources/src/moment-locale-overrides.js',
+                       ],
+               ],
                'targets' => [ 'desktop', 'mobile' ],
        ],
 
@@ -1213,6 +1219,8 @@ return [
                        'upload-form-label-usage-filename',
                        'api-error-unknownerror',
                        'api-error-unknown-warning',
+                       'api-error-autoblocked',
+                       'api-error-blocked',
                        'api-error-badaccess-groups',
                        'api-error-badtoken',
                        'api-error-copyuploaddisabled',
@@ -1280,18 +1288,18 @@ return [
                        'mediawiki.libs.jpegmeta',
                ],
                'messages' => [
-                       'foreign-structured-upload-form-label-own-work',
-                       'foreign-structured-upload-form-label-infoform-categories',
-                       'foreign-structured-upload-form-label-infoform-date',
-                       'foreign-structured-upload-form-label-own-work-message-default',
-                       'foreign-structured-upload-form-label-not-own-work-message-default',
-                       'foreign-structured-upload-form-label-not-own-work-local-default',
-                       'foreign-structured-upload-form-label-own-work-message-shared',
-                       'foreign-structured-upload-form-label-not-own-work-message-shared',
-                       'foreign-structured-upload-form-label-not-own-work-local-shared',
-                       'foreign-structured-upload-form-label-own-work-message-local',
-                       'foreign-structured-upload-form-label-not-own-work-message-local',
-                       'foreign-structured-upload-form-label-not-own-work-local-local',
+                       'upload-form-label-own-work',
+                       'upload-form-label-infoform-categories',
+                       'upload-form-label-infoform-date',
+                       'upload-form-label-own-work-message-default',
+                       'upload-form-label-not-own-work-message-default',
+                       'upload-form-label-not-own-work-local-default',
+                       'upload-form-label-own-work-message-shared',
+                       'upload-form-label-not-own-work-message-shared',
+                       'upload-form-label-not-own-work-local-shared',
+                       'upload-form-label-own-work-message-local',
+                       'upload-form-label-not-own-work-message-local',
+                       'upload-form-label-not-own-work-local-local',
                ],
        ],
        'mediawiki.toc' => [
@@ -1869,6 +1877,7 @@ 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',
@@ -2288,6 +2297,26 @@ return [
                ],
        ],
 
+       'mediawiki.router' => [
+               'scripts' => [
+                       'resources/src/mediawiki.router/index.js',
+               ],
+               'targets' => [ 'desktop', 'mobile' ],
+               'dependencies' => [
+                       'oojs-router',
+               ],
+       ],
+
+       'oojs-router' => [
+               'scripts' => [
+                       'resources/lib/oojs-router/oojs-router.js',
+               ],
+               'targets' => [ 'desktop', 'mobile' ],
+               'dependencies' => [
+                       'oojs',
+               ],
+       ],
+
        /* OOjs UI */
        // WARNING: OOjs-UI is NOT TESTED with older browsers and is likely to break
        // if loaded in browsers that don't support ES5