Aaron Schulz has uploaded a new change for review.
https://gerrit.wikimedia.org/r/79824
Change subject: Adding some missing messages
......................................................................
Adding some missing messages
Change-Id: I84d60b056cacf79e2cf54d7bc7227f564bc963d0
---
M control/MWOAuthConsumerSubmitControl.php
M frontend/language/MWOAuth.i18n.php
2 files changed, 6 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/OAuth
refs/changes/24/79824/1
diff --git a/control/MWOAuthConsumerSubmitControl.php
b/control/MWOAuthConsumerSubmitControl.php
index a58e104..60a3417 100644
--- a/control/MWOAuthConsumerSubmitControl.php
+++ b/control/MWOAuthConsumerSubmitControl.php
@@ -128,10 +128,10 @@
if ( !$user->isAllowed( 'mwoauthproposeconsumer' ) ) {
return $this->failure( 'permission_denied',
'badaccess-group0' );
} elseif ( !$user->isEmailConfirmed() ) {
- return $this->failure( 'email_not_confirmed',
'mwoauth-email-not-confirmed' );
+ return $this->failure( 'email_not_confirmed',
'mwoauth-consumer-email-unconfirmed' );
} elseif ( $user->getEmail() !== $this->vals['email'] )
{
// @TODO: allow any email and don't set
emailAuthenticated below
- return $this->failure( 'email_mismatched',
'mwoauth-email-email_mismatched' );
+ return $this->failure( 'email_mismatched',
'mwoauth-consumer-email-mismatched' );
}
if ( MWOAuthConsumer::newFromNameVersionUser(
diff --git a/frontend/language/MWOAuth.i18n.php
b/frontend/language/MWOAuth.i18n.php
index 365fb4c..6ded8a8 100644
--- a/frontend/language/MWOAuth.i18n.php
+++ b/frontend/language/MWOAuth.i18n.php
@@ -39,6 +39,8 @@
'mwoauth-consumer-secretkey' => 'Consumer secret token:',
'mwoauth-consumer-accesstoken' => 'Access token:',
'mwoauth-consumer-reason' => 'Reason:',
+ 'mwoauth-consumer-email-unconfirmed' => 'Your account email address has
not yet been confirmed.',
+ 'mwoauth-consumer-email-mismatched' => 'Provided email address must
match that of your account.',
'mwoauth-consumer-alreadyexists' => 'A consumer with this
name/version/publisher combination already exists',
'mwoauth-consumer-alreadyexistsversion' => 'A consumer with this
name/publisher combination already exists with an equal or higher version
("$1")',
'mwoauth-consumer-not-accepted' => 'Cannot update information for a
pending consumer request',
@@ -351,6 +353,8 @@
'mwoauth-consumer-accesstoken' => 'Unused at this time.',
'mwoauth-consumer-reason' => 'Used as label for the "Reason" value.
{{Identical|Reason}}',
+ 'mwoauth-consumer-email-unconfirmed' => 'Used as failure message.',
+ 'mwoauth-consumer-email-mismatched' => 'Used as failure message.',
'mwoauth-consumer-alreadyexists' => 'Used as failure message.',
'mwoauth-consumer-alreadyexistsversion' => 'Used as failure message.
Parameters:
* $1 - current consumer version number',
--
To view, visit https://gerrit.wikimedia.org/r/79824
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I84d60b056cacf79e2cf54d7bc7227f564bc963d0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/OAuth
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
