Glaisher has uploaded a new change for review.
https://gerrit.wikimedia.org/r/233396
Change subject: Remove $1 parameter from 'globalblocking-block-expiryinvalid'
message
......................................................................
Remove $1 parameter from 'globalblocking-block-expiryinvalid' message
This message is shown if (expiry time === false) so the parameter is useless
and causes a useless "()" to be shown on the message.
Change-Id: Ia15d8015977c5a2c9c76a5cff71379ef22c1580d
---
M i18n/en.json
M i18n/qqq.json
M includes/GlobalBlocking.class.php
3 files changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/GlobalBlocking
refs/changes/96/233396/1
diff --git a/i18n/en.json b/i18n/en.json
index d8c6f4e..b3bacf1 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -23,7 +23,7 @@
"globalblocking-ipbanononly": "Block anonymous users only",
"globalblocking-block-errors": "Your block was unsuccessful, for the
following {{PLURAL:$1|reason|reasons}}:",
"globalblocking-block-ipinvalid": "The IP address ($1) you entered is
invalid.\nPlease note that you cannot enter a user name!",
- "globalblocking-block-expiryinvalid": "The expiry you entered ($1) is
invalid.",
+ "globalblocking-block-expiryinvalid": "The expiry you entered is
invalid.",
"globalblocking-block-submit": "Block this IP address globally",
"globalblocking-modify-submit": "Modify this global block",
"globalblocking-block-success": "The IP address $1 has been
successfully blocked on all projects.",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 69ec5e1..931e777 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -48,7 +48,7 @@
"globalblocking-ipbanononly": "Label for checkbox to block anonymous
users only.",
"globalblocking-block-errors": "The first line of the error message
shown on [[Special:GlobalBlock]] (see [[mw:Extension:GlobalBlocking]]) if the
block has been unsuccessful.\n\nAfter this message, a list of specific errors
is shown (see {{msg-mw|Globalblocking-block-bigrange}},
{{msg-mw|Globalblocking-block-expiryinvalid}} etc.).\n\nParameters:\n* $1 – the
''number'' of errors (not the errors themselves)\nSee also:\n*
{{msg-mw|Globalblocking-search-errors}}",
"globalblocking-block-ipinvalid": "{{Identical|The IP address ($1)
...}}",
- "globalblocking-block-expiryinvalid": "Used as error message.
Parameters:\n* $1 - timestamp of expiry",
+ "globalblocking-block-expiryinvalid": "Used as error message on
Special:GlobalBlock if expiry time entered was invalid.",
"globalblocking-block-submit": "Used as submit button text on
Special:GlobalBlock form.\n\nSee also:\n*
{{msg-mw|globalblocking-modify-submit}}\n* {{msg-mw|ipbsubmit}}",
"globalblocking-modify-submit": "Used as submit button text on
Special:GlobalBlock form when modifying an existing global block.\n\nSee
also:\n* {{msg-mw|globalblocking-block-submit}}\n* {{msg-mw|ipb-change-block}}",
"globalblocking-block-success": "Used in [[Special:GlobalBlock]].
Parameters:\n* $1 - IP address\nSee also:\n*
{{msg-mw|Globalblocking-block-successsub}} - sub message",
diff --git a/includes/GlobalBlocking.class.php
b/includes/GlobalBlocking.class.php
index 80170a4..3329cf2 100644
--- a/includes/GlobalBlocking.class.php
+++ b/includes/GlobalBlocking.class.php
@@ -309,7 +309,7 @@
}
if ( false === $expiry ) {
- $errors[] = array(
'globalblocking-block-expiryinvalid', $expiry );
+ $errors[] = array( 'globalblocking-block-expiryinvalid'
);
}
// Check for too-big ranges.
--
To view, visit https://gerrit.wikimedia.org/r/233396
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia15d8015977c5a2c9c76a5cff71379ef22c1580d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GlobalBlocking
Gerrit-Branch: master
Gerrit-Owner: Glaisher <glaisher.w...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
