From: Dayllan Maza Date: Thu, 8 Nov 2018 20:32:37 +0000 (-0500) Subject: Fix partial block translation for non-editing msg X-Git-Tag: 1.34.0-rc.0~3473^2 X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dmes_infos.php?a=commitdiff_plain;h=d361d8cbecf5ee697128c15e204bdefe21f0be9c;p=lhc%2Fweb%2Fwiklou.git Fix partial block translation for non-editing msg The current phrasing for non-editing partial blocks was not clear. Adding 'specified' as part of the message to avoid confusion. Bug: T208806 Change-Id: If6fe6397060a38dd5036d2c0c1d58aa9e798ecc1 --- diff --git a/languages/i18n/en.json b/languages/i18n/en.json index 39ba360957..48f938f772 100644 --- a/languages/i18n/en.json +++ b/languages/i18n/en.json @@ -4141,8 +4141,8 @@ "logentry-block-reblock": "$1 {{GENDER:$2|changed}} block settings for {{GENDER:$4|$3}} with an expiration time of $5 $6", "logentry-partialblock-block": "$1 {{GENDER:$2|blocked}} {{GENDER:$4|$3}} from editing {{PLURAL:$8||the pages}} $7 with an expiration time of $5 $6", "logentry-partialblock-reblock": "$1 {{GENDER:$2|changed}} block settings for {{GENDER:$4|$3}} preventing edits on {{PLURAL:$8||the pages}} $7 with an expiration time of $5 $6", - "logentry-non-editing-block-block": "$1 {{GENDER:$2|blocked}} {{GENDER:$4|$3}} from non-editing actions with an expiration time of $5 $6", - "logentry-non-editing-block-reblock": "$1 {{GENDER:$2|changed}} block settings for {{GENDER:$4|$3}} for non-editing actions with an expiration time of $5 $6", + "logentry-non-editing-block-block": "$1 {{GENDER:$2|blocked}} {{GENDER:$4|$3}} from specified non-editing actions with an expiration time of $5 $6", + "logentry-non-editing-block-reblock": "$1 {{GENDER:$2|changed}} block settings for {{GENDER:$4|$3}} for specified non-editing actions 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", diff --git a/tests/phpunit/includes/logging/BlockLogFormatterTest.php b/tests/phpunit/includes/logging/BlockLogFormatterTest.php index 85ccebc4eb..0041b9ce64 100644 --- a/tests/phpunit/includes/logging/BlockLogFormatterTest.php +++ b/tests/phpunit/includes/logging/BlockLogFormatterTest.php @@ -431,7 +431,7 @@ class BlockLogFormatterTest extends LogFormatterTestCase { ], ], [ - 'text' => 'Sysop blocked Logtestuser from non-editing actions' + 'text' => 'Sysop blocked Logtestuser from specified non-editing actions' . ' with an expiration time of indefinite (anonymous users only)', 'api' => [ 'duration' => 'infinite',