Skip to content

Commit

Permalink
kB instead of KB (#16368)
Browse files Browse the repository at this point in the history
* kB instead of KB

When kilobyte is referred to 1000 bytes the abbreviation should be written with lower case "k" as kB. Upper case K is usually intended to refer to 1024 multiplier
See this page: https://en.wikipedia.org/wiki/Kilobyte
  • Loading branch information
diegotibi authored and samdark committed Mar 20, 2019
1 parent dafaff0 commit 72b4e6d
Show file tree
Hide file tree
Showing 33 changed files with 37 additions and 37 deletions.
4 changes: 2 additions & 2 deletions framework/i18n/Formatter.php
Expand Up @@ -1349,7 +1349,7 @@ public function asOrdinal($value)
}

/**
* Formats the value in bytes as a size in human readable form for example `12 KB`.
* Formats the value in bytes as a size in human readable form for example `12 kB`.
*
* This is the short form of [[asSize]].
*
Expand Down Expand Up @@ -1393,7 +1393,7 @@ public function asShortSize($value, $decimals = null, $options = [], $textOption
case 0:
return Yii::t('yii', '{nFormatted} B', $params, $this->locale);
case 1:
return Yii::t('yii', '{nFormatted} KB', $params, $this->locale);
return Yii::t('yii', '{nFormatted} kB', $params, $this->locale);
case 2:
return Yii::t('yii', '{nFormatted} MB', $params, $this->locale);
case 3:
Expand Down
2 changes: 1 addition & 1 deletion framework/messages/ar/yii.php
Expand Up @@ -92,7 +92,7 @@
'{nFormatted} B' => '{nFormatted} بايت',
'{nFormatted} GB' => '{nFormatted} جيجابايت',
'{nFormatted} GiB' => '{nFormatted} جيبيبايت',
'{nFormatted} KB' => '{nFormatted} كيلوبايت',
'{nFormatted} kB' => '{nFormatted} كيلوبايت',
'{nFormatted} KiB' => '{nFormatted} كيبيبايت',
'{nFormatted} MB' => '{nFormatted} ميجابايت',
'{nFormatted} MiB' => '{nFormatted} ميبيبايت',
Expand Down
2 changes: 1 addition & 1 deletion framework/messages/bs/yii.php
Expand Up @@ -98,7 +98,7 @@
'{nFormatted} B' => '{nFormatted} B',
'{nFormatted} GB' => '{nFormatted} GB',
'{nFormatted} GiB' => '{nFormatted} GiB',
'{nFormatted} KB' => '{nFormatted} KB',
'{nFormatted} kB' => '{nFormatted} kB',
'{nFormatted} KiB' => '{nFormatted} KiB',
'{nFormatted} MB' => '{nFormatted} MB',
'{nFormatted} MiB' => '{nFormatted} MiB',
Expand Down
2 changes: 1 addition & 1 deletion framework/messages/cs/yii.php
Expand Up @@ -50,7 +50,7 @@
'{nFormatted} B' => '{nFormatted} B',
'{nFormatted} GB' => '{nFormatted} GB',
'{nFormatted} GiB' => '{nFormatted} GiB',
'{nFormatted} KB' => '{nFormatted} KB',
'{nFormatted} kB' => '{nFormatted} kB',
'{nFormatted} KiB' => '{nFormatted} KiB',
'{nFormatted} MB' => '{nFormatted} MB',
'{nFormatted} MiB' => '{nFormatted} MiB',
Expand Down
2 changes: 1 addition & 1 deletion framework/messages/de/yii.php
Expand Up @@ -116,7 +116,7 @@
'{nFormatted} B' => '{nFormatted} B',
'{nFormatted} GB' => '{nFormatted} GB',
'{nFormatted} GiB' => '{nFormatted} GiB',
'{nFormatted} KB' => '{nFormatted} KB',
'{nFormatted} kB' => '{nFormatted} kB',
'{nFormatted} KiB' => '{nFormatted} KiB',
'{nFormatted} MB' => '{nFormatted} MB',
'{nFormatted} MiB' => '{nFormatted} MiB',
Expand Down
2 changes: 1 addition & 1 deletion framework/messages/el/yii.php
Expand Up @@ -123,7 +123,7 @@
'{nFormatted} B' => '{nFormatted} B',
'{nFormatted} GB' => '{nFormatted} GB',
'{nFormatted} GiB' => '{nFormatted} GiB',
'{nFormatted} KB' => '{nFormatted} KB',
'{nFormatted} kB' => '{nFormatted} kB',
'{nFormatted} KiB' => '{nFormatted} KiB',
'{nFormatted} MB' => '{nFormatted} MB',
'{nFormatted} MiB' => '{nFormatted} MiB',
Expand Down
2 changes: 1 addition & 1 deletion framework/messages/es/yii.php
Expand Up @@ -116,7 +116,7 @@
'{nFormatted} B' => '{nFormatted} B',
'{nFormatted} GB' => '{nFormatted} GB',
'{nFormatted} GiB' => '{nFormatted} GiB',
'{nFormatted} KB' => '{nFormatted} KB',
'{nFormatted} kB' => '{nFormatted} kB',
'{nFormatted} KiB' => '{nFormatted} KiB',
'{nFormatted} MB' => '{nFormatted} MB',
'{nFormatted} MiB' => '{nFormatted} MiB',
Expand Down
2 changes: 1 addition & 1 deletion framework/messages/fa/yii.php
Expand Up @@ -114,7 +114,7 @@
'{nFormatted} B' => '{nFormatted} B',
'{nFormatted} GB' => '{nFormatted} GB',
'{nFormatted} GiB' => '{nFormatted} GiB',
'{nFormatted} KB' => '{nFormatted} KB',
'{nFormatted} kB' => '{nFormatted} kB',
'{nFormatted} KiB' => '{nFormatted} KiB',
'{nFormatted} MB' => '{nFormatted} MB',
'{nFormatted} MiB' => '{nFormatted} MiB',
Expand Down
2 changes: 1 addition & 1 deletion framework/messages/fi/yii.php
Expand Up @@ -113,7 +113,7 @@
'{nFormatted} B' => '{nFormatted} t',
'{nFormatted} GB' => '{nFormatted} Gt',
'{nFormatted} GiB' => '{nFormatted} GiB',
'{nFormatted} KB' => '{nFormatted} kt',
'{nFormatted} kB' => '{nFormatted} kt',
'{nFormatted} KiB' => '{nFormatted} KiB',
'{nFormatted} MB' => '{nFormatted} Mt',
'{nFormatted} MiB' => '{nFormatted} MiB',
Expand Down
2 changes: 1 addition & 1 deletion framework/messages/fr/yii.php
Expand Up @@ -122,7 +122,7 @@
'{nFormatted} B' => '{nFormatted} o',
'{nFormatted} GB' => '{nFormatted} Go',
'{nFormatted} GiB' => '{nFormatted} Gio',
'{nFormatted} KB' => '{nFormatted} Ko',
'{nFormatted} kB' => '{nFormatted} Ko',
'{nFormatted} KiB' => '{nFormatted} Kio',
'{nFormatted} MB' => '{nFormatted} Mo',
'{nFormatted} MiB' => '{nFormatted} Mio',
Expand Down
2 changes: 1 addition & 1 deletion framework/messages/hy/yii.php
Expand Up @@ -117,7 +117,7 @@
'{nFormatted} B' => '{nFormatted} Բ',
'{nFormatted} GB' => '{nFormatted} ԳԲ',
'{nFormatted} GiB' => '{nFormatted} ԳիԲ',
'{nFormatted} KB' => '{nFormatted} ԿԲ',
'{nFormatted} kB' => '{nFormatted} ԿԲ',
'{nFormatted} KiB' => '{nFormatted} ԿիԲ',
'{nFormatted} MB' => '{nFormatted} ՄԲ',
'{nFormatted} MiB' => '{nFormatted} ՄիԲ',
Expand Down
2 changes: 1 addition & 1 deletion framework/messages/it/yii.php
Expand Up @@ -118,7 +118,7 @@
'{nFormatted} B' => '{nFormatted} B',
'{nFormatted} GB' => '{nFormatted} GB',
'{nFormatted} GiB' => '{nFormatted} GiB',
'{nFormatted} KB' => '{nFormatted} KB',
'{nFormatted} kB' => '{nFormatted} kB',
'{nFormatted} KiB' => '{nFormatted} KiB',
'{nFormatted} MB' => '{nFormatted} MB',
'{nFormatted} MiB' => '{nFormatted} MiB',
Expand Down
2 changes: 1 addition & 1 deletion framework/messages/ja/yii.php
Expand Up @@ -115,7 +115,7 @@
'{nFormatted} B' => '{nFormatted} B',
'{nFormatted} GB' => '{nFormatted} GB',
'{nFormatted} GiB' => '{nFormatted} GiB',
'{nFormatted} KB' => '{nFormatted} KB',
'{nFormatted} kB' => '{nFormatted} kB',
'{nFormatted} KiB' => '{nFormatted} KiB',
'{nFormatted} MB' => '{nFormatted} MB',
'{nFormatted} MiB' => '{nFormatted} MiB',
Expand Down
2 changes: 1 addition & 1 deletion framework/messages/ka/yii.php
Expand Up @@ -98,7 +98,7 @@
'{nFormatted} B' => '{nFormatted} ბ',
'{nFormatted} GB' => '{nFormatted} გბ',
'{nFormatted} GiB' => '{nFormatted} გიბ',
'{nFormatted} KB' => '{nFormatted} კბ',
'{nFormatted} kB' => '{nFormatted} კბ',
'{nFormatted} KiB' => '{nFormatted} კიბ',
'{nFormatted} MB' => '{nFormatted} მბ',
'{nFormatted} MiB' => '{nFormatted} მიბ',
Expand Down
2 changes: 1 addition & 1 deletion framework/messages/kz/yii.php
Expand Up @@ -20,7 +20,7 @@
'{nFormatted} B' => '{nFormatted} Б',
'{nFormatted} GB' => '{nFormatted} ГБ',
'{nFormatted} GiB' => '{nFormatted} ГиБ',
'{nFormatted} KB' => '{nFormatted} КБ',
'{nFormatted} kB' => '{nFormatted} КБ',
'{nFormatted} KiB' => '{nFormatted} КиБ',
'{nFormatted} MB' => '{nFormatted} МБ',
'{nFormatted} MiB' => '{nFormatted} МиБ',
Expand Down
2 changes: 1 addition & 1 deletion framework/messages/lt/yii.php
Expand Up @@ -27,7 +27,7 @@
'{nFormatted} B' => '{nFormatted} B',
'{nFormatted} GB' => '{nFormatted} GB',
'{nFormatted} GiB' => '{nFormatted} GiB',
'{nFormatted} KB' => '{nFormatted} KB',
'{nFormatted} kB' => '{nFormatted} kB',
'{nFormatted} KiB' => '{nFormatted} KiB',
'{nFormatted} MB' => '{nFormatted} MB',
'{nFormatted} MiB' => '{nFormatted} MiB',
Expand Down
2 changes: 1 addition & 1 deletion framework/messages/lv/yii.php
Expand Up @@ -26,7 +26,7 @@
'{nFormatted} B' => '{nFormatted} B',
'{nFormatted} GB' => '{nFormatted} Gb',
'{nFormatted} GiB' => '{nFormatted} GiB',
'{nFormatted} KB' => '{nFormatted} KB',
'{nFormatted} kB' => '{nFormatted} kB',
'{nFormatted} KiB' => '{nFormatted} KiB',
'{nFormatted} MB' => '{nFormatted} MB',
'{nFormatted} MiB' => '{nFormatted} MiB',
Expand Down
2 changes: 1 addition & 1 deletion framework/messages/ms/yii.php
Expand Up @@ -98,7 +98,7 @@
'{nFormatted} B' => '',
'{nFormatted} GB' => '',
'{nFormatted} GiB' => '',
'{nFormatted} KB' => '',
'{nFormatted} kB' => '',
'{nFormatted} KiB' => '',
'{nFormatted} MB' => '',
'{nFormatted} MiB' => '',
Expand Down
2 changes: 1 addition & 1 deletion framework/messages/nb-NO/yii.php
Expand Up @@ -98,7 +98,7 @@
'{nFormatted} B' => '{nFormatted} B',
'{nFormatted} GB' => '{nFormatted} GB',
'{nFormatted} GiB' => '{nFormatted} GiB',
'{nFormatted} KB' => '{nFormatted} KB',
'{nFormatted} kB' => '{nFormatted} kB',
'{nFormatted} KiB' => '{nFormatted} KiB',
'{nFormatted} MB' => '{nFormatted} MB',
'{nFormatted} MiB' => '{nFormatted} MiB',
Expand Down
2 changes: 1 addition & 1 deletion framework/messages/nl/yii.php
Expand Up @@ -104,7 +104,7 @@
'{nFormatted} B' => '{nFormatted} B',
'{nFormatted} GB' => '{nFormatted} GB',
'{nFormatted} GiB' => '{nFormatted} GiB',
'{nFormatted} KB' => '{nFormatted} KB',
'{nFormatted} kB' => '{nFormatted} kB',
'{nFormatted} KiB' => '{nFormatted} KiB',
'{nFormatted} MB' => '{nFormatted} MB',
'{nFormatted} MiB' => '{nFormatted} MiB',
Expand Down
2 changes: 1 addition & 1 deletion framework/messages/pl/yii.php
Expand Up @@ -123,7 +123,7 @@
'{nFormatted} B' => '{nFormatted} B',
'{nFormatted} GB' => '{nFormatted} GB',
'{nFormatted} GiB' => '{nFormatted} GiB',
'{nFormatted} KB' => '{nFormatted} KB',
'{nFormatted} kB' => '{nFormatted} kB',
'{nFormatted} KiB' => '{nFormatted} KiB',
'{nFormatted} MB' => '{nFormatted} MB',
'{nFormatted} MiB' => '{nFormatted} MiB',
Expand Down
2 changes: 1 addition & 1 deletion framework/messages/pt-BR/yii.php
Expand Up @@ -123,7 +123,7 @@
'{nFormatted} B' => '{nFormatted} B',
'{nFormatted} GB' => '{nFormatted} GB',
'{nFormatted} GiB' => '{nFormatted} GiB',
'{nFormatted} KB' => '{nFormatted} KB',
'{nFormatted} kB' => '{nFormatted} kB',
'{nFormatted} KiB' => '{nFormatted} KiB',
'{nFormatted} MB' => '{nFormatted} MB',
'{nFormatted} MiB' => '{nFormatted} MiB',
Expand Down
2 changes: 1 addition & 1 deletion framework/messages/ru/yii.php
Expand Up @@ -122,7 +122,7 @@
'{nFormatted} B' => '{nFormatted} Б',
'{nFormatted} GB' => '{nFormatted} ГБ',
'{nFormatted} GiB' => '{nFormatted} ГиБ',
'{nFormatted} KB' => '{nFormatted} КБ',
'{nFormatted} kB' => '{nFormatted} КБ',
'{nFormatted} KiB' => '{nFormatted} КиБ',
'{nFormatted} MB' => '{nFormatted} МБ',
'{nFormatted} MiB' => '{nFormatted} МиБ',
Expand Down
2 changes: 1 addition & 1 deletion framework/messages/sk/yii.php
Expand Up @@ -123,7 +123,7 @@
'{nFormatted} B' => '{nFormatted} B',
'{nFormatted} GB' => '{nFormatted} GB',
'{nFormatted} GiB' => '{nFormatted} GiB',
'{nFormatted} KB' => '{nFormatted} KB',
'{nFormatted} kB' => '{nFormatted} kB',
'{nFormatted} KiB' => '{nFormatted} KiB',
'{nFormatted} MB' => '{nFormatted} MB',
'{nFormatted} MiB' => '{nFormatted} MiB',
Expand Down
2 changes: 1 addition & 1 deletion framework/messages/sl/yii.php
Expand Up @@ -101,7 +101,7 @@
'{nFormatted} B' => '{nFormatted} B',
'{nFormatted} GB' => '{nFormatted} GB',
'{nFormatted} GiB' => '{nFormatted} GiB',
'{nFormatted} KB' => '{nFormatted} KB',
'{nFormatted} kB' => '{nFormatted} kB',
'{nFormatted} KiB' => '{nFormatted} KiB',
'{nFormatted} MB' => '{nFormatted} MB',
'{nFormatted} MiB' => '{nFormatted} MiB',
Expand Down
2 changes: 1 addition & 1 deletion framework/messages/sv/yii.php
Expand Up @@ -98,7 +98,7 @@
'{nFormatted} B' => '{nFormatted} B',
'{nFormatted} GB' => '{nFormatted} GB',
'{nFormatted} GiB' => '{nFormatted} GiB',
'{nFormatted} KB' => '{nFormatted} KB',
'{nFormatted} kB' => '{nFormatted} kB',
'{nFormatted} KiB' => '{nFormatted} KiB',
'{nFormatted} MB' => '{nFormatted} MB',
'{nFormatted} MiB' => '{nFormatted} MiB',
Expand Down
2 changes: 1 addition & 1 deletion framework/messages/tg/yii.php
Expand Up @@ -116,7 +116,7 @@
'{nFormatted} B' => '{nFormatted} Б',
'{nFormatted} GB' => '{nFormatted} ГБ',
'{nFormatted} GiB' => '{nFormatted} ГиБ',
'{nFormatted} KB' => '{nFormatted} КБ',
'{nFormatted} kB' => '{nFormatted} КБ',
'{nFormatted} KiB' => '{nFormatted} КиБ',
'{nFormatted} MB' => '{nFormatted} МБ',
'{nFormatted} MiB' => '{nFormatted} МиБ',
Expand Down
2 changes: 1 addition & 1 deletion framework/messages/tr/yii.php
Expand Up @@ -111,7 +111,7 @@
'{nFormatted} B' => '{nFormatted} B',
'{nFormatted} GB' => '{nFormatted} GB',
'{nFormatted} GiB' => '{nFormatted} GiB',
'{nFormatted} KB' => '{nFormatted} KB',
'{nFormatted} kB' => '{nFormatted} kB',
'{nFormatted} KiB' => '{nFormatted} KiB',
'{nFormatted} MB' => '{nFormatted} MB',
'{nFormatted} MiB' => '{nFormatted} MiB',
Expand Down
2 changes: 1 addition & 1 deletion framework/messages/uk/yii.php
Expand Up @@ -111,7 +111,7 @@
'{nFormatted} B' => '{nFormatted} Б',
'{nFormatted} GB' => '{nFormatted} Гб',
'{nFormatted} GiB' => '{nFormatted} ГіБ',
'{nFormatted} KB' => '{nFormatted} Кб',
'{nFormatted} kB' => '{nFormatted} Кб',
'{nFormatted} KiB' => '{nFormatted} КіБ',
'{nFormatted} MB' => '{nFormatted} Мб',
'{nFormatted} MiB' => '{nFormatted} МіБ',
Expand Down
2 changes: 1 addition & 1 deletion framework/messages/uz/yii.php
Expand Up @@ -26,7 +26,7 @@
'{nFormatted} B' => '{nFormatted} B',
'{nFormatted} GB' => '{nFormatted} GB',
'{nFormatted} GiB' => '{nFormatted} GiB',
'{nFormatted} KB' => '{nFormatted} KB',
'{nFormatted} kB' => '{nFormatted} kB',
'{nFormatted} KiB' => '{nFormatted} KiB',
'{nFormatted} MB' => '{nFormatted} MB',
'{nFormatted} MiB' => '{nFormatted} MiB',
Expand Down
2 changes: 1 addition & 1 deletion framework/messages/zh-CN/yii.php
Expand Up @@ -123,7 +123,7 @@
'{nFormatted} B' => '{nFormatted} B',
'{nFormatted} GB' => '{nFormatted} GB',
'{nFormatted} GiB' => '{nFormatted} GiB',
'{nFormatted} KB' => '{nFormatted} KB',
'{nFormatted} kB' => '{nFormatted} kB',
'{nFormatted} KiB' => '{nFormatted} KiB',
'{nFormatted} MB' => '{nFormatted} MB',
'{nFormatted} MiB' => '{nFormatted} MiB',
Expand Down
2 changes: 1 addition & 1 deletion framework/messages/zh-TW/yii.php
Expand Up @@ -120,7 +120,7 @@
'{nFormatted} B' => '{nFormatted} B',
'{nFormatted} GB' => '{nFormatted} GB',
'{nFormatted} GiB' => '{nFormatted} GiB',
'{nFormatted} KB' => '{nFormatted} KB',
'{nFormatted} kB' => '{nFormatted} kB',
'{nFormatted} KiB' => '{nFormatted} KiB',
'{nFormatted} MB' => '{nFormatted} MB',
'{nFormatted} MiB' => '{nFormatted} MiB',
Expand Down
8 changes: 4 additions & 4 deletions tests/framework/i18n/FormatterNumberTest.php 100644 → 100755
Expand Up @@ -594,8 +594,8 @@ public function testIntlAsShortSize()
$this->assertSame('999 B', $this->formatter->asShortSize(999));
$this->assertSame('999 B', $this->formatter->asShortSize('999'));
$this->assertSame('1.05 MB', $this->formatter->asShortSize(1024 * 1024));
$this->assertSame('1 KB', $this->formatter->asShortSize(1000));
$this->assertSame('1.02 KB', $this->formatter->asShortSize(1023));
$this->assertSame('1 kB', $this->formatter->asShortSize(1000));
$this->assertSame('1.02 kB', $this->formatter->asShortSize(1023));
$this->assertNotEquals('3 PB', $this->formatter->asShortSize(3 * 1000 * 1000 * 1000 * 1000 * 1000 * 1000)); // this is 3 EB not 3 PB
// string values
$this->assertSame('28.41 GB', $this->formatter->asShortSize(28406984038));
Expand Down Expand Up @@ -632,8 +632,8 @@ public function testAsShortSize()
$this->assertSame('999 B', $this->formatter->asShortSize('999'));
$this->assertSame('1.05 MB', $this->formatter->asShortSize(1024 * 1024));
$this->assertSame('1.0486 MB', $this->formatter->asShortSize(1024 * 1024, 4));
$this->assertSame('1.00 KB', $this->formatter->asShortSize(1000));
$this->assertSame('1.02 KB', $this->formatter->asShortSize(1023));
$this->assertSame('1.00 kB', $this->formatter->asShortSize(1000));
$this->assertSame('1.02 kB', $this->formatter->asShortSize(1023));
$this->assertNotEquals('3 PB', $this->formatter->asShortSize(3 * 1000 * 1000 * 1000 * 1000 * 1000 * 1000)); // this is 3 EB not 3 PB
// string values
$this->assertSame('28.41 GB', $this->formatter->asShortSize(28406984038));
Expand Down

0 comments on commit 72b4e6d

Please sign in to comment.