Siebrand has submitted this change and it was merged.
Change subject: Fix spellings & Remove "successfully"
......................................................................
Fix spellings & Remove "successfully"
* Replace "(was )successfully" by "has been"
* Fix spellings (email, received, restriction)
* Fix comments for grep
Change-Id: I75e71dff4871bf35270eee4e87e8dd446d0bf7ff
---
M backend/MWOAuthConsumer.php
M frontend/language/MWOAuth.i18n.php
M frontend/specialpages/actions/MWOAuthConsumerRegistration.php
M frontend/specialpages/actions/MWOAuthManageConsumers.php
4 files changed, 15 insertions(+), 16 deletions(-)
Approvals:
Siebrand: Verified; Looks good to me, approved
diff --git a/backend/MWOAuthConsumer.php b/backend/MWOAuthConsumer.php
index c6066e9..2601e33 100644
--- a/backend/MWOAuthConsumer.php
+++ b/backend/MWOAuthConsumer.php
@@ -165,7 +165,7 @@
/**
* @return array
*/
- public static function newRestictions() {
+ public static function newRestrictions() {
return array( 'IPAddresses' => array( '0.0.0.0/0', '::/0' ) );
}
diff --git a/frontend/language/MWOAuth.i18n.php
b/frontend/language/MWOAuth.i18n.php
index 68c47fa..f2187aa 100644
--- a/frontend/language/MWOAuth.i18n.php
+++ b/frontend/language/MWOAuth.i18n.php
@@ -22,12 +22,12 @@
'mwoauth-consumer-version' => 'Major version:',
'mwoauth-consumer-user' => 'Publisher:',
'mwoauth-consumer-stage' => 'Current status:',
- 'mwoauth-consumer-email' => 'Contact E-mail address:',
+ 'mwoauth-consumer-email' => 'Contact email address:',
'mwoauth-consumer-description' => 'Application description:',
'mwoauth-consumer-callbackurl' => 'OAuth "callback" URL:',
'mwoauth-consumer-grantsneeded' => 'Applicable grants (JSON):',
'mwoauth-consumer-wiki' => 'Applicable wiki:',
- 'mwoauth-consumer-restrictions' => 'Usage restictions (JSON):',
+ 'mwoauth-consumer-restrictions' => 'Usage restrictions (JSON):',
'mwoauth-consumer-rsakey' => 'Consumer RSA key:',
'mwoauth-consumer-secretkey' => 'Consumer secret token:',
'mwoauth-consumer-accesstoken' => 'Access token:',
@@ -67,10 +67,10 @@
'mwoauthconsumerregistration-update-legend' => 'Update OAuth consumer
application',
'mwoauthconsumerregistration-propose-submit' => 'Propose consumer',
'mwoauthconsumerregistration-update-submit' => 'Update consumer',
- 'mwoauthconsumerregistration-proposed' => 'You consumer request was
successfully recieved.
+ 'mwoauthconsumerregistration-proposed' => 'You consumer request has
been received.
You have been assigned a consumer token of $1 and a secret token of $2.
\'\'\'Please record these for future reference.\'\'\'',
- 'mwoauthconsumerregistration-updated' => 'You consumer registry was
successfully updated.',
+ 'mwoauthconsumerregistration-updated' => 'You consumer registry has
been updated.',
'mwoauthmanageconsumers' => 'Manage OAuth consumers',
'mwoauthmanageconsumers-type' => 'Queues:',
@@ -94,7 +94,7 @@
'mwoauthmanageconsumers-name' => 'Consumer',
'mwoauthmanageconsumers-user' => 'Publisher',
'mwoauthmanageconsumers-description' => 'Description',
- 'mwoauthmanageconsumers-email' => 'Contact e-mail',
+ 'mwoauthmanageconsumers-email' => 'Contact email',
'mwoauthmanageconsumers-consumerkey' => 'Consumer key',
'mwoauthmanageconsumers-lastchange' => 'Last change',
'mwoauthmanageconsumers-review' => 'review/manage',
@@ -110,10 +110,10 @@
'mwoauthmanageconsumers-reason' => 'Reason:',
'mwoauthmanageconsumers-confirm-submit' => 'Update consumer status',
'mwoauthmanageconsumers-viewing' => 'User "$1" is currently viewing
this consumer',
- 'mwoauthmanageconsumers-success-approved' => 'Request successfuly
approved.',
- 'mwoauthmanageconsumers-success-rejected' => 'Request successfuly
rejected.',
- 'mwoauthmanageconsumers-success-disabled' => 'Consumer successfuly
disabled.',
- 'mwoauthmanageconsumers-success-reanable' => 'Consumer successfuly
re-enabled.',
+ 'mwoauthmanageconsumers-success-approved' => 'Request has been
approved.',
+ 'mwoauthmanageconsumers-success-rejected' => 'Request has been
rejected.',
+ 'mwoauthmanageconsumers-success-disabled' => 'Consumer has been
disabled.',
+ 'mwoauthmanageconsumers-success-reanable' => 'Consumer has been
re-enabled.',
'mwoauthmanagemygrants' => 'Manage account OAuth grants',
'mwoauthmanagemygrants-navigation' => 'Navigation:',
@@ -138,8 +138,8 @@
'mwoauthmanagemygrants-renounce' => 'De-authorize and delete access
token',
'mwoauthmanagemygrants-action' => 'Change status:',
'mwoauthmanagemygrants-confirm-submit' => 'Update access token status',
- 'mwoauthmanagemygrants-success-update' => 'The access token for this
consumer was successfully updated.',
- 'mwoauthmanagemygrants-success-renounce' => 'The access token for this
consumer was successfully deleted.',
+ 'mwoauthmanagemygrants-success-update' => 'The access token for this
consumer has been updated.',
+ 'mwoauthmanagemygrants-success-renounce' => 'The access token for this
consumer has been deleted.',
'mwoauth-logentry-consumer-propose' => 'proposed an OAuth consumer
(consumer key $2)',
'mwoauth-logentry-consumer-update' => 'updated an OAuth consumer
(consumer key $2)',
diff --git a/frontend/specialpages/actions/MWOAuthConsumerRegistration.php
b/frontend/specialpages/actions/MWOAuthConsumerRegistration.php
index 7b894a1..d52a367 100644
--- a/frontend/specialpages/actions/MWOAuthConsumerRegistration.php
+++ b/frontend/specialpages/actions/MWOAuthConsumerRegistration.php
@@ -92,7 +92,7 @@
'type' => 'textarea',
'label-message' =>
'mwoauth-consumer-restrictions',
'required' => true,
- 'default' =>
FormatJSON::encode( MWOAuthConsumer::newRestictions() ),
+ 'default' =>
FormatJSON::encode( MWOAuthConsumer::newRestrictions() ),
'rows' => 5
),
'rsaKey' => array(
diff --git a/frontend/specialpages/actions/MWOAuthManageConsumers.php
b/frontend/specialpages/actions/MWOAuthManageConsumers.php
index 267c214..b5774ad 100644
--- a/frontend/specialpages/actions/MWOAuthManageConsumers.php
+++ b/frontend/specialpages/actions/MWOAuthManageConsumers.php
@@ -166,7 +166,7 @@
Linker::makeKnownLinkObj(
$this->getTitle( $stageKey ),
// Give grep a chance to find the
usages:
- // mwoauthmanageconsumers-q-proposed,
mwoauthmanageconsumers-q-reject,
+ // mwoauthmanageconsumers-q-proposed,
mwoauthmanageconsumers-q-rejected,
// mwoauthmanageconsumers-q-expired
$this->msg( 'mwoauthmanageconsumers-q-'
. $stageKey )->escaped()
) .
@@ -184,8 +184,7 @@
Linker::makeKnownLinkObj(
$this->getTitle( $stageKey ),
// Give grep a chance to find the
usages:
- // mwoauthmanageconsumers-l-proposed,
mwoauthmanageconsumers-l-reject,
- // mwoauthmanageconsumers-l-expired
+ // mwoauthmanageconsumers-l-approved,
mwoauthmanageconsumers-l-disabled
$this->msg( 'mwoauthmanageconsumers-l-'
. $stageKey )->escaped()
) .
" [$counts[$stage]]" .
--
To view, visit https://gerrit.wikimedia.org/r/72242
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I75e71dff4871bf35270eee4e87e8dd446d0bf7ff
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/OAuth
Gerrit-Branch: master
Gerrit-Owner: Shirayuki <[email protected]>
Gerrit-Reviewer: Shirayuki <[email protected]>
Gerrit-Reviewer: Siebrand <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
