X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=resources%2FResources.php;h=cf2abdb5efd2f4ef3f3f92d16d7430830773e4cf;hb=64eaaec96fa8144f441b5701b1edff22f59e57f9;hp=be13559399709cab6499f28cc1f22c47ab423a3d;hpb=e3c97b32f634254fa3aae50d417fec15f0bf0c2a;p=lhc%2Fweb%2Fwiklou.git

diff --git a/resources/Resources.php b/resources/Resources.php
index be13559399..cf2abdb5ef 100644
--- 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' => [
@@ -2289,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