| Index: trunk/phase3/maintenance/language/messages.inc |
| — | — | @@ -3588,6 +3588,42 @@ |
| 3589 | 3589 | 'feedback-bugcheck', |
| 3590 | 3590 | 'feedback-bugnew', |
| 3591 | 3591 | ), |
| | 3592 | + 'apierrors' => array( |
| | 3593 | + 'api-error-badaccess-groups', |
| | 3594 | + 'api-error-badtoken', |
| | 3595 | + 'api-error-copyuploaddisabled', |
| | 3596 | + 'api-error-duplicate', |
| | 3597 | + 'api-error-duplicate-archive', |
| | 3598 | + 'api-error-duplicate-archive-popup-title', |
| | 3599 | + 'api-error-duplicate-popup-title', |
| | 3600 | + 'api-error-empty-file', |
| | 3601 | + 'api-error-fetchfileerror', |
| | 3602 | + 'api-error-file-too-large', |
| | 3603 | + 'api-error-filename-tooshort', |
| | 3604 | + 'api-error-filetype-banned', |
| | 3605 | + 'api-error-filetype-missing', |
| | 3606 | + 'api-error-hookaborted', |
| | 3607 | + 'api-error-http', |
| | 3608 | + 'api-error-illegal-filename', |
| | 3609 | + 'api-error-internal-error', |
| | 3610 | + 'api-error-invalid-file-key', |
| | 3611 | + 'api-error-missingparam', |
| | 3612 | + 'api-error-missingresult', |
| | 3613 | + 'api-error-mustbeloggedin', |
| | 3614 | + 'api-error-mustbeposted', |
| | 3615 | + 'api-error-noimageinfo', |
| | 3616 | + 'api-error-nomodule', |
| | 3617 | + 'api-error-ok-but-empty', |
| | 3618 | + 'api-error-overwrite', |
| | 3619 | + 'api-error-stashfailed', |
| | 3620 | + 'api-error-timeout', |
| | 3621 | + 'api-error-unclassified', |
| | 3622 | + 'api-error-unknown-code', |
| | 3623 | + 'api-error-unknown-error', |
| | 3624 | + 'api-error-unknown-warning', |
| | 3625 | + 'api-error-uploaddisabled', |
| | 3626 | + 'api-error-verification-error', |
| | 3627 | + ), |
| 3592 | 3628 | ); |
| 3593 | 3629 | |
| 3594 | 3630 | /** Comments for each block */ |
| — | — | @@ -3823,4 +3859,5 @@ |
| 3824 | 3860 | 'sqlite' => 'SQLite database support', |
| 3825 | 3861 | 'logging' => 'New logging system', |
| 3826 | 3862 | 'feedback' => 'Feedback', |
| | 3863 | + 'apierrors' => 'API errors', |
| 3827 | 3864 | ); |
| Index: trunk/phase3/languages/messages/MessagesQqq.php |
| — | — | @@ -4562,4 +4562,15 @@ |
| 4563 | 4563 | 'feedback-bugcheck' => 'Message that appears before the user submits a bug, reminding them to check for known bugs.', |
| 4564 | 4564 | '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', |
| 4565 | 4565 | |
| | 4566 | +# API errors |
| | 4567 | +'api-error-filetype-missing' => 'The word "file" here is synonymous to "file name". |
| | 4568 | +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.', |
| | 4569 | +'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.', |
| | 4570 | +'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. |
| | 4571 | + |
| | 4572 | +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. |
| | 4573 | + |
| | 4574 | +"… 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.', |
| | 4575 | + '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.', |
| | 4576 | + |
| 4566 | 4577 | ); |
| Index: trunk/phase3/languages/messages/MessagesEn.php |
| — | — | @@ -2133,7 +2133,7 @@ |
| 2134 | 2134 | 'filename-tooshort' => 'The filename is too short.', |
| 2135 | 2135 | 'filetype-banned' => 'This type of file is banned.', |
| 2136 | 2136 | 'verification-error' => 'This file did not pass file verification.', |
| 2137 | | -'hookaborted' => 'The modification you tried to make was aborted by an extension hook.', |
| | 2137 | +'hookaborted' => 'The modification you tried to make was aborted by an extension.', |
| 2138 | 2138 | 'illegal-filename' => 'The filename is not allowed.', |
| 2139 | 2139 | 'overwrite' => 'Overwriting an existing file is not allowed.', |
| 2140 | 2140 | 'unknown-error' => 'An unknown error occured.', |
| — | — | @@ -4719,4 +4719,40 @@ |
| 4720 | 4720 | 'feedback-bugcheck' => 'Great! Just check that it is not already one of the [$1 known bugs].', |
| 4721 | 4721 | 'feedback-bugnew' => 'I checked. Report a new bug', |
| 4722 | 4722 | |
| | 4723 | +# API errors |
| | 4724 | +'api-error-http' => 'Internal error: Unable to connect to server.', |
| | 4725 | +'api-error-ok-but-empty' => 'Internal error: No response from server.', |
| | 4726 | +'api-error-unclassified' => 'An unknown error occurred.', |
| | 4727 | +'api-error-unknown-code' => 'Unknown error: "$1"', |
| | 4728 | +'api-error-uploaddisabled' => 'Uploading is disabled on this wiki.', |
| | 4729 | +'api-error-nomodule' => 'Internal error: No upload module set.', |
| | 4730 | +'api-error-mustbeposted' => 'Internal error: Request requires HTTP POST.', |
| | 4731 | +'api-error-badaccess-groups' => 'You are not permitted to upload files to this wiki.', |
| | 4732 | +'api-error-stashfailed' => 'Internal error: Server failed to store temporary file.', |
| | 4733 | +'api-error-missingresult' => 'Internal error: Could not determine if the copy succeeded.', |
| | 4734 | +'api-error-missingparam' => 'Internal error: Missing parameters on request.', |
| | 4735 | +'api-error-invalid-file-key' => 'Internal error: File was not found in temporary storage.', |
| | 4736 | +'api-error-copyuploaddisabled' => 'Uploading by URL is disabled on this server.', |
| | 4737 | +'api-error-mustbeloggedin' => 'You must be logged in to upload files.', |
| | 4738 | +'api-error-empty-file' => 'The file you submitted was empty.', |
| | 4739 | +'api-error-file-too-large' => 'The file you submitted was too large.', |
| | 4740 | +'api-error-filetype-missing' => 'The file is missing an extension.', |
| | 4741 | +'api-error-filetype-banned' => 'This type of file is banned.', |
| | 4742 | +'api-error-filename-tooshort' => 'The filename is too short.', |
| | 4743 | +'api-error-illegal-filename' => 'The filename is not allowed.', |
| | 4744 | +'api-error-verification-error' => 'This file might be corrupt, or have the wrong extension.', |
| | 4745 | +'api-error-hookaborted' => 'The modification you tried to make was aborted by an extension.', |
| | 4746 | +'api-error-unknown-error' => 'Internal error: Something went wrong when trying to upload your file.', |
| | 4747 | +'api-error-internal-error' => 'Internal error: Something went wrong with processing your upload on the wiki.', |
| | 4748 | +'api-error-overwrite' => 'Overwriting an existing file is not allowed.', |
| | 4749 | +'api-error-badtoken' => 'Internal error: Bad token.', |
| | 4750 | +'api-error-fetchfileerror' => 'Internal error: Something went wrong while fetching the file.', |
| | 4751 | +'api-error-duplicate' => 'There {{PLURAL:$1|is [$2 another file]|are [$2 some other files]}} already on the site with the same content.', |
| | 4752 | +'api-error-duplicate-popup-title' => 'Duplicate {{PLURAL:$1|file|files}}', |
| | 4753 | +'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.', |
| | 4754 | +'api-error-duplicate-archive-popup-title' => 'Duplicate {{PLURAL:$1|file|files}} that have already been deleted', |
| | 4755 | +'api-error-unknown-warning' => 'Unknown warning: $1', |
| | 4756 | +'api-error-timeout' => 'The server did not respond within the expected time.', |
| | 4757 | +'api-error-noimageinfo' => 'The upload succeeded, but the server did not give us any information about the file.', |
| | 4758 | + |
| 4723 | 4759 | ); |
| Index: trunk/extensions/UploadWizard/UploadWizardHooks.php |
| — | — | @@ -115,41 +115,41 @@ |
| 116 | 116 | 'mwe-upwiz-step-deeds', |
| 117 | 117 | 'mwe-upwiz-step-details', |
| 118 | 118 | 'mwe-upwiz-step-thanks', |
| 119 | | - 'mwe-upwiz-api-error-http', |
| 120 | | - 'mwe-upwiz-api-error-ok-but-empty', |
| 121 | | - 'mwe-upwiz-api-error-unknown-code', |
| 122 | | - 'mwe-upwiz-api-error-uploaddisabled', |
| 123 | | - 'mwe-upwiz-api-error-nomodule', |
| 124 | | - 'mwe-upwiz-api-error-mustbeposted', |
| 125 | | - 'mwe-upwiz-api-error-badaccess-groups', |
| 126 | | - 'mwe-upwiz-api-error-stashfailed', |
| 127 | | - 'mwe-upwiz-api-error-missingresult', |
| 128 | | - 'mwe-upwiz-api-error-missingparam', |
| 129 | | - 'mwe-upwiz-api-error-invalid-file-key', |
| 130 | | - 'mwe-upwiz-api-error-copyuploaddisabled', |
| 131 | | - 'mwe-upwiz-api-error-mustbeloggedin', |
| 132 | | - 'mwe-upwiz-api-error-empty-file', |
| 133 | | - 'mwe-upwiz-api-error-file-too-large', |
| 134 | | - 'mwe-upwiz-api-error-filetype-missing', |
| 135 | | - 'mwe-upwiz-api-error-filetype-banned', |
| 136 | | - 'mwe-upwiz-api-error-filename-tooshort', |
| 137 | | - 'mwe-upwiz-api-error-illegal-filename', |
| 138 | | - 'mwe-upwiz-api-error-verification-error', |
| 139 | | - 'mwe-upwiz-api-error-hookaborted', |
| 140 | | - 'mwe-upwiz-api-error-unknown-error', |
| 141 | | - 'mwe-upwiz-api-error-internal-error', |
| 142 | | - 'mwe-upwiz-api-error-overwrite', |
| 143 | | - 'mwe-upwiz-api-error-badtoken', |
| 144 | | - 'mwe-upwiz-api-error-fetchfileerror', |
| 145 | | - 'mwe-upwiz-api-error-duplicate', |
| 146 | | - 'mwe-upwiz-api-error-duplicate-popup-title', |
| 147 | | - 'mwe-upwiz-api-error-duplicate-archive', |
| 148 | | - 'mwe-upwiz-api-error-duplicate-archive-popup-title', |
| 149 | | - 'mwe-upwiz-api-error-unknown-warning', |
| 150 | | - 'mwe-upwiz-api-error-timeout', |
| 151 | | - 'mwe-upwiz-api-error-noimageinfo', |
| 152 | | - 'mwe-upwiz-api-error-fileexists-shared-forbidden', |
| 153 | | - 'mwe-upwiz-api-error-unclassified', |
| | 119 | + 'api-error-http', |
| | 120 | + 'api-error-ok-but-empty', |
| | 121 | + 'api-error-unknown-code', |
| | 122 | + 'api-error-uploaddisabled', |
| | 123 | + 'api-error-nomodule', |
| | 124 | + 'api-error-mustbeposted', |
| | 125 | + 'api-error-badaccess-groups', |
| | 126 | + 'api-error-stashfailed', |
| | 127 | + 'api-error-missingresult', |
| | 128 | + 'api-error-missingparam', |
| | 129 | + 'api-error-invalid-file-key', |
| | 130 | + 'api-error-copyuploaddisabled', |
| | 131 | + 'api-error-mustbeloggedin', |
| | 132 | + 'api-error-empty-file', |
| | 133 | + 'api-error-file-too-large', |
| | 134 | + 'api-error-filetype-missing', |
| | 135 | + 'api-error-filetype-banned', |
| | 136 | + 'api-error-filename-tooshort', |
| | 137 | + 'api-error-illegal-filename', |
| | 138 | + 'api-error-verification-error', |
| | 139 | + 'api-error-hookaborted', |
| | 140 | + 'api-error-unknown-error', |
| | 141 | + 'api-error-internal-error', |
| | 142 | + 'api-error-overwrite', |
| | 143 | + 'api-error-badtoken', |
| | 144 | + 'api-error-fetchfileerror', |
| | 145 | + 'api-error-duplicate', |
| | 146 | + 'api-error-duplicate-popup-title', |
| | 147 | + 'api-error-duplicate-archive', |
| | 148 | + 'api-error-duplicate-archive-popup-title', |
| | 149 | + 'api-error-unknown-warning', |
| | 150 | + 'api-error-timeout', |
| | 151 | + 'api-error-noimageinfo', |
| | 152 | + 'api-error-fileexists-shared-forbidden', |
| | 153 | + 'api-error-unclassified', |
| 154 | 154 | 'mwe-upwiz-api-warning-was-deleted', |
| 155 | 155 | 'mwe-upwiz-api-warning-exists', |
| 156 | 156 | 'mwe-upwiz-tutorial-error-localized-file-missing', |
| Index: trunk/extensions/UploadWizard/UploadWizard.i18n.php |
| — | — | @@ -29,42 +29,7 @@ |
| 30 | 30 | 'mwe-upwiz-step-deeds' => 'Release rights', // Guillaume wants "Set rights". Disagreement -- NeilK |
| 31 | 31 | 'mwe-upwiz-step-details' => 'Describe', |
| 32 | 32 | 'mwe-upwiz-step-thanks' => 'Use', |
| 33 | | - 'mwe-upwiz-api-error-http' => 'Internal error: Unable to connect to server.', |
| 34 | | - 'mwe-upwiz-api-error-ok-but-empty' => 'Internal error: No response from server.', |
| 35 | | - 'mwe-upwiz-api-error-unclassified' => 'An unknown error occurred.', |
| 36 | | - 'mwe-upwiz-api-error-unknown-code' => 'Unknown error: "$1"', |
| 37 | | - 'mwe-upwiz-api-error-uploaddisabled' => 'Uploading is disabled on this wiki.', |
| 38 | | - 'mwe-upwiz-api-error-nomodule' => 'Internal error: No upload module set.', |
| 39 | | - 'mwe-upwiz-api-error-mustbeposted' => 'Internal error: Request requires HTTP POST.', |
| 40 | | - 'mwe-upwiz-api-error-badaccess-groups' => 'You are not permitted to upload files to this wiki.', |
| 41 | | - 'mwe-upwiz-api-error-stashfailed' => 'Internal error: Server failed to store temporary file.', |
| 42 | | - 'mwe-upwiz-api-error-missingresult' => 'Internal error: Could not determine if the copy succeeded.', |
| 43 | | - 'mwe-upwiz-api-error-missingparam' => 'Internal error: Missing parameters on request.', |
| 44 | | - 'mwe-upwiz-api-error-invalid-file-key' => 'Internal error: File was not found in temporary storage.', |
| 45 | | - 'mwe-upwiz-api-error-copyuploaddisabled' => 'Uploading by URL is disabled on this server.', |
| 46 | | - 'mwe-upwiz-api-error-mustbeloggedin' => 'You must be logged in to upload files.', |
| 47 | | - 'mwe-upwiz-api-error-empty-file' => 'The file you submitted was empty.', |
| 48 | | - 'mwe-upwiz-api-error-file-too-large' => 'The file you submitted was too large.', |
| 49 | | - 'mwe-upwiz-api-error-filetype-missing' => 'The file is missing an extension.', |
| 50 | | - 'mwe-upwiz-api-error-filetype-banned' => 'This type of file is banned.', |
| 51 | | - 'mwe-upwiz-api-error-filename-tooshort' => 'The filename is too short.', |
| 52 | | - 'mwe-upwiz-api-error-illegal-filename' => 'The filename is not allowed.', |
| 53 | | - 'mwe-upwiz-api-error-verification-error' => 'This file might be corrupt, or have the wrong extension.', |
| 54 | | - 'mwe-upwiz-api-error-hookaborted' => 'The modification you tried to make was aborted by an extension hook.', |
| 55 | | - 'mwe-upwiz-api-error-unknown-error' => 'Internal error: Something went wrong when trying to upload your file.', |
| 56 | | - 'mwe-upwiz-api-error-internal-error' => 'Internal error: Something went wrong with processing your upload on the wiki.', |
| 57 | | - 'mwe-upwiz-api-error-overwrite' => 'Overwriting an existing file is not allowed.', |
| 58 | | - 'mwe-upwiz-api-error-badtoken' => 'Internal error: Bad token.', |
| 59 | | - 'mwe-upwiz-api-error-fetchfileerror' => 'Internal error: Something went wrong while fetching the file.', |
| 60 | | - 'mwe-upwiz-api-error-duplicate' => 'There {{PLURAL:$1|is [$2 another file]|are [$2 some other files]}} already on the site with the same content.', |
| 61 | | - 'mwe-upwiz-api-error-duplicate-popup-title' => 'Duplicate {{PLURAL:$1|file|files}}', |
| 62 | | - 'mwe-upwiz-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.', |
| 63 | | - 'mwe-upwiz-api-error-duplicate-archive-popup-title' => 'Duplicate {{PLURAL:$1|file|files}} that have already been deleted', |
| 64 | | - 'mwe-upwiz-api-error-unknown-warning' => 'Unknown warning: $1', |
| 65 | | - 'mwe-upwiz-api-error-timeout' => 'The server did not respond within the expected time.', |
| 66 | | - 'mwe-upwiz-api-error-noimageinfo' => 'The upload succeeded, but the server did not give us any information about the file.', |
| 67 | 33 | |
| 68 | | - |
| 69 | 34 | 'mwe-upwiz-api-warning-exists' => 'There is [$1 another file] already on the wiki with the same filename', |
| 70 | 35 | 'mwe-upwiz-api-warning-was-deleted' => 'There was a file by this name, "$1", but it was deleted and you can not reupload the file. If your file is different, try renaming it.', |
| 71 | 36 | 'mwe-upwiz-tutorial-error-localized-file-missing' => 'Sorry, we could not find a tutorial in your language. The English one is shown instead.', |
| — | — | @@ -429,16 +394,6 @@ |
| 430 | 395 | | [[file:commons-uw-L52G.png|Initial "{{MediaWiki:mwe-upwiz-step-details/en}}" page|thumb|right]] |
| 431 | 396 | | [[file:commons-uw-L52X.png|Initial "{{MediaWiki:mwe-upwiz-step-thanks/en}}" page|thumb|right]] |
| 432 | 397 | |} This is a short greyed or bolded label, in the top bar of all pages of the [[:mw:Extension:UploadWizard|MediaWiki Upload Wizard]]. Use the verb for this message.', |
| 433 | | - 'mwe-upwiz-api-error-filetype-missing' => 'The word "file" here is synonymous to "file name". |
| 434 | | -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.', |
| 435 | | - 'mwe-upwiz-api-error-verification-error' => ' |
| 436 | | -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.', |
| 437 | | - 'mwe-upwiz-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. |
| 438 | | - |
| 439 | | -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. |
| 440 | | - |
| 441 | | -"… 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.', |
| 442 | | - 'mwe-upwiz-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.', |
| 443 | 398 | 'mwe-upwiz-help-desk' => 'This should be the same text as it is used in the svg comic on the first page of the Upload Wizard', |
| 444 | 399 | 'mwe-upwiz-help-desk-url' => 'As this is mailny used on Commons, it should remain as such and be overrriden when the UploadWizard is pushed on the local wikis.', |
| 445 | 400 | 'mwe-upwiz-add-file-n' => '{| align="right" |
| Index: trunk/extensions/UploadWizard/resources/mw.UploadWizardUploadInterface.js |
| — | — | @@ -232,7 +232,7 @@ |
| 233 | 233 | showError: function( code, info ) { |
| 234 | 234 | this.showIndicator( 'error' ); |
| 235 | 235 | // is this an error that we expect to have a message for? |
| 236 | | - var msgKey = 'mwe-upwiz-api-error-unknown-code'; |
| | 236 | + var msgKey = 'api-error-unknown-code'; |
| 237 | 237 | var args = [ code ]; |
| 238 | 238 | |
| 239 | 239 | if ( code === 'http' && info.textStatus === 'timeout' ) { |
| — | — | @@ -240,7 +240,7 @@ |
| 241 | 241 | } |
| 242 | 242 | |
| 243 | 243 | if ( $j.inArray( code, mw.Api.errors ) !== -1 ) { |
| 244 | | - msgKey = 'mwe-upwiz-api-error-' + code; |
| | 244 | + msgKey = 'api-error-' + code; |
| 245 | 245 | args = $j.makeArray( info ); |
| 246 | 246 | } |
| 247 | 247 | this.setStatus( msgKey, args ); |
| Index: trunk/extensions/UploadWizard/resources/mw.UploadWizardUpload.js |
| — | — | @@ -243,7 +243,7 @@ |
| 244 | 244 | width: 500, |
| 245 | 245 | zIndex: 200000, |
| 246 | 246 | autoOpen: true, |
| 247 | | - title: gM( 'mwe-upwiz-api-error-' + code + '-popup-title', duplicates.length ), |
| | 247 | + title: gM( 'api-error-' + code + '-popup-title', duplicates.length ), |
| 248 | 248 | modal: true |
| 249 | 249 | } ); |
| 250 | 250 | }; |
| Index: trunk/extensions/UploadWizard/resources/mw.UploadWizardDetails.js |
| — | — | @@ -923,7 +923,7 @@ |
| 924 | 924 | warningsKeys.push( key ); |
| 925 | 925 | } ); |
| 926 | 926 | _this.upload.state = 'error'; |
| 927 | | - _this.showError( 'unknown', gM( 'mwe-upwiz-api-error-unknown-warning', warningsKeys.join( ', ' ) ) ); |
| | 927 | + _this.showError( 'unknown', gM( 'api-error-unknown-warning', warningsKeys.join( ', ' ) ) ); |
| 928 | 928 | } |
| 929 | 929 | } else { |
| 930 | 930 | err( 'details-info-missing', result ); |
| — | — | @@ -963,7 +963,7 @@ |
| 964 | 964 | * @param {Mixed} result from ajax call |
| 965 | 965 | */ |
| 966 | 966 | processError: function( code, result ) { |
| 967 | | - var statusLine = gM( 'mwe-upwiz-api-error-unclassified' ); |
| | 967 | + var statusLine = gM( 'api-error-unclassified' ); |
| 968 | 968 | var titleErrorMap = { |
| 969 | 969 | 'senselessimagename': 'senselessimagename', |
| 970 | 970 | 'fileexists-shared-forbidden': 'fileexists-shared-forbidden', |
| — | — | @@ -977,7 +977,7 @@ |
| 978 | 978 | _this.recoverFromError( _this.titleId, gM( 'mwe-upwiz-error-title-' + titleErrorMap[code] ) ); |
| 979 | 979 | return; |
| 980 | 980 | } else { |
| 981 | | - statusKey = 'mwe-upwiz-api-error-' + code; |
| | 981 | + statusKey = 'api-error-' + code; |
| 982 | 982 | if ( result.error.info ) { |
| 983 | 983 | statusLine = gM( statusKey, result.error.info ); |
| 984 | 984 | } else { |
| Index: trunk/extensions/Translate/Translate.php |
| — | — | @@ -174,11 +174,11 @@ |
| 175 | 175 | 'translate-messagereview-progress', |
| 176 | 176 | 'translate-messagereview-failure', |
| 177 | 177 | 'translate-messagereview-done', |
| 178 | | - 'translate-messagereview-apierror-invalidrevision', |
| 179 | | - 'translate-messagereview-apierror-unknownmessage', |
| 180 | | - 'translate-messagereview-apierror-badtoken', |
| 181 | | - 'translate-messagereview-apierror-fuzzymessage', |
| 182 | | - 'translate-messagereview-apierror-owntranslation', |
| | 178 | + 'api-error-badtoken', |
| | 179 | + 'api-error-fuzzymessage', |
| | 180 | + 'api-error-invalidrevision', |
| | 181 | + 'api-error-owntranslation', |
| | 182 | + 'api-error-unknownmessage', |
| 183 | 183 | ), |
| 184 | 184 | ) + $resourcePaths; |
| 185 | 185 | |
| Index: trunk/extensions/Translate/Translate.i18n.php |
| — | — | @@ -376,15 +376,16 @@ |
| 377 | 377 | 'translate-messagereview-progress' => 'Accepting...', |
| 378 | 378 | 'translate-messagereview-failure' => 'Accepting... failed: $1', |
| 379 | 379 | 'translate-messagereview-done' => 'Accepted', |
| 380 | | - 'translate-messagereview-apierror-invalidrevision' => 'Translation was not found', |
| 381 | | - 'translate-messagereview-apierror-unknownmessage' => 'Message was not found', |
| 382 | | - 'translate-messagereview-apierror-fuzzymessage' => 'Translation is marked as fuzzy', |
| 383 | | - 'translate-messagereview-apierror-owntranslation' => 'You cannot accept your own translations', |
| 384 | | - 'translate-messagereview-apierror-badtoken' => 'Invalid token', |
| 385 | 380 | 'translate-messagereview-reviews' => 'Accepted by {{PLURAL:$1|one user|$1 users}}', |
| 386 | 381 | 'translate-messagereview-reviewswithyou' => 'Accepted by {{PLURAL:$1|one user|$1 users}} including you', |
| 387 | 382 | 'translate-messagereview-reviewsyou' => 'Accepted by you', |
| 388 | 383 | |
| | 384 | + // Localisation for extension specific API errors |
| | 385 | + 'api-error-invalidrevision' => 'Translation was not found', |
| | 386 | + 'api-error-unknownmessage' => 'Message was not found', |
| | 387 | + 'api-error-fuzzymessage' => 'Translation is marked as fuzzy', |
| | 388 | + 'api-error-owntranslation' => 'You cannot accept your own translations', |
| | 389 | + |
| 389 | 390 | 'translate-messagereview-no-fuzzy' => 'Fuzzy translations cannot be accepted.', |
| 390 | 391 | 'translate-messagereview-no-own' => 'You cannot accept your own translations.', |
| 391 | 392 | 'translate-messagereview-doit' => 'Accept this translation as a correct translation.', |
| Index: trunk/extensions/Translate/resources/ext.translate.messagetable.js |
| — | — | @@ -11,7 +11,7 @@ |
| 12 | 12 | |
| 13 | 13 | var successFunction = function( data, textStatus ) { |
| 14 | 14 | if ( data.error ) { |
| 15 | | - var reason = mw.msg( "translate-messagereview-apierror-" + data.error.code ); |
| | 15 | + var reason = mw.msg( "api-error-" + data.error.code ); |
| 16 | 16 | $b.val( mw.msg( "translate-messagereview-failure", reason ) ); |
| 17 | 17 | } else { |
| 18 | 18 | $b.val( mw.msg( "translate-messagereview-done" ) ); |