Alex Monk has uploaded a new change for review.
https://gerrit.wikimedia.org/r/51846
Change subject: Bug 45633: Use 'email' instead of 'e-mail' in API texts.
......................................................................
Bug 45633: Use 'email' instead of 'e-mail' in API texts.
Change-Id: Ieddc066be4051a20f0500b52e6b021e877d6c97d
---
M includes/api/ApiBase.php
M includes/api/ApiBlock.php
M includes/api/ApiCreateAccount.php
M includes/api/ApiQueryUsers.php
4 files changed, 9 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/46/51846/1
diff --git a/includes/api/ApiBase.php b/includes/api/ApiBase.php
index 4a6dad3..d80949d 100644
--- a/includes/api/ApiBase.php
+++ b/includes/api/ApiBase.php
@@ -1213,7 +1213,7 @@
'nocreatetext' => array( 'code' => 'cantcreate-anon', 'info' =>
"Anonymous users can't create new pages" ),
'movenologintext' => array( 'code' => 'cantmove-anon', 'info'
=> "Anonymous users can't move pages" ),
'movenotallowed' => array( 'code' => 'cantmove', 'info' => "You
don't have permission to move pages" ),
- 'confirmedittext' => array( 'code' => 'confirmemail', 'info' =>
"You must confirm your e-mail address before you can edit" ),
+ 'confirmedittext' => array( 'code' => 'confirmemail', 'info' =>
"You must confirm your email address before you can edit" ),
'blockedtext' => array( 'code' => 'blocked', 'info' => "You
have been blocked from editing" ),
'autoblockedtext' => array( 'code' => 'autoblocked', 'info' =>
"Your IP address has been blocked automatically, because it was used by a
blocked user" ),
@@ -1243,13 +1243,13 @@
'ipb_already_blocked' => array( 'code' => 'alreadyblocked',
'info' => "The user you tried to block was already blocked" ),
'ipb_blocked_as_range' => array( 'code' => 'blockedasrange',
'info' => "IP address \"\$1\" was blocked as part of range \"\$2\". You can't
unblock the IP invidually, but you can unblock the range as a whole." ),
'ipb_cant_unblock' => array( 'code' => 'cantunblock', 'info' =>
"The block you specified was not found. It may have been unblocked already" ),
- 'mailnologin' => array( 'code' => 'cantsend', 'info' => "You
are not logged in, you do not have a confirmed e-mail address, or you are not
allowed to send e-mail to other users, so you cannot send e-mail" ),
+ 'mailnologin' => array( 'code' => 'cantsend', 'info' => "You
are not logged in, you do not have a confirmed email address, or you are not
allowed to send email to other users, so you cannot send email" ),
'ipbblocked' => array( 'code' => 'ipbblocked', 'info' => 'You
cannot block or unblock users while you are yourself blocked' ),
'ipbnounblockself' => array( 'code' => 'ipbnounblockself',
'info' => 'You are not allowed to unblock yourself' ),
'usermaildisabled' => array( 'code' => 'usermaildisabled',
'info' => "User email has been disabled" ),
- 'blockedemailuser' => array( 'code' => 'blockedfrommail',
'info' => "You have been blocked from sending e-mail" ),
+ 'blockedemailuser' => array( 'code' => 'blockedfrommail',
'info' => "You have been blocked from sending email" ),
'notarget' => array( 'code' => 'notarget', 'info' => "You have
not specified a valid target for this action" ),
- 'noemail' => array( 'code' => 'noemail', 'info' => "The user
has not specified a valid e-mail address, or has chosen not to receive e-mail
from other users" ),
+ 'noemail' => array( 'code' => 'noemail', 'info' => "The user
has not specified a valid email address, or has chosen not to receive email
from other users" ),
'rcpatroldisabled' => array( 'code' => 'patroldisabled', 'info'
=> "Patrolling is disabled on this wiki" ),
'markedaspatrollederror-noautopatrol' => array( 'code' =>
'noautopatrol', 'info' => "You don't have permission to patrol your own
changes" ),
'delete-toobig' => array( 'code' => 'bigdelete', 'info' => "You
can't delete this page because it has more than \$1 revisions" ),
@@ -1278,7 +1278,7 @@
'missingtitle-createonly' => array( 'code' =>
'missingtitle-createonly', 'info' => "Missing titles can only be protected with
'create'" ),
'cantblock' => array( 'code' => 'cantblock', 'info' => "You
don't have permission to block users" ),
'canthide' => array( 'code' => 'canthide', 'info' => "You don't
have permission to hide user names from the block log" ),
- 'cantblock-email' => array( 'code' => 'cantblock-email', 'info'
=> "You don't have permission to block users from sending e-mail through the
wiki" ),
+ 'cantblock-email' => array( 'code' => 'cantblock-email', 'info'
=> "You don't have permission to block users from sending email through the
wiki" ),
'unblock-notarget' => array( 'code' => 'notarget', 'info' =>
"Either the id or the user parameter must be set" ),
'unblock-idanduser' => array( 'code' => 'idanduser', 'info' =>
"The id and user parameters can't be used together" ),
'cantunblock' => array( 'code' => 'permissiondenied', 'info' =>
"You don't have permission to unblock users" ),
diff --git a/includes/api/ApiBlock.php b/includes/api/ApiBlock.php
index 2e4155a..b479310 100644
--- a/includes/api/ApiBlock.php
+++ b/includes/api/ApiBlock.php
@@ -183,7 +183,7 @@
'anononly' => 'Block anonymous users only (i.e. disable
anonymous edits for this IP)',
'nocreate' => 'Prevent account creation',
'autoblock' => 'Automatically block the last used IP
address, and any subsequent IP addresses they try to login from',
- 'noemail' => 'Prevent user from sending e-mail through
the wiki. (Requires the "blockemail" right.)',
+ 'noemail' => 'Prevent user from sending email through
the wiki. (Requires the "blockemail" right.)',
'hidename' => 'Hide the username from the block log.
(Requires the "hideuser" right.)',
'allowusertalk' => 'Allow the user to edit their own
talk page (depends on $wgBlockAllowsUTEdit)',
'reblock' => 'If the user is already blocked, overwrite
the existing block',
diff --git a/includes/api/ApiCreateAccount.php
b/includes/api/ApiCreateAccount.php
index b6c6210..7a36ce8 100644
--- a/includes/api/ApiCreateAccount.php
+++ b/includes/api/ApiCreateAccount.php
@@ -193,9 +193,9 @@
'password' => "Password (ignored if {$p}mailpassword is
set)",
'domain' => 'Domain for external authentication
(optional)',
'token' => 'Account creation token obtained in first
request',
- 'email' => 'E-mail address of user (optional)',
+ 'email' => 'Email address of user (optional)',
'realname' => 'Real name of user (optional)',
- 'mailpassword' => 'If set to any value, a random
password will be e-mailed to the user',
+ 'mailpassword' => 'If set to any value, a random
password will be emailed to the user',
'reason' => 'Optional reason for creating the account
to be put in the logs',
'language' => 'Language code to set as default for the
user (optional, defaults to content language)'
);
diff --git a/includes/api/ApiQueryUsers.php b/includes/api/ApiQueryUsers.php
index 50ea587..dff924f 100644
--- a/includes/api/ApiQueryUsers.php
+++ b/includes/api/ApiQueryUsers.php
@@ -310,7 +310,7 @@
' rights - Lists all the rights the
user(s) has',
' editcount - Adds the user\'s edit
count',
' registration - Adds the user\'s
registration timestamp',
- ' emailable - Tags if the user can and
wants to receive e-mail through [[Special:Emailuser]]',
+ ' emailable - Tags if the user can and
wants to receive email through [[Special:Emailuser]]',
' gender - Tags the gender of the
user. Returns "male", "female", or "unknown"',
),
'users' => 'A list of users to obtain the same
information for',
--
To view, visit https://gerrit.wikimedia.org/r/51846
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ieddc066be4051a20f0500b52e6b021e877d6c97d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Alex Monk <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
