From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Mon, 26 Sep 2016 18:54:19 +0000 (+0000)
Subject: Merge "Change mid-upload 'cancel' button to 'back'"
X-Git-Tag: 1.31.0-rc.0~5321
X-Git-Url: http://git.heureux-cyclage.org/?a=commitdiff_plain;h=3ba9b09378c94f8ce4075a5c95f2c1e2a4db8750;hp=09899766f95adbb1b35ef9588ccc65b016fe84bd;p=lhc%2Fweb%2Fwiklou.git

Merge "Change mid-upload 'cancel' button to 'back'"
---

diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index cd8250fc29..cbe755de47 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -1530,6 +1530,7 @@
 	"upload-dialog-disabled": "File uploads using this dialog are disabled on this wiki.",
 	"upload-dialog-title": "Upload file",
 	"upload-dialog-button-cancel": "Cancel",
+	"upload-dialog-button-back": "Back",
 	"upload-dialog-button-done": "Done",
 	"upload-dialog-button-save": "Save",
 	"upload-dialog-button-upload": "Upload",
diff --git a/languages/i18n/qqq.json b/languages/i18n/qqq.json
index 067afeeb08..838aa1f426 100644
--- a/languages/i18n/qqq.json
+++ b/languages/i18n/qqq.json
@@ -1714,6 +1714,7 @@
 	"upload-dialog-disabled": "Message shown when the upload dialog functionality is disabled. (This doesn't mean that uploads in general are disabled, only this specific method of uploading.)",
 	"upload-dialog-title": "Title of the upload dialog box\n{{Identical|Upload file}}",
 	"upload-dialog-button-cancel": "Button to cancel the dialog\n{{Identical|Cancel}}",
+	"upload-dialog-button-back": "Button to go back the dialog\n{{Identical|Back}}",
 	"upload-dialog-button-done": "Button to close the dialog once upload is complete\n{{Identical|Done}}",
 	"upload-dialog-button-save": "Button to save the file after upload finishes and metadata is filled out, part 2 of a multi-step upload form\n{{Identical|Save}}",
 	"upload-dialog-button-upload": "Button to initiate upload, part 1 of a multi-step upload form\n{{Identical|Upload}}",
diff --git a/resources/Resources.php b/resources/Resources.php
index 295f99a741..b81fbde4bb 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1270,6 +1270,7 @@ return [
 		'messages' => [
 			'upload-dialog-title',
 			'upload-dialog-button-cancel',
+			'upload-dialog-button-back',
 			'upload-dialog-button-done',
 			'upload-dialog-button-save',
 			'upload-dialog-button-upload',
diff --git a/resources/src/mediawiki/mediawiki.Upload.Dialog.js b/resources/src/mediawiki/mediawiki.Upload.Dialog.js
index e8a85f1b51..1ea7e042ad 100644
--- a/resources/src/mediawiki/mediawiki.Upload.Dialog.js
+++ b/resources/src/mediawiki/mediawiki.Upload.Dialog.js
@@ -69,7 +69,13 @@
 			flags: 'safe',
 			action: 'cancel',
 			label: mw.msg( 'upload-dialog-button-cancel' ),
-			modes: [ 'upload', 'insert', 'info' ]
+			modes: [ 'upload', 'insert' ]
+		},
+		{
+			flags: 'safe',
+			action: 'cancelupload',
+			label: mw.msg( 'upload-dialog-button-back' ),
+			modes: [ 'info' ]
 		},
 		{
 			flags: [ 'primary', 'progressive' ],
@@ -198,6 +204,9 @@
 		if ( action === 'cancel' ) {
 			return new OO.ui.Process( this.close() );
 		}
+		if ( action === 'cancelupload' ) {
+			return new OO.ui.Process( this.uploadBooklet.initialize() );
+		}
 
 		return mw.Upload.Dialog.parent.prototype.getActionProcess.call( this, action );
 	};