jenkins-bot has submitted this change and it was merged. Change subject: Changed 'expiry' to American English 'expiration' in en.json ......................................................................
Changed 'expiry' to American English 'expiration' in en.json Added British 'expiry' strings to en-gb.json. https://translatewiki.net/wiki/Thread:Support/British_English_in_Mediawiki_messages Change-Id: I3913449fc697770122ce01c1733f15ee3a7976de --- M languages/i18n/en-gb.json M languages/i18n/en.json M tests/phpunit/includes/logging/BlockLogFormatterTest.php 3 files changed, 42 insertions(+), 25 deletions(-) Approvals: Umherirrender: Looks good to me, approved jenkins-bot: Verified diff --git a/languages/i18n/en-gb.json b/languages/i18n/en-gb.json index d1569c1..d64697d 100644 --- a/languages/i18n/en-gb.json +++ b/languages/i18n/en-gb.json @@ -43,6 +43,11 @@ "uncategorizedtemplates": "Uncategorised templates", "sessionfailure": "There seems to be a problem with your login session;\nthis action has been cancelled as a precaution against session hijacking.\nGo back to the previous page, reload that page and then try again.", "blockiptext": "Use the form below to block write access from a specific IP address or username.\nThis should be done only to prevent vandalism, and in accordance with [[{{MediaWiki:Policy-url}}|policy]].\nFill in a specific reason below (for example, citing particular pages that were vandalised).", + "blocklogentry": "blocked [[$1]] with an expiry time of $2 $3", + "blockedtext": "<strong>Your username or IP address has been blocked.</strong>\n\nThe block was made by $1.\nThe reason given is <em>$2</em>.\n\n* Start of block: $8\n* Expiry of block: $6\n* Intended blockee: $7\n\nYou can contact $1 or another [[{{MediaWiki:Grouppage-sysop}}|administrator]] to discuss the block.\nYou cannot use the \"email this user\" feature unless a valid email address is specified in your [[Special:Preferences|account preferences]] and you have not been blocked from using it.\nYour current IP address is $3, and the block ID is #$5.\nPlease include all above details in any queries you make.", + "autoblockedtext": "Your IP address has been automatically blocked because it was used by another user, who was blocked by $1.\nThe reason given is:\n\n:<em>$2</em>\n\n* Start of block: $8\n* Expiry of block: $6\n* Intended blockee: $7\n\nYou may contact $1 or one of the other [[{{MediaWiki:Grouppage-sysop}}|administrators]] to discuss the block.\n\nNote that you may not use the \"email this user\" feature unless you have a valid email address registered in your [[Special:Preferences|user preferences]] and you have not been blocked from using it.\n\nYour current IP address is $3, and the block ID is #$5.\nPlease include all above details in any queries you make.", + "reblock-logentry": "changed block settings for [[$1]] with an expiry time of $2 $3", + "ipbexpiry": "Expiry:", "ipbreason-dropdown": "*Common block reasons\n** Inserting false information\n** Removing content from pages\n** Spamming links to external sites\n** Inserting nonsense/gibberish into pages\n** Intimidating behaviour/harassment\n** Abusing multiple accounts\n** Unacceptable username", "proxyblockreason": "Your IP address has been blocked because it is an open proxy.\nPlease contact your Internet service provider or technical support of your organisation and inform them of this serious security problem.", "movecategorypage-warning": "<strong>Warning:</strong> You are about to move a category page. Please note that only the page will be moved and any pages in the old category will <em>not</em> be recategorised into the new one.", @@ -82,5 +87,13 @@ "version-license-not-found": "No detailed licence information was found for this extension.", "version-credits-summary": "We would like to recognise the following persons for their contribution to [[Special:Version|MediaWiki]].", "version-license-info": "MediaWiki is free software; you can redistribute it and/or modify it under the terms of the GNU General Public Licence as published by the Free Software Foundation; either version 2 of the Licence, or (at your option) any later version.\n\nMediaWiki is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public Licence for more details.\n\nYou should have received [{{SERVER}}{{SCRIPTPATH}}/COPYING a copy of the GNU General Public Licence] along with this programme; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA or [//www.gnu.org/licenses/old-licenses/gpl-2.0.html read it online].", - "feedback-error1": "Error: Unrecognised result from API" + "feedback-error1": "Error: Unrecognised result from API", + "logentry-block-block": "$1 {{GENDER:$2|blocked}} {{GENDER:$4|$3}} with an expiry time of $5 $6", + "logentry-block-reblock": "$1 {{GENDER:$2|changed}} block settings for {{GENDER:$4|$3}} with an expiry time of $5 $6", + "logentry-suppress-block": "$1 {{GENDER:$2|blocked}} {{GENDER:$4|$3}} with an expiry time of $5 $6", + "logentry-suppress-reblock": "$1 {{GENDER:$2|changed}} block settings for {{GENDER:$4|$3}} with an expiry time of $5 $6", + "protect_expiry_invalid": "Expiry time is invalid.", + "protect_expiry_old": "Expiry time is in the past.", + "protect-existing-expiry": "Existing expiry time: $3, $2", + "protect-existing-expiry-infinity": "Existing expiry time: infinite" } diff --git a/languages/i18n/en.json b/languages/i18n/en.json index 5e9b186..eb48dd6 100644 --- a/languages/i18n/en.json +++ b/languages/i18n/en.json @@ -654,8 +654,8 @@ "subject-preview": "Subject preview:", "previewerrortext": "An error occurred while attempting to preview your changes.", "blockedtitle": "User is blocked", - "blockedtext": "<strong>Your username or IP address has been blocked.</strong>\n\nThe block was made by $1.\nThe reason given is <em>$2</em>.\n\n* Start of block: $8\n* Expiry of block: $6\n* Intended blockee: $7\n\nYou can contact $1 or another [[{{MediaWiki:Grouppage-sysop}}|administrator]] to discuss the block.\nYou cannot use the \"email this user\" feature unless a valid email address is specified in your [[Special:Preferences|account preferences]] and you have not been blocked from using it.\nYour current IP address is $3, and the block ID is #$5.\nPlease include all above details in any queries you make.", - "autoblockedtext": "Your IP address has been automatically blocked because it was used by another user, who was blocked by $1.\nThe reason given is:\n\n:<em>$2</em>\n\n* Start of block: $8\n* Expiry of block: $6\n* Intended blockee: $7\n\nYou may contact $1 or one of the other [[{{MediaWiki:Grouppage-sysop}}|administrators]] to discuss the block.\n\nNote that you may not use the \"email this user\" feature unless you have a valid email address registered in your [[Special:Preferences|user preferences]] and you have not been blocked from using it.\n\nYour current IP address is $3, and the block ID is #$5.\nPlease include all above details in any queries you make.", + "blockedtext": "<strong>Your username or IP address has been blocked.</strong>\n\nThe block was made by $1.\nThe reason given is <em>$2</em>.\n\n* Start of block: $8\n* Expiration of block: $6\n* Intended blockee: $7\n\nYou can contact $1 or another [[{{MediaWiki:Grouppage-sysop}}|administrator]] to discuss the block.\nYou cannot use the \"email this user\" feature unless a valid email address is specified in your [[Special:Preferences|account preferences]] and you have not been blocked from using it.\nYour current IP address is $3, and the block ID is #$5.\nPlease include all above details in any queries you make.", + "autoblockedtext": "Your IP address has been automatically blocked because it was used by another user, who was blocked by $1.\nThe reason given is:\n\n:<em>$2</em>\n\n* Start of block: $8\n* Expiration of block: $6\n* Intended blockee: $7\n\nYou may contact $1 or one of the other [[{{MediaWiki:Grouppage-sysop}}|administrators]] to discuss the block.\n\nNote that you may not use the \"email this user\" feature unless you have a valid email address registered in your [[Special:Preferences|user preferences]] and you have not been blocked from using it.\n\nYour current IP address is $3, and the block ID is #$5.\nPlease include all above details in any queries you make.", "blockednoreason": "no reason given", "whitelistedittext": "Please $1 to edit pages.", "confirmedittext": "You must confirm your email address before editing pages.\nPlease set and validate your email address through your [[Special:Preferences|user preferences]].", @@ -2152,8 +2152,8 @@ "protect-legend": "Confirm protection", "protectcomment": "Reason:", "protectexpiry": "Expires:", - "protect_expiry_invalid": "Expiry time is invalid.", - "protect_expiry_old": "Expiry time is in the past.", + "protect_expiry_invalid": "Expiration time is invalid.", + "protect_expiry_old": "Expiration time is in the past.", "protect-unchain-permissions": "Unlock further protect options", "protect-text": "Here you may view and change the protection level for the page <strong>$1</strong>.", "protect-locked-blocked": "You cannot change protection levels while blocked.\nHere are the current settings for the page <strong>$1</strong>:", @@ -2173,8 +2173,8 @@ "protect-cantedit": "You cannot change the protection levels of this page because you do not have permission to edit it.", "protect-othertime": "Other time:", "protect-othertime-op": "other time", - "protect-existing-expiry": "Existing expiry time: $3, $2", - "protect-existing-expiry-infinity": "Existing expiry time: infinite", + "protect-existing-expiry": "Existing expiration time: $3, $2", + "protect-existing-expiry-infinity": "Existing expiration time: infinite", "protect-otherreason": "Other/additional reason:", "protect-otherreason-op": "Other reason", "protect-dropdown": "*Common protection reasons\n** Excessive vandalism\n** Excessive spamming\n** Counter-productive edit warring\n** High traffic page", @@ -2299,7 +2299,7 @@ "blockip-legend": "Block user", "blockiptext": "Use the form below to block write access from a specific IP address or username.\nThis should be done only to prevent vandalism, and in accordance with [[{{MediaWiki:Policy-url}}|policy]].\nFill in a specific reason below (for example, citing particular pages that were vandalized).\nYou can block IP ranges using the [https://en.wikipedia.org/wiki/Classless_Inter-Domain_Routing CIDR] syntax; the largest allowed range is /$1 for IPv4 and /$2 for IPv6.", "ipaddressorusername": "IP address or username:", - "ipbexpiry": "Expiry:", + "ipbexpiry": "Expiration:", "ipbreason": "Reason:", "ipbreason-dropdown": "*Common block reasons\n** Inserting false information\n** Removing content from pages\n** Spamming links to external sites\n** Inserting nonsense/gibberish into pages\n** Intimidating behavior/harassment\n** Abusing multiple accounts\n** Unacceptable username", "ipb-hardblock": "Prevent logged-in users from editing from this IP address", @@ -2367,8 +2367,8 @@ "blocklogpage": "Block log", "blocklog-showlog": "This user has been blocked previously.\nThe block log is provided below for reference:", "blocklog-showsuppresslog": "This user has been blocked and hidden previously.\nThe suppress log is provided below for reference:", - "blocklogentry": "blocked [[$1]] with an expiry time of $2 $3", - "reblock-logentry": "changed block settings for [[$1]] with an expiry time of $2 $3", + "blocklogentry": "blocked [[$1]] with an expiration time of $2 $3", + "reblock-logentry": "changed block settings for [[$1]] with an expiration time of $2 $3", "blocklogtext": "This is a log of user blocking and unblocking actions.\nAutomatically blocked IP addresses are not listed.\nSee the [[Special:BlockList|block list]] for the list of currently operational bans and blocks.", "unblocklogentry": "unblocked $1", "block-log-flags-anononly": "anonymous users only", @@ -3762,11 +3762,11 @@ "revdelete-uname-unhid": "username unhidden", "revdelete-restricted": "applied restrictions to administrators", "revdelete-unrestricted": "removed restrictions for administrators", - "logentry-block-block": "$1 {{GENDER:$2|blocked}} {{GENDER:$4|$3}} with an expiry time of $5 $6", + "logentry-block-block": "$1 {{GENDER:$2|blocked}} {{GENDER:$4|$3}} with an expiration time of $5 $6", "logentry-block-unblock": "$1 {{GENDER:$2|unblocked}} {{GENDER:$4|$3}}", - "logentry-block-reblock": "$1 {{GENDER:$2|changed}} block settings for {{GENDER:$4|$3}} with an expiry time of $5 $6", - "logentry-suppress-block": "$1 {{GENDER:$2|blocked}} {{GENDER:$4|$3}} with an expiry time of $5 $6", - "logentry-suppress-reblock": "$1 {{GENDER:$2|changed}} block settings for {{GENDER:$4|$3}} with an expiry time of $5 $6", + "logentry-block-reblock": "$1 {{GENDER:$2|changed}} block settings for {{GENDER:$4|$3}} with an expiration time of $5 $6", + "logentry-suppress-block": "$1 {{GENDER:$2|blocked}} {{GENDER:$4|$3}} with an expiration time of $5 $6", + "logentry-suppress-reblock": "$1 {{GENDER:$2|changed}} block settings for {{GENDER:$4|$3}} with an expiration time of $5 $6", "logentry-import-upload": "$1 {{GENDER:$2|imported}} $3 by file upload", "logentry-import-upload-details": "$1 {{GENDER:$2|imported}} $3 by file upload ($4 {{PLURAL:$4|revision|revisions}})", "logentry-import-interwiki": "$1 {{GENDER:$2|imported}} $3 from another wiki", diff --git a/tests/phpunit/includes/logging/BlockLogFormatterTest.php b/tests/phpunit/includes/logging/BlockLogFormatterTest.php index 8102437..4158ea2 100644 --- a/tests/phpunit/includes/logging/BlockLogFormatterTest.php +++ b/tests/phpunit/includes/logging/BlockLogFormatterTest.php @@ -25,7 +25,8 @@ ], ], [ - 'text' => 'Sysop blocked Logtestuser with an expiry time of indefinite (anonymous users only)', + 'text' => 'Sysop blocked Logtestuser with an expiration time of indefinite' + . ' (anonymous users only)', 'api' => [ 'duration' => 'infinite', 'flags' => [ 'anononly' ], @@ -50,7 +51,8 @@ ], [ 'legacy' => true, - 'text' => 'Sysop blocked Logtestuser with an expiry time of indefinite (anonymous users only)', + 'text' => 'Sysop blocked Logtestuser with an expiration time of indefinite' + . ' (anonymous users only)', 'api' => [ 'duration' => 'infinite', 'flags' => [ 'anononly' ], @@ -74,7 +76,7 @@ ], [ 'legacy' => true, - 'text' => 'Sysop blocked Logtestuser with an expiry time of indefinite', + 'text' => 'Sysop blocked Logtestuser with an expiration time of indefinite', 'api' => [ 'duration' => 'infinite', 'flags' => [], @@ -96,7 +98,7 @@ ], [ 'legacy' => true, - 'text' => 'Sysop blocked Logtestuser with an expiry time of indefinite', + 'text' => 'Sysop blocked Logtestuser with an expiration time of indefinite', 'api' => [ 'duration' => 'infinite', 'flags' => [], @@ -136,7 +138,7 @@ ], ], [ - 'text' => 'Sysop changed block settings for Logtestuser with an expiry time of' + 'text' => 'Sysop changed block settings for Logtestuser with an expiration time of' . ' indefinite (anonymous users only)', 'api' => [ 'duration' => 'infinite', @@ -162,7 +164,7 @@ ], [ 'legacy' => true, - 'text' => 'Sysop changed block settings for Logtestuser with an expiry time of' + 'text' => 'Sysop changed block settings for Logtestuser with an expiration time of' . ' indefinite (anonymous users only)', 'api' => [ 'duration' => 'infinite', @@ -187,7 +189,7 @@ ], [ 'legacy' => true, - 'text' => 'Sysop changed block settings for Logtestuser with an expiry time of indefinite', + 'text' => 'Sysop changed block settings for Logtestuser with an expiration time of indefinite', 'api' => [ 'duration' => 'infinite', 'flags' => [], @@ -261,7 +263,8 @@ ], ], [ - 'text' => 'Sysop blocked Logtestuser with an expiry time of indefinite (anonymous users only)', + 'text' => 'Sysop blocked Logtestuser with an expiration time of indefinite' + . ' (anonymous users only)', 'api' => [ 'duration' => 'infinite', 'flags' => [ 'anononly' ], @@ -286,7 +289,8 @@ ], [ 'legacy' => true, - 'text' => 'Sysop blocked Logtestuser with an expiry time of indefinite (anonymous users only)', + 'text' => 'Sysop blocked Logtestuser with an expiration time of indefinite' + . ' (anonymous users only)', 'api' => [ 'duration' => 'infinite', 'flags' => [ 'anononly' ], @@ -326,7 +330,7 @@ ], ], [ - 'text' => 'Sysop changed block settings for Logtestuser with an expiry time of' + 'text' => 'Sysop changed block settings for Logtestuser with an expiration time of' . ' indefinite (anonymous users only)', 'api' => [ 'duration' => 'infinite', @@ -352,7 +356,7 @@ ], [ 'legacy' => true, - 'text' => 'Sysop changed block settings for Logtestuser with an expiry time of' + 'text' => 'Sysop changed block settings for Logtestuser with an expiration time of' . ' indefinite (anonymous users only)', 'api' => [ 'duration' => 'infinite', -- To view, visit https://gerrit.wikimedia.org/r/262909 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3913449fc697770122ce01c1733f15ee3a7976de Gerrit-PatchSet: 6 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Neonowy <[email protected]> Gerrit-Reviewer: Nemo bis <[email protected]> Gerrit-Reviewer: Parent5446 <[email protected]> Gerrit-Reviewer: Raimond Spekking <[email protected]> Gerrit-Reviewer: Siebrand <[email protected]> Gerrit-Reviewer: Umherirrender <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
