Remove API error message duplication from Translate and UploadWizard into core.

Make necessary changes in loader and JavaScript for Translate and UploadWizard.

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index c32b939..21c8287 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -2133,7 +2133,7 @@ Permitted {{PLURAL:$3|file type is|file types are}} $2.',
 'filename-tooshort'           => 'The filename is too short.',
 'filetype-banned'             => 'This type of file is banned.',
 'verification-error'          => 'This file did not pass file verification.',
-'hookaborted'                 => 'The modification you tried to make was aborted by an extension hook.',
+'hookaborted'                 => 'The modification you tried to make was aborted by an extension.',
 'illegal-filename'            => 'The filename is not allowed.',
 'overwrite'                   => 'Overwriting an existing file is not allowed.',
 'unknown-error'               => 'An unknown error occured.',
@@ -4719,4 +4719,40 @@ Otherwise, you can use the easy form below. Your comment will be added to the pa
 'feedback-bugcheck'  => 'Great! Just check that it is not already one of the [$1 known bugs].',
 'feedback-bugnew'    => 'I checked. Report a new bug',
 
+# API errors
+'api-error-http' => 'Internal error: Unable to connect to server.',
+'api-error-ok-but-empty' => 'Internal error: No response from server.',
+'api-error-unclassified' => 'An unknown error occurred.',
+'api-error-unknown-code' => 'Unknown error: "$1"',
+'api-error-uploaddisabled' => 'Uploading is disabled on this wiki.',
+'api-error-nomodule' => 'Internal error: No upload module set.',
+'api-error-mustbeposted' => 'Internal error: Request requires HTTP POST.',
+'api-error-badaccess-groups' => 'You are not permitted to upload files to this wiki.',
+'api-error-stashfailed' => 'Internal error: Server failed to store temporary file.',
+'api-error-missingresult' => 'Internal error: Could not determine if the copy succeeded.',
+'api-error-missingparam' => 'Internal error: Missing parameters on request.',
+'api-error-invalid-file-key' => 'Internal error: File was not found in temporary storage.',
+'api-error-copyuploaddisabled' => 'Uploading by URL is disabled on this server.',
+'api-error-mustbeloggedin' => 'You must be logged in to upload files.',
+'api-error-empty-file' => 'The file you submitted was empty.',
+'api-error-file-too-large' => 'The file you submitted was too large.',
+'api-error-filetype-missing' => 'The file is missing an extension.',
+'api-error-filetype-banned' => 'This type of file is banned.',
+'api-error-filename-tooshort' => 'The filename is too short.',
+'api-error-illegal-filename' => 'The filename is not allowed.',
+'api-error-verification-error' => 'This file might be corrupt, or have the wrong extension.',
+'api-error-hookaborted' => 'The modification you tried to make was aborted by an extension.',
+'api-error-unknown-error' => 'Internal error: Something went wrong when trying to upload your file.',
+'api-error-internal-error' => 'Internal error: Something went wrong with processing your upload on the wiki.',
+'api-error-overwrite' => 'Overwriting an existing file is not allowed.',
+'api-error-badtoken' => 'Internal error: Bad token.',
+'api-error-fetchfileerror' => 'Internal error: Something went wrong while fetching the file.',
+'api-error-duplicate' => 'There {{PLURAL:$1|is [$2 another file]|are [$2 some other files]}} already on the site with the same content.',
+'api-error-duplicate-popup-title' => 'Duplicate {{PLURAL:$1|file|files}}',
+'api-error-duplicate-archive' => 'There {{PLURAL:$1|was [$2 another file]|were [$2 some other files]}} already on the site with the same content, but {{PLURAL:$1|it was|they were}} deleted.',
+'api-error-duplicate-archive-popup-title' => 'Duplicate {{PLURAL:$1|file|files}} that have already been deleted',
+'api-error-unknown-warning' => 'Unknown warning: $1',
+'api-error-timeout' => 'The server did not respond within the expected time.',
+'api-error-noimageinfo' => 'The upload succeeded, but the server did not give us any information about the file.',
+
 );

diff --git a/languages/messages/MessagesQqq.php b/languages/messages/MessagesQqq.php
index d3323df..dc097dc 100644 (file)
--- a/languages/messages/MessagesQqq.php
+++ b/languages/messages/MessagesQqq.php
@@ -4562,4 +4562,15 @@ $4 is the gender of the target user.',
 'feedback-bugcheck'  => 'Message that appears before the user submits a bug, reminding them to check for known bugs.',
 'feedback-bugnew'    => 'Button label - asserts that the user has checked for existing bugs. When clicked will launch a bugzilla form to add a new bug in a new tab or window',
 
+# API errors
+'api-error-filetype-missing' => 'The word "file" here is synonymous to "file name".
+The word "extension" refers to the part behind the last dot in a file name, that by convention gives a hint about the kind of data format which a files contents are in.',
+'api-error-verification-error' => 'The word "extension" refers to the part behind the last dot in a file name, that by convention gives a hint about the kind of data format which a files contents are in.',
+'api-error-hookaborted' => 'The word "extension" here refers to a [[:mw:Manual:Extensions|MediaWiki Extension]] which extends the functionality of the basic wiki by adding something to its capabilities.
+
+An "[[:mw:Manual:Hooks|extension hook]]" is both a way to plug extended capabilities into the basic program, or vice versa, and the process of using or calling it. A specific task or service is associated with a hook and accessed by calling the hook.
+
+"… aborted by an extension hook" implies, that from a hook call, a negative response was received, indicating that the intended operation could not be performed successfully or was not allowed to continue to its intended end.',
+       'api-error-duplicate-popup-title' => 'This message is a pop-up title shown in case one or more files exactly equal to the one just uploaded are already present. The word "duplicate" is an adjective.',
+
 );

diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index 068f2bc..7a04ac7 100644 (file)
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -3588,6 +3588,42 @@ $wgMessageStructure = array(
                'feedback-bugcheck',
                'feedback-bugnew',
        ),
+       'apierrors' => array(
+               'api-error-badaccess-groups',
+               'api-error-badtoken',
+               'api-error-copyuploaddisabled',
+               'api-error-duplicate',
+               'api-error-duplicate-archive',
+               'api-error-duplicate-archive-popup-title',
+               'api-error-duplicate-popup-title',
+               'api-error-empty-file',
+               'api-error-fetchfileerror',
+               'api-error-file-too-large',
+               'api-error-filename-tooshort',
+               'api-error-filetype-banned',
+               'api-error-filetype-missing',
+               'api-error-hookaborted',
+               'api-error-http',
+               'api-error-illegal-filename',
+               'api-error-internal-error',
+               'api-error-invalid-file-key',
+               'api-error-missingparam',
+               'api-error-missingresult',
+               'api-error-mustbeloggedin',
+               'api-error-mustbeposted',
+               'api-error-noimageinfo',
+               'api-error-nomodule',
+               'api-error-ok-but-empty',
+               'api-error-overwrite',
+               'api-error-stashfailed',
+               'api-error-timeout',
+               'api-error-unclassified',
+               'api-error-unknown-code',
+               'api-error-unknown-error',
+               'api-error-unknown-warning',
+               'api-error-uploaddisabled',
+               'api-error-verification-error',
+       ),
 );
 
 /** Comments for each block */
@@ -3823,4 +3859,5 @@ Variants for Chinese language",
        'sqlite'                => 'SQLite database support',
        'logging'               => 'New logging system',
        'feedback'              => 'Feedback',
+       'apierrors'             => 'API errors',
 );