Addshore has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/362302 )
Change subject: i18n API error messages & stop using dieUsage()
......................................................................
i18n API error messages & stop using dieUsage()
Change-Id: I1c06c6fb4ef387d1267f6142fd83d33dedb7f2cf
---
M i18n/en.json
M i18n/qqq.json
M includes/api/ApiNewsletterManage.php
M includes/api/ApiNewsletterSubscribe.php
4 files changed, 22 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Newsletter
refs/changes/02/362302/1
diff --git a/i18n/en.json b/i18n/en.json
index 850f2a3..68e862d 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -4,7 +4,8 @@
"Tina Johnson",
"Thomas Arrow",
"Glaisher",
- "Divadsn"
+ "Divadsn",
+ "Addshore"
]
},
"newsletter-extension-desc": "Enables users to publish and subscribe to
newsletters",
@@ -168,5 +169,10 @@
"newsletter-restore-failure-title": "Newsletter could not be restored.",
"newsletter-diff-descheader": "Changes in the description:",
"newsletter-diff-mainpageheader": "Changes in Main Page:",
- "newsletter-diff-publishersheader": "Changes in publishers:"
+ "newsletter-diff-publishersheader": "Changes in publishers:",
+ "newsletter-api-error-notfound": "Newsletter does not exist",
+ "newsletter-api-error-nopermissions": "You do not have permission to
manage newsletters.",
+ "newsletter-api-error-invalidpublisher-registered": "Publisher is not a
registered user.",
+ "newsletter-api-error-managefailure": "Manage action: $1 failed.",
+ "newsletter-api-error-subscribe-notloggedin": "You must be logged-in to
subscribe to newsletters."
}
diff --git a/i18n/qqq.json b/i18n/qqq.json
index dd56817..b604712 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -11,7 +11,8 @@
"Verdy p",
"Amire80",
"Base",
- "Divadsn"
+ "Divadsn",
+ "Addshore"
]
},
"newsletter-extension-desc":
"{{desc|name=Newsletter|url=https://www.mediawiki.org/wiki/Extension:Newsletter}}";,
@@ -175,5 +176,10 @@
"newsletter-restore-failure-title": "Title for
\"newsletter-restore-failure\"",
"newsletter-diff-descheader": "Header for the diff of the description
between two revisions",
"newsletter-diff-mainpageheader": "Header for the diff of Main Page
between two revisions",
- "newsletter-diff-publishersheader": "Header for the diff of publishers
between two revisions"
+ "newsletter-diff-publishersheader": "Header for the diff of publishers
between two revisions",
+ "newsletter-api-error-notfound": "Error message to be displayed in the
API when a newsletter is not found.",
+ "newsletter-api-error-nopermissions": "Error message to be displayed in
the API when the requesting user does not have the required permissions.",
+ "newsletter-api-error-invalidpublisher-registered": "Error message to
be displayed in the API when a given publisher is not a registered account.",
+ "newsletter-api-error-managefailure": "Error message to be displayed in
the API when the requested manage action has failed.",
+ "newsletter-api-error-subscribe-notloggedin": "Error message to be
displayed in the API when a request is made to subscribe to a newsletter by an
anonymous user.."
}
diff --git a/includes/api/ApiNewsletterManage.php
b/includes/api/ApiNewsletterManage.php
index 5b3e917..2222942 100644
--- a/includes/api/ApiNewsletterManage.php
+++ b/includes/api/ApiNewsletterManage.php
@@ -5,8 +5,6 @@
*
* @license GNU GPL v2+
* @author Tina Johnson
- *
- * @todo Add i18n
*/
class ApiNewsletterManage extends ApiBase {
@@ -17,16 +15,16 @@
$newsletter = Newsletter::newFromID( $params['id'] );
if ( !$newsletter ) {
- $this->dieUsage( 'Newsletter does not exist',
'notfound' );
+ $this->dieWithError( 'newsletter-api-error-notfound',
'notfound' );
}
if ( !$newsletter->canManage( $user ) ) {
- $this->dieUsage( 'You do not have permission to manage
newsletters.', 'nopermissions' );
+ $this->dieWithError(
'newsletter-api-error-nopermissions', 'nopermissions' );
}
$publisher = User::newFromId( $params['publisher'] );
if ( !$publisher || $publisher->getId() === 0 ) {
- $this->dieUsage( 'Publisher is not a registered user.',
'invalidpublisher' );
+ $this->dieWithError(
'newsletter-api-error-invalidpublisher-registered', 'invalidpublisher' );
}
$store = NewsletterStore::getDefaultInstance();
@@ -40,7 +38,7 @@
}
if ( !$success ) {
- $this->dieUsage( "Manage action: $action failed. Please
try again.", 'managefailure' );
+ $this->dieWithError( new Message(
'newsletter-api-error-managefailure', [ $action ] ), 'managefailure' );
}
// Success
diff --git a/includes/api/ApiNewsletterSubscribe.php
b/includes/api/ApiNewsletterSubscribe.php
index 5937b83..6e277a9 100644
--- a/includes/api/ApiNewsletterSubscribe.php
+++ b/includes/api/ApiNewsletterSubscribe.php
@@ -9,14 +9,14 @@
$user = $this->getUser();
if ( !$user->isLoggedIn() ) {
- $this->dieUsage( 'You must be logged-in to subscribe to
newsletters', 'notloggedin' );
+ $this->dieWithError(
'newsletter-api-error-subscribe-notloggedin', 'notloggedin' );
}
$params = $this->extractRequestParams();
$newsletter = Newsletter::newFromID( $params['id'] );
if ( !$newsletter ) {
- $this->dieUsage( 'Newsletter does not exist',
'notfound' );
+ $this->dieWithError( 'newsletter-api-error-notfound',
'notfound' );
}
switch ( $params['do'] ) {
--
To view, visit https://gerrit.wikimedia.org/r/362302
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1c06c6fb4ef387d1267f6142fd83d33dedb7f2cf
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Newsletter
Gerrit-Branch: master
Gerrit-Owner: Addshore <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
