From 31d02839575c2cc7422d47ac90b81ac9f53ad007 Mon Sep 17 00:00:00 2001 From: "This, that and the other" Date: Sun, 30 Aug 2015 15:23:13 +1000 Subject: [PATCH] Improve wording of "size-bytes" and "size-pixel" messages "B" and "P" are vanishingly rare abbreviations for "bytes" and "pixels" respectively. Let's use the full English terms for these, combined with a PLURAL magic word for good measure. Change-Id: Id59c4b9dea2c13940ae790b6a236ac08abe0a768 --- languages/i18n/en.json | 4 ++-- tests/phpunit/languages/LanguageTest.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/languages/i18n/en.json b/languages/i18n/en.json index 51cc927bdf..a2812eb8f7 100644 --- a/languages/i18n/en.json +++ b/languages/i18n/en.json @@ -3212,7 +3212,7 @@ "autosumm-new": "Created page with \"$1\"", "autosumm-newblank": "Created blank page", "autoblock_whitelist": "AOL http://webmaster.info.aol.com/proxyinfo.html\n*64.12.96.0/19\n*149.174.160.0/20\n*152.163.240.0/21\n*152.163.248.0/22\n*152.163.252.0/23\n*152.163.96.0/22\n*152.163.100.0/23\n*195.93.32.0/22\n*195.93.48.0/22\n*195.93.64.0/19\n*195.93.96.0/19\n*195.93.16.0/20\n*198.81.0.0/22\n*198.81.16.0/20\n*198.81.8.0/23\n*202.67.64.128/25\n*205.188.192.0/20\n*205.188.208.0/23\n*205.188.112.0/20\n*205.188.146.144/30\n*207.200.112.0/21", - "size-bytes": "$1 B", + "size-bytes": "$1 {{PLURAL:$1|byte|bytes}}", "size-kilobytes": "$1 KB", "size-megabytes": "$1 MB", "size-gigabytes": "$1 GB", @@ -3221,7 +3221,7 @@ "size-exabytes": "$1 EB", "size-zetabytes": "$1 ZB", "size-yottabytes": "$1 YB", - "size-pixel": "$1 P", + "size-pixel": "$1 {{PLURAL:$1|pixel|pixels}}", "size-kilopixel": "$1 KP", "size-megapixel": "$1 MP", "size-gigapixel": "$1 GP", diff --git a/tests/phpunit/languages/LanguageTest.php b/tests/phpunit/languages/LanguageTest.php index ade8fc422a..4fca00237a 100644 --- a/tests/phpunit/languages/LanguageTest.php +++ b/tests/phpunit/languages/LanguageTest.php @@ -1030,7 +1030,7 @@ class LanguageTest extends LanguageClassesTestCase { return array( array( 0, - "0 B", + "0 bytes", "Zero bytes" ), array( @@ -1046,7 +1046,7 @@ class LanguageTest extends LanguageClassesTestCase { array( 1024 * 1024 * 1024, "1 GB", - "1 gigabytes" + "1 gigabyte" ), array( pow( 1024, 4 ), -- 2.20.1