From: Aaron Schulz <aschulz@wikimedia.org>
Date: Wed, 23 Jan 2013 00:50:08 +0000 (-0800)
Subject: Added a new "api-error-publishfailed" message.
X-Git-Tag: 1.31.0-rc.0~20947^2
X-Git-Url: http://git.cyclocoop.org/wiki/Target_page?a=commitdiff_plain;h=0c1f2232474ad09da94979acd9de36b495642fdd;p=lhc%2Fweb%2Fwiklou.git

Added a new "api-error-publishfailed" message.

Change-Id: I1bce2a7df68891ad8254821f55bd2c7f9f35c373
---

diff --git a/includes/upload/PublishStashedFile.php b/includes/upload/PublishStashedFile.php
index fec3c73269..8198dea84f 100644
--- a/includes/upload/PublishStashedFile.php
+++ b/includes/upload/PublishStashedFile.php
@@ -112,7 +112,7 @@ class PublishStashedFile extends Maintenance {
 				array(
 					'result' => 'Failure',
 					'stage'  => 'publish',
-					'status' => Status::newFatal( 'api-error-stashfailed' )
+					'status' => Status::newFatal( 'api-error-publishfailed' )
 				)
 			);
 			throw $e;
diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index ab27dc6a16..07680cac4c 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -4970,6 +4970,7 @@ Otherwise, you can use the easy form below. Your comment will be added to the pa
 'api-error-ok-but-empty'                  => 'Internal error: No response from server.',
 'api-error-overwrite'                     => 'Overwriting an existing file is not allowed.',
 'api-error-stashfailed'                   => 'Internal error: Server failed to store temporary file.',
+'api-error-publishfailed'                 => 'Internal error: Server failed to publish temporary file.',
 'api-error-timeout'                       => 'The server did not respond within the expected time.',
 'api-error-unclassified'                  => 'An unknown error occurred.',
 'api-error-unknown-code'                  => 'Unknown error: "$1".',
diff --git a/languages/messages/MessagesQqq.php b/languages/messages/MessagesQqq.php
index 769b1373b9..d072135239 100644
--- a/languages/messages/MessagesQqq.php
+++ b/languages/messages/MessagesQqq.php
@@ -4331,7 +4331,7 @@ See also:
 **{{msg-mw|enotif body intro deleted}}
 **{{msg-mw|enotif body intro created}}
 **{{msg-mw|enotif body intro moved}}
-**{{msg-mw|enotif body intro restored}} 
+**{{msg-mw|enotif body intro restored}}
 **{{msg-mw|enotif body intro changed}} (for all the other cases).
 *$NEWPAGE consists of either
 **if the page is new (in older releases), {{msg-mw|enotif newpagetext}}
@@ -4419,7 +4419,7 @@ See also:
 'rollback' => '{{Identical|Rollback}}',
 'rollback_short' => '{{Identical|Rollback}}',
 'rollbacklink' => '{{Identical|Rollback}}
-This link text appears on the recent changes page to users who have the "rollback" right.  
+This link text appears on the recent changes page to users who have the "rollback" right.
 This message has a tooltip {{msg-mw|tooltip-rollback}}
 
 {{Doc-actionlink}}',
@@ -8619,6 +8619,7 @@ $4 is the gender of the target user.',
 'api-error-ok-but-empty' => 'API error message that can be used for client side localisation of API errors.',
 'api-error-overwrite' => 'API error message that can be used for client side localisation of API errors.',
 'api-error-stashfailed' => 'API error message that can be used for client side localisation of API errors.',
+'api-error-publishfailed' => 'API error message that can be used for client side localisation of API errors.',
 'api-error-timeout' => 'API error message that can be used for client side localisation of API errors.',
 'api-error-unclassified' => 'API error message that can be used for client side localisation of API errors.',
 'api-error-unknown-code' => 'API error message that can be used for client side localisation of API errors. Parameters:
diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index 50a6f2e6ed..aa6b858cda 100644
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -3823,6 +3823,7 @@ $wgMessageStructure = array(
 		'api-error-ok-but-empty',
 		'api-error-overwrite',
 		'api-error-stashfailed',
+		'api-error-publishfailed',
 		'api-error-timeout',
 		'api-error-unclassified',
 		'api-error-unknown-code',