[MediaWiki-commits] [Gerrit] Add custom error messages to blocked users for global and To... - change (mediawiki...WikimediaMessages)
jenkins-bot has submitted this change and it was merged.
Change subject: Add custom error messages to blocked users for global and Tor
blocks
..
Add custom error messages to blocked users for global and Tor blocks
The bug was about global blocks only, but the instructions apply to
Tor blocks as well. [[m:No open proxies]] has just been updated.
I'm leaving the links with Special:MyLanguage in the message because
the added markup is negligible and translators may want to customise
the target subpage in some cases: in some cases a target subpage may
better than the normal fallback, especially as unregistered users can't
use the UniversalLanguageSelector and Tor users will most likely not
have an account; updating links on translatewiki.net is easier than
in configuration but should not happen so often as to require a
separate message just for the link.
Requires the hooks to be added in the extensions:
Id429e01453bbb84692bf85486c59c973ef74da40
I447afd1fe56c5c8ac30a083d506d22a5a9119df4
Bug: 42231
Change-Id: Id45385f8dc3edaaef049c535ea6037c42e56ccd2
---
M WikimediaMessages.i18n.php
M WikimediaMessages.php
2 files changed, 82 insertions(+), 0 deletions(-)
Approvals:
Parent5446: Looks good to me, approved
jenkins-bot: Verified
diff --git a/WikimediaMessages.i18n.php b/WikimediaMessages.i18n.php
index 16d3dc2..32d2c62 100644
--- a/WikimediaMessages.i18n.php
+++ b/WikimediaMessages.i18n.php
@@ -260,6 +260,37 @@
# Bug 33464: Developers link in the page footer
'wikimedia-developers' = 'Developers',
'wikimedia-developers-url' =
'https://www.mediawiki.org/wiki/Special:MyLanguage/How_to_contribute',
+
+ # Bug 42231: Global blocks should have a specific message for WMF
projects
+ 'wikimedia-globalblocking-ipblocked' = '''Your IP address has been
[[m:Special:MyLanguage/Global blocks|blocked on all wikis]].'''
+
+The block was made by $1 ($2).
+The reason given is ''$3''.
+
+* Start of block: $4
+* Expiry of block: $5
+
+Your current IP address is $6.
+Please include all above details in any queries you make.
+
+If you believe you were blocked by mistake, you can find additional
information and instructions in the [[m:Special:MyLanguage/No open proxies|No
open proxies]] global policy.
+Otherwise, to discuss the block please [[m:Steward requests/Global|post a
request for review on Meta-Wiki]].,
+ 'wikimedia-globalblocking-ipblocked-xff' = '''One or more proxy
servers used by your request is [[m:Special:MyLanguage/Global blocks|globally
blocked]].'''
+
+The block was made by $1 ($2).
+The reason given is ''$3''.
+
+* Start of block: $4
+* Expiry of block: $5
+
+The blocked proxy address was $6.
+Please include all above details in any queries you make.
+
+If you believe you were blocked by mistake, you can find additional
information and instructions in the [[m:Special:MyLanguage/No open proxies|No
open proxies]] global policy.
+Otherwise, to discuss the block please [[m:Steward requests/Global|post a
request for review on Meta-Wiki]].,
+ 'wikimedia-torblock-blocked' = 'Your IP address, strong$1/strong,
has been automatically identified as a Tor exit node.
+Editing through Tor is blocked to prevent abuse.
+For additional information and instructions to legitimate users, see the
[[m:Special:MyLanguage/No open proxies|No open proxies]] global policy.',
);
/** Message documentation (Message documentation)
@@ -516,6 +547,33 @@
'wikimedia-developers' = 'Message in page footer that links to a
Developers landing page.
{{Identical|Developer}}',
'wikimedia-developers-url' = 'The URL of a portal page for development
efforts.',
+ 'wikimedia-torblock-blocked' = 'Used as error message; it is a
modified version of {{msg-mw|torblock-blocked}}.
+Parameters:
+* $1 - IP address',
+ 'wikimedia-globalblocking-ipblocked' = 'A message shown to a
[[mw:Extension:GlobalBlocking|globally blocked]] user trying to edit.
+
+Refers to {{msg-mw|Emailuser}} and is a customised version of
{{msg-mw|globalblocking-ipblocked}}.
+
+This message is similar to a [[MediaWiki:Blockedtext|MediaWiki core message]].
+
+Parameters:
+* $1 - the username of the blocking user (steward), with a link
+* $2 - the project name where the blocking user is registered (usually
meta.wikimedia.org on Wikimedia servers)
+* $3 - the reason specified by the blocking user
+* $4 - a timestamp for when the block was set
+* $5 - a timestamp for when the block will expire (or {{msg-mw|Infiniteblock}})
+* $6 - the IP address of the globally blocked user',
+ 'wikimedia-globalblocking-ipblocked-xff' = A message shown to users
who have one or more proxies in their XFF header who's IP are blocked.
+
+Refers to {{msg-mw|Emailuser}} and is a customised version of
{{msg-mw|globalblocking-ipblocked-xff}}.
+
+Parameters:
+* $1 - username
+* $2 - wikiname
+* $3 - reason
+* $4 - start timestamp of block;
[MediaWiki-commits] [Gerrit] Add custom error messages to blocked users for global and To... - change (mediawiki...WikimediaMessages)
Nemo bis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/84343
Change subject: Add custom error messages to blocked users for global and Tor
blocks
..
Add custom error messages to blocked users for global and Tor blocks
The bug was about global blocks only, but the instructions apply to
Tor blocks as well. [[m:No open proxies]] has just been updated.
I'm leaving the links with Special:MyLanguage in the message because
the added markup is negligible and translators may want to customise
the target subpage in some cases: in some cases a target subpage may
better than the normal fallback, especially as unregistered users can't
use the UniversalLanguageSelector and Tor users will most likely not
have an account; updating links on translatewiki.net is easier than
in configuration but should not happen so often as to require a
separate message just for the link.
Requires the hooks to be added in the extensions:
Id429e01453bbb84692bf85486c59c973ef74da40
I447afd1fe56c5c8ac30a083d506d22a5a9119df4
Bug: 42231
Change-Id: Id45385f8dc3edaaef049c535ea6037c42e56ccd2
---
M WikimediaMessages.i18n.php
M WikimediaMessages.php
2 files changed, 80 insertions(+), 0 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikimediaMessages
refs/changes/43/84343/1
diff --git a/WikimediaMessages.i18n.php b/WikimediaMessages.i18n.php
index 16d3dc2..210daad 100644
--- a/WikimediaMessages.i18n.php
+++ b/WikimediaMessages.i18n.php
@@ -260,6 +260,37 @@
# Bug 33464: Developers link in the page footer
'wikimedia-developers' = 'Developers',
'wikimedia-developers-url' =
'https://www.mediawiki.org/wiki/Special:MyLanguage/How_to_contribute',
+
+ # Bug 42231: Global blocks should have a specific message for WMF
projects
+ 'wikimedia-globalblocking-ipblocked' = '''Your IP address has been
[[m:Special:MyLanguage/Global blocks|blocked on all wikis]].'''
+
+The block was made by $1 ($2).
+The reason given is ''$3''.
+
+* Start of block: $4
+* Expiry of block: $5
+
+Your current IP address is $6.
+Please include all above details in any queries you make.
+
+If you believe you were blocked by mistake, you can find additional
information and instructions in the [[m:Special:MyLanguage/No open proxies|No
open proxies]] global policy.
+Otherwise, to discuss the block please [[m:Steward requests/Global|post a
request for review on Meta-Wiki]].,
+ 'wikimedia-globalblocking-ipblocked-xff' = '''One or more proxy
servers used by your request is [[m:Special:MyLanguage/Global blocks|globally
blocked]].'''
+
+The block was made by $1 ($2).
+The reason given is ''$3''.
+
+* Start of block: $4
+* Expiry of block: $5
+
+The blocked proxy address was $6.
+Please include all above details in any queries you make.
+
+If you believe you were blocked by mistake, you can find additional
information and instructions in the [[m:Special:MyLanguage/No open proxies|No
open proxies]] global policy.
+Otherwise, to discuss the block please [[m:Steward requests/Global|post a
request for review on Meta-Wiki]].,
+ 'wikimedia-torblock-blocked' = 'Your IP address, strong$1/strong,
has been automatically identified as a tor exit node.
+Editing through tor is blocked to prevent abuse.
+For additional information and instructions to legitimate users, see the
[[m:Special:MyLanguage/No open proxies|No open proxies]] global policy.',
);
/** Message documentation (Message documentation)
@@ -516,6 +547,33 @@
'wikimedia-developers' = 'Message in page footer that links to a
Developers landing page.
{{Identical|Developer}}',
'wikimedia-developers-url' = 'The URL of a portal page for development
efforts.',
+ 'wikimedia-torblock-blocked' = 'Used as error message; it is a
modified version of {{msg-mw|torblock-blocked}}.
+Parameters:
+* $1 - IP address',
+ 'wikimedia-globalblocking-ipblocked' = 'A message shown to a
[[mw:Extension:GlobalBlocking|globally blocked]] user trying to edit.
+
+Refers to {{msg-mw|Emailuser}} and is a customised version of
{{msg-mw|globalblocking-ipblocked}}.
+
+This message is similar to a [[MediaWiki:Blockedtext|MediaWiki core message]].
+
+Parameters:
+* $1 - the username of the blocking user (steward), with a link
+* $2 - the project name where the blocking user is registered (usually
meta.wikimedia.org on Wikimedia servers)
+* $3 - the reason specified by the blocking user
+* $4 - a timestamp for when the block was set
+* $5 - a timestamp for when the block will expire (or {{msg-mw|Infiniteblock}})
+* $6 - the IP address of the globally blocked user',
+ 'wikimedia-globalblocking-ipblocked-xff' = A message shown to users
who have one or more proxies in their XFF header who's IP are blocked.
+
+Refers to {{msg-mw|Emailuser}} and is a customised version of
{{msg-mw|globalblocking-ipblocked-xff}}.
+
+Parameters:
+* $1 - username
+* $2 -
