From 06f2189fcbcf4941154b8f1e126948112eab7063 Mon Sep 17 00:00:00 2001 From: Prateek Saxena Date: Thu, 24 Sep 2015 15:55:50 +0530 Subject: [PATCH] i18n: mw.Upload.BookletLayout: Update message names The messages that are no longer in the upload dialog still have the 'upload-dialog-' prefix. Replacing those with 'upload-process-' and 'upload-form-' where appropriate. Change-Id: If02482f06f6bb634079a9311150fc15e0c95fd4b --- languages/i18n/en.json | 16 +++++++-------- languages/i18n/qqq.json | 16 +++++++-------- resources/Resources.php | 16 +++++++-------- .../mediawiki.Upload.BookletLayout.js | 20 +++++++++---------- 4 files changed, 34 insertions(+), 34 deletions(-) diff --git a/languages/i18n/en.json b/languages/i18n/en.json index a33517c01a..1ce13a2dda 100644 --- a/languages/i18n/en.json +++ b/languages/i18n/en.json @@ -1403,18 +1403,18 @@ "upload-http-error": "An HTTP error occurred: $1", "upload-copy-upload-invalid-domain": "Copy uploads are not available from this domain.", "upload-dialog-title": "Upload file", - "upload-dialog-error": "An error occurred", - "upload-dialog-warning": "A warning occurred", "upload-dialog-button-cancel": "Cancel", "upload-dialog-button-done": "Done", "upload-dialog-button-save": "Save", "upload-dialog-button-upload": "Upload", - "upload-dialog-label-select-file": "Select file", - "upload-dialog-label-infoform-title": "Details", - "upload-dialog-label-infoform-name": "Name", - "upload-dialog-label-infoform-description": "Description", - "upload-dialog-label-usage-title": "Usage", - "upload-dialog-label-usage-filename": "File name", + "upload-process-error": "An error occurred", + "upload-process-warning": "A warning occurred", + "upload-form-label-select-file": "Select file", + "upload-form-label-infoform-title": "Details", + "upload-form-label-infoform-name": "Name", + "upload-form-label-infoform-description": "Description", + "upload-form-label-usage-title": "Usage", + "upload-form-label-usage-filename": "File name", "backend-fail-stream": "Could not stream file \"$1\".", "backend-fail-backup": "Could not backup file \"$1\".", "backend-fail-notexists": "The file $1 does not exist.", diff --git a/languages/i18n/qqq.json b/languages/i18n/qqq.json index 4474ec47d8..79d8a69400 100644 --- a/languages/i18n/qqq.json +++ b/languages/i18n/qqq.json @@ -1576,18 +1576,18 @@ "upload-http-error": "Parameters:\n* $1 - error message", "upload-copy-upload-invalid-domain": "Error message shown if a user is trying to upload (i.e. copy) a file from a website that is not in $wgCopyUploadsDomains (if set).\n\nSee also:\n* {{msg-mw|http-invalid-url}}\n* {{msg-mw|tmp-create-error}}\n* {{msg-mw|tmp-write-error}}", "upload-dialog-title": "Title of the upload dialog box\n{{Identical|Upload file}}", - "upload-dialog-error": "Error message from upload", - "upload-dialog-warning": "Warning message from upload", "upload-dialog-button-cancel": "Button to cancel the dialog\n{{Identical|Cancel}}", "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\n{{Identical|Save}}", "upload-dialog-button-upload": "Button to initiate upload\n{{Identical|Upload}}", - "upload-dialog-label-select-file": "Label for the select file widget\n{{Identical|Select file}}", - "upload-dialog-label-infoform-title": "Title for the information form\n{{Identical|Detail}}", - "upload-dialog-label-infoform-name": "Label for the file name input\n{{Identical|Name}}", - "upload-dialog-label-infoform-description": "Label for the file description input\n{{Identical|Description}}", - "upload-dialog-label-usage-title": "Title for the insert form showing how to use the uploaded item.\n{{Identical|Usage}}", - "upload-dialog-label-usage-filename": "Label for the file name input\n{{Identical|Filename}}", + "upload-process-error": "Error message from upload", + "upload-process-warning": "Warning message from upload", + "upload-form-label-select-file": "Label for the select file widget\n{{Identical|Select file}}", + "upload-form-label-infoform-title": "Title for the information form\n{{Identical|Detail}}", + "upload-form-label-infoform-name": "Label for the file name input\n{{Identical|Name}}", + "upload-form-label-infoform-description": "Label for the file description input\n{{Identical|Description}}", + "upload-form-label-usage-title": "Title for the insert form showing how to use the uploaded item.\n{{Identical|Usage}}", + "upload-form-label-usage-filename": "Label for the file name input\n{{Identical|Filename}}", "backend-fail-stream": "Parameters:\n* $1 - a filename", "backend-fail-backup": "Parameters:\n* $1 - a filename", "backend-fail-notexists": "Parameters:\n* $1 - a filename", diff --git a/resources/Resources.php b/resources/Resources.php index fc0bed15ac..b35ebadc1c 100644 --- a/resources/Resources.php +++ b/resources/Resources.php @@ -1174,14 +1174,14 @@ return array( 'mediawiki.Upload', ), 'messages' => array( - 'upload-dialog-error', - 'upload-dialog-warning', - 'upload-dialog-label-select-file', - 'upload-dialog-label-infoform-title', - 'upload-dialog-label-infoform-name', - 'upload-dialog-label-infoform-description', - 'upload-dialog-label-usage-title', - 'upload-dialog-label-usage-filename', + 'upload-process-error', + 'upload-process-warning', + 'upload-form-label-select-file', + 'upload-form-label-infoform-title', + 'upload-form-label-infoform-name', + 'upload-form-label-infoform-description', + 'upload-form-label-usage-title', + 'upload-form-label-usage-filename', ), ), 'mediawiki.toc' => array( diff --git a/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js b/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js index 0f85154ace..cb532c3800 100644 --- a/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js +++ b/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js @@ -205,12 +205,12 @@ this.uploadPromise.always( function () { if ( layout.upload.getState() === mw.Upload.State.ERROR ) { - deferred.reject( new OO.ui.Error( mw.msg( 'upload-dialog-error' ) ) ); + deferred.reject( new OO.ui.Error( mw.msg( 'upload-process-error' ) ) ); return false; } if ( layout.upload.getState() === mw.Upload.State.WARNING ) { - deferred.reject( new OO.ui.Error( mw.msg( 'upload-dialog-error' ) ) ); + deferred.reject( new OO.ui.Error( mw.msg( 'upload-process-error' ) ) ); return false; } @@ -218,12 +218,12 @@ var name; if ( layout.upload.getState() === mw.Upload.State.ERROR ) { - deferred.reject( new OO.ui.Error( mw.msg( 'upload-dialog-error' ) ) ); + deferred.reject( new OO.ui.Error( mw.msg( 'upload-process-error' ) ) ); return false; } if ( layout.upload.getState() === mw.Upload.State.WARNING ) { - deferred.reject( new OO.ui.Error( mw.msg( 'upload-dialog-warning' ) ) ); + deferred.reject( new OO.ui.Error( mw.msg( 'upload-process-warning' ) ) ); return false; } @@ -254,7 +254,7 @@ var fieldset; this.selectFileWidget = new OO.ui.SelectFileWidget(); - fieldset = new OO.ui.FieldsetLayout( { label: mw.msg( 'upload-dialog-label-select-file' ) } ); + fieldset = new OO.ui.FieldsetLayout( { label: mw.msg( 'upload-form-label-select-file' ) } ); fieldset.addItems( [ this.selectFileWidget ] ); this.uploadForm = new OO.ui.FormLayout( { items: [ fieldset ] } ); @@ -299,15 +299,15 @@ } ); fieldset = new OO.ui.FieldsetLayout( { - label: mw.msg( 'upload-dialog-label-infoform-title' ) + label: mw.msg( 'upload-form-label-infoform-title' ) } ); fieldset.addItems( [ new OO.ui.FieldLayout( this.filenameWidget, { - label: mw.msg( 'upload-dialog-label-infoform-name' ), + label: mw.msg( 'upload-form-label-infoform-name' ), align: 'top' } ), new OO.ui.FieldLayout( this.descriptionWidget, { - label: mw.msg( 'upload-dialog-label-infoform-description' ), + label: mw.msg( 'upload-form-label-infoform-description' ), align: 'top' } ) ] ); @@ -349,11 +349,11 @@ this.filenameUsageWidget = new OO.ui.TextInputWidget(); fieldset = new OO.ui.FieldsetLayout( { - label: mw.msg( 'upload-dialog-label-usage-title' ) + label: mw.msg( 'upload-form-label-usage-title' ) } ); fieldset.addItems( [ new OO.ui.FieldLayout( this.filenameUsageWidget, { - label: mw.msg( 'upload-dialog-label-usage-filename' ), + label: mw.msg( 'upload-form-label-usage-filename' ), align: 'top' } ) ] ); -- 2.20.1