Merge pull request #1603 from PrivateBin/switch_from_binary_bytes_to_si_units

Switch from binary bytes to SI-units

CHANGELOG.md

@@ -12,6 +12,7 @@
 * CHANGED: Upgrading libraries to: base-x 5.0.1, bootstrap 5.3.7, jdenticon 2.0.0 & kjua 0.10.0
 * CHANGED: Minimum required PHP version is 7.4, due to a change in the jdenticon library
 * CHANGED: Set bootstrap5 template as default for PrivateBin (#1572)
+* CHANGED: Switch from binary bytes to SI-units (#1565)
 * FIXED: Name mismatches in attached files (#1584)
 * FIXED: Unable to paste attachments from clipboard (#1589)
 * FIXED: Configuration combinations test errors

cfg/conf.sample.php

@@ -39,8 +39,8 @@ defaultformatter = "plaintext"
 ; (optional) set a syntax highlighting theme, as found in css/prettify/
 ; syntaxhighlightingtheme = "sons-of-obsidian"
 
-; size limit per paste or comment in bytes, defaults to 10 Mebibytes
-sizelimit = 10485760
+; size limit per paste or comment in bytes, defaults to 10 Megabytes
+sizelimit = 10000000
 
 ; by default PrivateBin use "bootstrap5" template (tpl/bootstrap5.php).
 ; Optionally you can enable the template selection menu, which uses

i18n/ar.json

@@ -156,14 +156,6 @@
     "Could not create paste: %s": "تعذر إنشاء اللصق: %s",
     "Cannot decrypt paste: Decryption key missing in URL (Did you use a redirector or an URL shortener which strips part of the URL?)": "لا يمكن فك تشفير اللصق: مفتاح فك التشفير مفقود في URL (هل استخدمت معيد توجيه أو أداة تقصير لعناوين URL تزيل جزءًا من عنوان URL؟)",
     "B": "بايت",
-    "KiB": "كيلوبايت",
-    "MiB": "ميجابايت",
-    "GiB": "جيجابايت",
-    "TiB": "تيرابايت",
-    "PiB": "بيتابايت",
-    "EiB": "إكسابايت",
-    "ZiB": "زيتابايت",
-    "YiB": "يوتابايت",
     "kB": "كيلوبايت",
     "MB": "ميجابايت",
     "GB": "جيجابايت",

i18n/bg.json

@@ -156,14 +156,6 @@
     "Could not create paste: %s": "Създаването на връзката ви беше неуспешно: %s",
     "Cannot decrypt paste: Decryption key missing in URL (Did you use a redirector or an URL shortener which strips part of the URL?)": "Дешифроването на информацията беше неуспешно: Ключа за декриптиране липсва във връзката (Да не сте използвали услуга за пренасочване или скъсяване на връзката, което би изрязало части от нея?)",
     "B": "B",
-    "KiB": "KiB",
-    "MiB": "MiB",
-    "GiB": "GiB",
-    "TiB": "TiB",
-    "PiB": "PiB",
-    "EiB": "EiB",
-    "ZiB": "ZiB",
-    "YiB": "YiB",
     "kB": "kB",
     "MB": "MB",
     "GB": "GB",

i18n/ca.json

@@ -156,14 +156,6 @@
     "Could not create paste: %s": "Could not create paste: %s",
     "Cannot decrypt paste: Decryption key missing in URL (Did you use a redirector or an URL shortener which strips part of the URL?)": "No es pot desxifrar la nota: falta la clau de desxifrat a l'URL (vau utilitzar un adreçament o un escurçador d'URL que elimina part de l'URL?)",
     "B": "B",
-    "KiB": "KiB",
-    "MiB": "MiB",
-    "GiB": "GiB",
-    "TiB": "TiB",
-    "PiB": "PiB",
-    "EiB": "EiB",
-    "ZiB": "ZiB",
-    "YiB": "YiB",
     "kB": "kB",
     "MB": "MB",
     "GB": "GB",

i18n/co.json

@@ -156,14 +156,6 @@
     "Could not create paste: %s": "Ùn si pò micca creà l’appiccicu : %s",
     "Cannot decrypt paste: Decryption key missing in URL (Did you use a redirector or an URL shortener which strips part of the URL?)": "Ùn si pò micca dicifrà l’appiccicu : A chjave di dicifratura hè assente in l’indirizzu. Averiate impiegatu un orientadore d’indirizzu o un riduttore chì ammuzzeghja una parte di l’indirizzu ?",
     "B": "o",
-    "KiB": "Kio",
-    "MiB": "Mio",
-    "GiB": "Gio",
-    "TiB": "Tio",
-    "PiB": "Pio",
-    "EiB": "Eio",
-    "ZiB": "Zio",
-    "YiB": "Yio",
     "kB": "Ko",
     "MB": "Mo",
     "GB": "Go",

i18n/cs.json

@@ -156,14 +156,6 @@
     "Could not create paste: %s": "Nepodařilo se vytvořit příspěvek: %s",
     "Cannot decrypt paste: Decryption key missing in URL (Did you use a redirector or an URL shortener which strips part of the URL?)": "Nepodařilo se dešifrovat příspěvek: V adrese chybí dešifrovací klíč (Nepoužili jste přesměrovač nebo zkracovač URL, který maže části URL?)",
     "B": "B",
-    "KiB": "KiB",
-    "MiB": "MiB",
-    "GiB": "GiB",
-    "TiB": "TiB",
-    "PiB": "PiB",
-    "EiB": "EiB",
-    "ZiB": "ZiB",
-    "YiB": "YiB",
     "kB": "kB",
     "MB": "MB",
     "GB": "GB",

i18n/de.json

@@ -156,14 +156,6 @@
     "Could not create paste: %s": "Text konnte nicht erstellt werden: %s",
     "Cannot decrypt paste: Decryption key missing in URL (Did you use a redirector or an URL shortener which strips part of the URL?)": "Konnte Paste nicht entschlüsseln: Der Schlüssel fehlt in der Adresse (Hast du eine Umleitung oder einen URL-Verkürzer benutzt, der Teile der Adresse entfernt?)",
     "B": "B",
-    "KiB": "KiB",
-    "MiB": "MiB",
-    "GiB": "GiB",
-    "TiB": "TiB",
-    "PiB": "PiB",
-    "EiB": "EiB",
-    "ZiB": "ZiB",
-    "YiB": "YiB",
     "kB": "kB",
     "MB": "MB",
     "GB": "GB",

i18n/el.json

@@ -156,14 +156,6 @@
     "Could not create paste: %s": "Δεν ήταν δυνατή η δημιουργία επικόλλησης: %s",
     "Cannot decrypt paste: Decryption key missing in URL (Did you use a redirector or an URL shortener which strips part of the URL?)": "Δεν ήταν δυνατή η αποκρυπτογράφηση της επικόλλησης: Το κλειδί αποκρυπτογράφησης λείπει από τον σύνδεσμο (Μήπως χρησιμοποιήσατε ανακατεύθυνση συνδέσμου ή υπηρεσία συντόμευσης συνδέσμου;)",
     "B": "B",
-    "KiB": "KiB",
-    "MiB": "MiB",
-    "GiB": "GiB",
-    "TiB": "TiB",
-    "PiB": "PiB",
-    "EiB": "EiB",
-    "ZiB": "ZiB",
-    "YiB": "YiB",
     "kB": "kB",
     "MB": "MB",
     "GB": "GB",

i18n/en.json

@@ -156,14 +156,6 @@
     "Could not create paste: %s": "Could not create paste: %s",
     "Cannot decrypt paste: Decryption key missing in URL (Did you use a redirector or an URL shortener which strips part of the URL?)": "Cannot decrypt paste: Decryption key missing in URL (Did you use a redirector or an URL shortener which strips part of the URL?)",
     "B": "B",
-    "KiB": "KiB",
-    "MiB": "MiB",
-    "GiB": "GiB",
-    "TiB": "TiB",
-    "PiB": "PiB",
-    "EiB": "EiB",
-    "ZiB": "ZiB",
-    "YiB": "YiB",
     "kB": "kB",
     "MB": "MB",
     "GB": "GB",

i18n/es.json

@@ -156,14 +156,6 @@
     "Could not create paste: %s": "No fue posible crear el archivo: %s",
     "Cannot decrypt paste: Decryption key missing in URL (Did you use a redirector or an URL shortener which strips part of the URL?)": "No es posible descifrar el documento: Falta la clave de descifrado en la URL (¿Utilizó un redirector o un acortador de URL que quite parte de la URL?)",
     "B": "B",
-    "KiB": "KiB",
-    "MiB": "MiB",
-    "GiB": "GiB",
-    "TiB": "TiB",
-    "PiB": "PiB",
-    "EiB": "EiB",
-    "ZiB": "ZiB",
-    "YiB": "YiB",
     "kB": "kB",
     "MB": "MB",
     "GB": "GB",

i18n/et.json

@@ -156,14 +156,6 @@
     "Could not create paste: %s": "Ei suutnud kleebet luua: %s",
     "Cannot decrypt paste: Decryption key missing in URL (Did you use a redirector or an URL shortener which strips part of the URL?)": "Ei suutnud kleebet dekrüpteerida: Dekrüpteerimisvõti on URL-ist puudu (Kas kasutasid ümbersuunajat või URL-i lühendajat, mis eemaldab osa URL-ist?)",
     "B": "B",
-    "KiB": "KiB",
-    "MiB": "MiB",
-    "GiB": "GiB",
-    "TiB": "TiB",
-    "PiB": "PiB",
-    "EiB": "EiB",
-    "ZiB": "ZiB",
-    "YiB": "YiB",
     "kB": "kB",
     "MB": "MB",
     "GB": "GB",

i18n/fi.json

@@ -156,14 +156,6 @@
     "Could not create paste: %s": "Pastea ei voitu luoda: %s",
     "Cannot decrypt paste: Decryption key missing in URL (Did you use a redirector or an URL shortener which strips part of the URL?)": "Pastea ei voitu purkaa: Purkausavain puuttuu URL:stä (Käytitkö uudelleenohjaajaa tai URL-lyhentäjää joka poistaa osan URL:stä?)",
     "B": "B",
-    "KiB": "KiB",
-    "MiB": "MiB",
-    "GiB": "GiB",
-    "TiB": "TiB",
-    "PiB": "PiB",
-    "EiB": "EiB",
-    "ZiB": "ZiB",
-    "YiB": "YiB",
     "kB": "kB",
     "MB": "MB",
     "GB": "GB",

i18n/fr.json

@@ -156,14 +156,6 @@
     "Could not create paste: %s": "Impossible de créer le paste : %s",
     "Cannot decrypt paste: Decryption key missing in URL (Did you use a redirector or an URL shortener which strips part of the URL?)": "Impossible de déchiffrer le paste : Clé de déchiffrement manquante dans l'URL (Avez-vous utilisé un redirecteur ou un site de réduction d'URL qui supprime une partie de l'URL ?)",
     "B": "o",
-    "KiB": "Kio",
-    "MiB": "Mio",
-    "GiB": "Gio",
-    "TiB": "Tio",
-    "PiB": "Pio",
-    "EiB": "Eio",
-    "ZiB": "Zio",
-    "YiB": "Yio",
     "kB": "ko",
     "MB": "Mo",
     "GB": "Go",

i18n/he.json

@@ -156,14 +156,6 @@
     "Could not create paste: %s": "לא ניתן ליצור הדבקה: %s",
     "Cannot decrypt paste: Decryption key missing in URL (Did you use a redirector or an URL shortener which strips part of the URL?)": "לא ניתן לפענח הדבקה: מפתח הפענוח חסר בכתובת (השתמשת במערכת הפנייה או מקצר כתובות שחותכים חלק מהכתובת?)",
     "B": "ב׳",
-    "KiB": "KiB",
-    "MiB": "MiB",
-    "GiB": "GiB",
-    "TiB": "TiB",
-    "PiB": "PiB",
-    "EiB": "EiB",
-    "ZiB": "ZiB",
-    "YiB": "YiB",
     "kB": "kB",
     "MB": "MB",
     "GB": "GB",

i18n/hi.json

@@ -156,14 +156,6 @@
     "Could not create paste: %s": "Could not create paste: %s",
     "Cannot decrypt paste: Decryption key missing in URL (Did you use a redirector or an URL shortener which strips part of the URL?)": "Cannot decrypt paste: Decryption key missing in URL (Did you use a redirector or an URL shortener which strips part of the URL?)",
     "B": "B",
-    "KiB": "KiB",
-    "MiB": "MiB",
-    "GiB": "GiB",
-    "TiB": "TiB",
-    "PiB": "PiB",
-    "EiB": "EiB",
-    "ZiB": "ZiB",
-    "YiB": "YiB",
     "kB": "kB",
     "MB": "MB",
     "GB": "GB",

i18n/hu.json

@@ -156,14 +156,6 @@
     "Could not create paste: %s": "Nem tudtuk létrehozni a bejegyzést: %s",
     "Cannot decrypt paste: Decryption key missing in URL (Did you use a redirector or an URL shortener which strips part of the URL?)": "Nem tudjuk visszafejteni a bejegyzést: a dekódoláshoz szükséges kulcs hiányzik a címből. Talán URL rövidítőt használtál ami kivágta azt belőle?",
     "B": "B",
-    "KiB": "KiB",
-    "MiB": "MiB",
-    "GiB": "GiB",
-    "TiB": "TiB",
-    "PiB": "PiB",
-    "EiB": "EiB",
-    "ZiB": "ZiB",
-    "YiB": "YiB",
     "kB": "kB",
     "MB": "MB",
     "GB": "GB",

i18n/id.json

@@ -156,14 +156,6 @@
     "Could not create paste: %s": "Tidak dapat membuat paste: %s",
     "Cannot decrypt paste: Decryption key missing in URL (Did you use a redirector or an URL shortener which strips part of the URL?)": "Tidak dapat mendekripsi paste: Kunci dekripsi tidak ada di URL (Apakah Anda menggunakan redirector atau penyingkat URL yang menghapus bagian dari URL?)",
     "B": "B",
-    "KiB": "KiB",
-    "MiB": "MiB",
-    "GiB": "GiB",
-    "TiB": "TiB",
-    "PiB": "PiB",
-    "EiB": "EiB",
-    "ZiB": "ZiB",
-    "YiB": "YiB",
     "kB": "kB",
     "MB": "MB",
     "GB": "GB",

i18n/it.json

@@ -156,14 +156,6 @@
     "Could not create paste: %s": "Non riesco a creare il messaggio: %s",
     "Cannot decrypt paste: Decryption key missing in URL (Did you use a redirector or an URL shortener which strips part of the URL?)": "Non riesco a decifrare il messaggio: manca la chiave di decifrazione nell'URL (La chiave è parte integrante dell'URL. Per caso hai usato un Redirector o un altro servizio che ha rimosso una parte dell'URL?)",
     "B": "B",
-    "KiB": "KiB",
-    "MiB": "MiB",
-    "GiB": "GiB",
-    "TiB": "TiB",
-    "PiB": "PiB",
-    "EiB": "EiB",
-    "ZiB": "ZiB",
-    "YiB": "YiB",
     "kB": "kB",
     "MB": "MB",
     "GB": "GB",

i18n/ja.json

@@ -156,14 +156,6 @@
     "Could not create paste: %s": "ペーストを作成できませんでした：%s",
     "Cannot decrypt paste: Decryption key missing in URL (Did you use a redirector or an URL shortener which strips part of the URL?)": "ペーストを復号化できません：復号化キーがURLにありません（URLの一部を削除するリダイレクト機能またはURLの短縮アプリケーションを使いましたか？）",
     "B": "B",
-    "KiB": "KiB",
-    "MiB": "MiB",
-    "GiB": "GiB",
-    "TiB": "TiB",
-    "PiB": "PiB",
-    "EiB": "EiB",
-    "ZiB": "ZiB",
-    "YiB": "YiB",
     "kB": "kB",
     "MB": "MB",
     "GB": "GB",

i18n/jbo.json

@@ -156,14 +156,6 @@
     "Could not create paste: %s": "Could not create paste: %s",
     "Cannot decrypt paste: Decryption key missing in URL (Did you use a redirector or an URL shortener which strips part of the URL?)": "Cannot decrypt paste: Decryption key missing in URL (Did you use a redirector or an URL shortener which strips part of the URL?)",
     "B": "B",
-    "KiB": "KiB",
-    "MiB": "MiB",
-    "GiB": "GiB",
-    "TiB": "TiB",
-    "PiB": "PiB",
-    "EiB": "EiB",
-    "ZiB": "ZiB",
-    "YiB": "YiB",
     "kB": "kB",
     "MB": "MB",
     "GB": "GB",

i18n/ko.json

@@ -156,14 +156,6 @@
     "Could not create paste: %s": "Could not create paste: %s",
     "Cannot decrypt paste: Decryption key missing in URL (Did you use a redirector or an URL shortener which strips part of the URL?)": "Cannot decrypt paste: Decryption key missing in URL (Did you use a redirector or an URL shortener which strips part of the URL?)",
     "B": "B",
-    "KiB": "KiB",
-    "MiB": "MiB",
-    "GiB": "GiB",
-    "TiB": "TiB",
-    "PiB": "PiB",
-    "EiB": "EiB",
-    "ZiB": "ZiB",
-    "YiB": "YiB",
     "kB": "kB",
     "MB": "MB",
     "GB": "GB",

i18n/ku.json

@@ -156,14 +156,6 @@
     "Could not create paste: %s": "Could not create paste: %s",
     "Cannot decrypt paste: Decryption key missing in URL (Did you use a redirector or an URL shortener which strips part of the URL?)": "Cannot decrypt paste: Decryption key missing in URL (Did you use a redirector or an URL shortener which strips part of the URL?)",
     "B": "B",
-    "KiB": "KiB",
-    "MiB": "MiB",
-    "GiB": "GiB",
-    "TiB": "TiB",
-    "PiB": "PiB",
-    "EiB": "EiB",
-    "ZiB": "ZiB",
-    "YiB": "YiB",
     "kB": "kB",
     "MB": "MB",
     "GB": "GB",

i18n/la.json

@@ -156,14 +156,6 @@
     "Could not create paste: %s": "Could not create paste: %s",
     "Cannot decrypt paste: Decryption key missing in URL (Did you use a redirector or an URL shortener which strips part of the URL?)": "Cannot decrypt paste: Decryption key missing in URL (Did you use a redirector or an URL shortener which strips part of the URL?)",
     "B": "B",
-    "KiB": "KiB",
-    "MiB": "MiB",
-    "GiB": "GiB",
-    "TiB": "TiB",
-    "PiB": "PiB",
-    "EiB": "EiB",
-    "ZiB": "ZiB",
-    "YiB": "YiB",
     "kB": "kB",
     "MB": "MB",
     "GB": "GB",

i18n/lt.json

@@ -156,14 +156,6 @@
     "Could not create paste: %s": "Nepavyko sukurti įdėjimo: %s",
     "Cannot decrypt paste: Decryption key missing in URL (Did you use a redirector or an URL shortener which strips part of the URL?)": "Nepavyksta iššifruoti įdėjimo: URL adrese trūksta iššifravimo rakto (Ar naudojote peradresavimo ar URL trumpinimo įrankį, kuris pašalina URL dalį?)",
     "B": "B",
-    "KiB": "KiB",
-    "MiB": "MiB",
-    "GiB": "GiB",
-    "TiB": "TiB",
-    "PiB": "PiB",
-    "EiB": "EiB",
-    "ZiB": "ZiB",
-    "YiB": "YiB",
     "kB": "kB",
     "MB": "MB",
     "GB": "GB",

i18n/nl.json

@@ -156,14 +156,6 @@
     "Could not create paste: %s": "Kon de paste niet aanmaken: %s",
     "Cannot decrypt paste: Decryption key missing in URL (Did you use a redirector or an URL shortener which strips part of the URL?)": "Kon de paste niet decoderen: Decoderingssleutel ontbreekt in URL (Heb je een doorverwijzer of een URL-verkorter gebruikt die een deel van de URL verwijdert?)",
     "B": "B",
-    "KiB": "KiB",
-    "MiB": "MiB",
-    "GiB": "GiB",
-    "TiB": "TiB",
-    "PiB": "PiB",
-    "EiB": "EiB",
-    "ZiB": "ZiB",
-    "YiB": "YiB",
     "kB": "kB",
     "MB": "MB",
     "GB": "GB",

i18n/no.json

@@ -156,14 +156,6 @@
     "Could not create paste: %s": "Kunne ikke opprette innlegg: %s",
     "Cannot decrypt paste: Decryption key missing in URL (Did you use a redirector or an URL shortener which strips part of the URL?)": "Kan ikke dekryptere innlegg: Dekrypteringsnøkkelen mangler i adressen (Har du bruket en redirector eller en URL forkorter som fjerner en del av addressen?)",
     "B": "B",
-    "KiB": "KiB",
-    "MiB": "MiB",
-    "GiB": "GiB",
-    "TiB": "TiB",
-    "PiB": "PiB",
-    "EiB": "EiB",
-    "ZiB": "ZiB",
-    "YiB": "YiB",
     "kB": "kB",
     "MB": "MB",
     "GB": "GB",

i18n/oc.json

@@ -156,14 +156,6 @@
     "Could not create paste: %s": "Impossible de crear lo tèxte : %s",
     "Cannot decrypt paste: Decryption key missing in URL (Did you use a redirector or an URL shortener which strips part of the URL?)": "Impossible de deschifrar lo tèxte : clau de deschiframent absenta de l’URL (Avètz utilizat un redirector o un site de reduccion d’URL que suprimís una partida de l’URL ?)",
     "B": "o",
-    "KiB": "Kio",
-    "MiB": "Mio",
-    "GiB": "Gio",
-    "TiB": "Tio",
-    "PiB": "Pio",
-    "EiB": "Eio",
-    "ZiB": "Zio",
-    "YiB": "Yio",
     "kB": "ko",
     "MB": "Mo",
     "GB": "Go",

i18n/pl.json

@@ -156,14 +156,6 @@
     "Could not create paste: %s": "Nie udało się utworzyć wklejki: %s",
     "Cannot decrypt paste: Decryption key missing in URL (Did you use a redirector or an URL shortener which strips part of the URL?)": "Nie udało się odszyfrować wklejki - brak klucza deszyfrującego w adresie (użyłeś skracacza linków, który ucina część adresu?)",
     "B": "B",
-    "KiB": "KiB",
-    "MiB": "MiB",
-    "GiB": "GiB",
-    "TiB": "TiB",
-    "PiB": "PiB",
-    "EiB": "EiB",
-    "ZiB": "ZiB",
-    "YiB": "YiB",
     "kB": "kB",
     "MB": "MB",
     "GB": "GB",

i18n/pt.json

@@ -156,14 +156,6 @@
     "Could not create paste: %s": "Não foi possível criar cópia: %s",
     "Cannot decrypt paste: Decryption key missing in URL (Did you use a redirector or an URL shortener which strips part of the URL?)": "Não foi possível decifrar a cópia: chave de decriptografia ausente na URL (Você utilizou um redirecionador ou encurtador de URL que removeu parte dela?)",
     "B": "B",
-    "KiB": "KiB",
-    "MiB": "MiB",
-    "GiB": "GiB",
-    "TiB": "TiB",
-    "PiB": "PiB",
-    "EiB": "EiB",
-    "ZiB": "ZiB",
-    "YiB": "YiB",
     "kB": "kB",
     "MB": "MB",
     "GB": "GB",

i18n/ro.json

@@ -156,14 +156,6 @@
     "Could not create paste: %s": "Nu s-a putut crea paste-ul: %s",
     "Cannot decrypt paste: Decryption key missing in URL (Did you use a redirector or an URL shortener which strips part of the URL?)": "Nu s-a putut decripta paste-ul: Cheia de decriptare lipsește din URL (Ați folosit un redirector sau un scurtător de URL care a tăiat o parte din URL?)",
     "B": "B",
-    "KiB": "KiB",
-    "MiB": "MiB",
-    "GiB": "GiB",
-    "TiB": "TiB",
-    "PiB": "PiB",
-    "EiB": "EiB",
-    "ZiB": "ZiB",
-    "YiB": "YiB",
     "kB": "kB",
     "MB": "MB",
     "GB": "GB",

i18n/ru.json

@@ -156,14 +156,6 @@
     "Could not create paste: %s": "Не удалось опубликовать запись: %s",
     "Cannot decrypt paste: Decryption key missing in URL (Did you use a redirector or an URL shortener which strips part of the URL?)": "Невозможно расшифровать запись: Ключ расшифровки отсутствует в ссылке (Может быть, вы используете сокращатель ссылок, который удаляет часть ссылки?)",
     "B": "байт",
-    "KiB": "Кбайт",
-    "MiB": "Мбайт",
-    "GiB": "Гбайт",
-    "TiB": "Тбайт",
-    "PiB": "Пбайт",
-    "EiB": "Эбайт",
-    "ZiB": "Збайт",
-    "YiB": "Йбайт",
     "kB": "кбайт",
     "MB": "Мбайт",
     "GB": "Гбайт",

i18n/sk.json

@@ -156,14 +156,6 @@
     "Could not create paste: %s": "Nepodarilo sa vytvoriť príspevok: %s",
     "Cannot decrypt paste: Decryption key missing in URL (Did you use a redirector or an URL shortener which strips part of the URL?)": "Nie je možné dešifrovať príspevok: V URL adrese chýba dešifrovací kľúč (Použili ste presmerovač alebo skracovač adresy, ktorý odstráni časť adresy URL?)",
     "B": "B",
-    "KiB": "KiB",
-    "MiB": "MiB",
-    "GiB": "GiB",
-    "TiB": "TiB",
-    "PiB": "PiB",
-    "EiB": "EiB",
-    "ZiB": "ZiB",
-    "YiB": "YiB",
     "kB": "kB",
     "MB": "MB",
     "GB": "GB",

i18n/sl.json

@@ -156,14 +156,6 @@
     "Could not create paste: %s": "Ne morem ustvariti prilepka: %s",
     "Cannot decrypt paste: Decryption key missing in URL (Did you use a redirector or an URL shortener which strips part of the URL?)": "Ne morem odkodirati prilepka: V URL-ju manjka ključ (A si uporabil krajšalnik URL-jev, ki odstrani del URL-ja?)",
     "B": "o",
-    "KiB": "KB",
-    "MiB": "MB",
-    "GiB": "GB",
-    "TiB": "TB",
-    "PiB": "PB",
-    "EiB": "EB",
-    "ZiB": "ZB",
-    "YiB": "YB",
     "kB": "kB",
     "MB": "MB",
     "GB": "GB",

i18n/sv.json

@@ -156,14 +156,6 @@
     "Could not create paste: %s": "Could not create paste: %s",
     "Cannot decrypt paste: Decryption key missing in URL (Did you use a redirector or an URL shortener which strips part of the URL?)": "Cannot decrypt paste: Decryption key missing in URL (Did you use a redirector or an URL shortener which strips part of the URL?)",
     "B": "B",
-    "KiB": "KiB",
-    "MiB": "MiB",
-    "GiB": "GiB",
-    "TiB": "TiB",
-    "PiB": "PiB",
-    "EiB": "EiB",
-    "ZiB": "ZiB",
-    "YiB": "YiB",
     "kB": "kB",
     "MB": "MB",
     "GB": "GB",

i18n/th.json

@@ -156,14 +156,6 @@
     "Could not create paste: %s": "ไม่สามารถสร้างข้อมูลการฝากโค้ดได้: %s",
     "Cannot decrypt paste: Decryption key missing in URL (Did you use a redirector or an URL shortener which strips part of the URL?)": "ไม่สามารถถอดรหัสข้อมูลการฝากโค้ดได้: คีย์ถอดรหัสที่อยู่ใน URL หายไป (คุณได้ใช้ตัวเปลี่ยนเส้นทางหรือตัวย่อ URL ที่มีการตัดส่วนของ URL ออกหรือไม่)",
     "B": "B",
-    "KiB": "KiB",
-    "MiB": "MiB",
-    "GiB": "GiB",
-    "TiB": "TiB",
-    "PiB": "PiB",
-    "EiB": "EiB",
-    "ZiB": "ZiB",
-    "YiB": "YiB",
     "kB": "kB",
     "MB": "MB",
     "GB": "GB",

i18n/tr.json

@@ -156,14 +156,6 @@
     "Could not create paste: %s": "Yazı oluşturulamadı: %s",
     "Cannot decrypt paste: Decryption key missing in URL (Did you use a redirector or an URL shortener which strips part of the URL?)": "Yazı şifresi çözülemedi, çözme anahtarı URL'de bulunamadı. (Buraya bir yönlendirici veya URL kısaltıcı kullanarak gelmiş olabilirsiniz.)",
     "B": "B",
-    "KiB": "KiB",
-    "MiB": "MiB",
-    "GiB": "GiB",
-    "TiB": "TiB",
-    "PiB": "PiB",
-    "EiB": "EiB",
-    "ZiB": "ZiB",
-    "YiB": "YiB",
     "kB": "kB",
     "MB": "MB",
     "GB": "GB",

i18n/uk.json

@@ -156,14 +156,6 @@
     "Could not create paste: %s": "Не вдалося опублікувати допис: %s",
     "Cannot decrypt paste: Decryption key missing in URL (Did you use a redirector or an URL shortener which strips part of the URL?)": "Неможливо розшифрувати запис: Ключ дешифрування відсутній в посиланні (Можливо, ви використовуєте скорочувач посилань, що видаляє частину посилання?)",
     "B": "байт",
-    "KiB": "Кбайт",
-    "MiB": "Мбайт",
-    "GiB": "Гбайт",
-    "TiB": "Тбайт",
-    "PiB": "Пбайт",
-    "EiB": "Ебайт",
-    "ZiB": "Збайт",
-    "YiB": "Йбайт",
     "kB": "кбайт",
     "MB": "Мбайт",
     "GB": "Гбайт",

i18n/zh.json

@@ -156,14 +156,6 @@
     "Could not create paste: %s": "无法创建粘贴：%s",
     "Cannot decrypt paste: Decryption key missing in URL (Did you use a redirector or an URL shortener which strips part of the URL?)": "无法解密粘贴：URL中缺失解密密钥（是否使用了重定向或者短链接导致密钥丢失？）",
     "B": "B",
-    "KiB": "KiB",
-    "MiB": "MiB",
-    "GiB": "GiB",
-    "TiB": "TiB",
-    "PiB": "PiB",
-    "EiB": "EiB",
-    "ZiB": "ZiB",
-    "YiB": "YiB",
     "kB": "kB",
     "MB": "MB",
     "GB": "GB",

js/privatebin.js

@@ -591,7 +591,7 @@ jQuery.PrivateBin = (function($) {
         };
 
         /**
-         * Convert Bytes to KiB/MiB/GiB
+         * Convert Bytes to kB/MB/GB/TB/PB/EB/ZB/YB
          *
          * @name   Helper.formatBytes
          * @function
@@ -602,9 +602,12 @@ jQuery.PrivateBin = (function($) {
         me.formatBytes = function (bytes)
         {
             let result = '';
-            const kilobyte = 1024;
+            const kilobyte = 1000;
             const decimalPoint = 2;
-            const sizes = [I18n._('B'), I18n._('KiB'), I18n._('MiB'), I18n._('GiB')];
+            const sizes = [
+                I18n._('B'), I18n._('kB'), I18n._('MB'), I18n._('GB'), I18n._('TB'),
+                I18n._('PB'), I18n._('EB'), I18n._('ZB'), I18n._('YB')
+            ];
             const index = Math.floor(Math.log(bytes) / Math.log(kilobyte));
 
             if (bytes > 0) {

js/test/Helper.js

@@ -300,20 +300,36 @@ describe('Helper', function () {
             return $.PrivateBin.Helper.formatBytes(500) === '500 B';
         });
 
-        jsc.property('formats kibibytes correctly', function () {
-            return $.PrivateBin.Helper.formatBytes(1500) === '1.46 KiB';
+        jsc.property('formats kilobytes correctly', function () {
+            return $.PrivateBin.Helper.formatBytes(1500) === '1.5 kB';
         });
 
-        jsc.property('formats mebibytes correctly', function () {
-            return $.PrivateBin.Helper.formatBytes(2 * 1000 * 1000) === '1.91 MiB';
+        jsc.property('formats megabytes correctly', function () {
+            return $.PrivateBin.Helper.formatBytes(2 * 1000 * 1000) === '2 MB';
         });
 
-        jsc.property('formats gibibytes correctly', function () {
-            return $.PrivateBin.Helper.formatBytes(3.45 * 1000 * 1000 * 1000) === '3.21 GiB';
+        jsc.property('formats gigabytes correctly', function () {
+            return $.PrivateBin.Helper.formatBytes(3.45 * 1000 * 1000 * 1000) === '3.45 GB';
+        });
+
+        jsc.property('formats terabytes correctly', function () {
+            return $.PrivateBin.Helper.formatBytes(1.75 * 1000 ** 4) === '1.75 TB';
+        });
+
+        jsc.property('formats petabytes correctly', function () {
+            return $.PrivateBin.Helper.formatBytes(1.5 * 1000 ** 5) === '1.5 PB';
+        });
+
+        jsc.property('formats exabytes correctly', function () {
+            return $.PrivateBin.Helper.formatBytes(1.2345 * 1000 ** 6).startsWith('1.23 EB');
+        });
+
+        jsc.property('formats yottabytes correctly', function () {
+            return $.PrivateBin.Helper.formatBytes(1.23 * 1000 ** 8).startsWith('1.23 YB');
         });
 
         jsc.property('rounds to two decimal places', function () {
-            return $.PrivateBin.Helper.formatBytes(1234567) === '1.18 MiB';
+            return $.PrivateBin.Helper.formatBytes(1234567) === '1.23 MB';
         });
     });
 

lib/Configuration.php

@@ -116,7 +116,7 @@ class Configuration
             'js/kjua-0.10.0.js'      => 'sha512-BYj4xggowR7QD150VLSTRlzH62YPfhpIM+b/1EUEr7RQpdWAGKulxWnOvjFx1FUlba4m6ihpNYuQab51H6XlYg==',
             'js/legacy.js'           => 'sha512-UxW/TOZKon83n6dk/09GsYKIyeO5LeBHokxyIq+r7KFS5KMBeIB/EM7NrkVYIezwZBaovnyNtY2d9tKFicRlXg==',
             'js/prettify.js'         => 'sha512-puO0Ogy++IoA2Pb9IjSxV1n4+kQkKXYAEUtVzfZpQepyDPyXk8hokiYDS7ybMogYlyyEIwMLpZqVhCkARQWLMg==',
-            'js/privatebin.js'       => 'sha512-tEMoEpNQ36hksIPjp5y8go2RY0oQL9qY3Kzh1BKjOf1y35QIP7klUSHJqDhVkcLTyDc0CoZVEMMxSoMMc7EYCw==',
+            'js/privatebin.js'       => 'sha512-gwzwJC0yMtonwX7zzx58e+mpYKUmuQYnuuyIC/Z0XOtYrZlR+DyDkP9hHqj6ejCyAV74SPA670+rUDnYQGS5/Q==',
             'js/purify-3.2.6.js'     => 'sha512-zqwL4OoBLFx89QPewkz4Lz5CSA2ktU+f31fuECkF0iK3Id5qd3Zpq5dMby8KwHjIEpsUgOqwF58cnmcaNem0EA==',
             'js/showdown-2.1.0.js'   => 'sha512-WYXZgkTR0u/Y9SVIA4nTTOih0kXMEd8RRV6MLFdL6YU8ymhR528NLlYQt1nlJQbYz4EW+ZsS0fx1awhiQJme1Q==',
             'js/zlib-1.3.1-1.js'     => 'sha512-5bU9IIP4PgBrOKLZvGWJD4kgfQrkTz8Z3Iqeu058mbQzW3mCumOU6M3UVbVZU9rrVoVwaW4cZK8U8h5xjF88eQ==',

lib/Filter.php

@@ -59,10 +59,10 @@ class Filter
      */
     public static function formatHumanReadableSize($size)
     {
-        $iec = array('B', 'KiB', 'MiB', 'GiB', 'TiB', 'PiB', 'EiB', 'ZiB', 'YiB');
+        $iec = array('B', 'kB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB');
         $i   = 0;
-        while (($size / 1024) >= 1) {
-            $size = $size / 1024;
+        while (($size / 1000) >= 1) {
+            $size = $size / 1000;
             ++$i;
         }
         return number_format($size, $i ? 2 : 0, '.', ' ') . ' ' . I18n::_($iec[$i]);

tst/FilterTest.php

@@ -23,36 +23,36 @@ class FilterTest extends TestCase
     public function testFilterMakesSizesHumanlyReadable()
     {
         $this->assertEquals('1 B', Filter::formatHumanReadableSize(1));
-        $this->assertEquals('1 000 B', Filter::formatHumanReadableSize(1000));
-        $this->assertEquals('1.00 KiB', Filter::formatHumanReadableSize(1024));
-        $this->assertEquals('1.21 KiB', Filter::formatHumanReadableSize(1234));
-        $exponent = 1024;
-        $this->assertEquals('1 000.00 KiB', Filter::formatHumanReadableSize(1000 * $exponent));
-        $this->assertEquals('1.00 MiB', Filter::formatHumanReadableSize(1024 * $exponent));
-        $this->assertEquals('1.21 MiB', Filter::formatHumanReadableSize(1234 * $exponent));
-        $exponent *= 1024;
-        $this->assertEquals('1 000.00 MiB', Filter::formatHumanReadableSize(1000 * $exponent));
-        $this->assertEquals('1.00 GiB', Filter::formatHumanReadableSize(1024 * $exponent));
-        $this->assertEquals('1.21 GiB', Filter::formatHumanReadableSize(1234 * $exponent));
-        $exponent *= 1024;
-        $this->assertEquals('1 000.00 GiB', Filter::formatHumanReadableSize(1000 * $exponent));
-        $this->assertEquals('1.00 TiB', Filter::formatHumanReadableSize(1024 * $exponent));
-        $this->assertEquals('1.21 TiB', Filter::formatHumanReadableSize(1234 * $exponent));
-        $exponent *= 1024;
-        $this->assertEquals('1 000.00 TiB', Filter::formatHumanReadableSize(1000 * $exponent));
-        $this->assertEquals('1.00 PiB', Filter::formatHumanReadableSize(1024 * $exponent));
-        $this->assertEquals('1.21 PiB', Filter::formatHumanReadableSize(1234 * $exponent));
-        $exponent *= 1024;
-        $this->assertEquals('1 000.00 PiB', Filter::formatHumanReadableSize(1000 * $exponent));
-        $this->assertEquals('1.00 EiB', Filter::formatHumanReadableSize(1024 * $exponent));
-        $this->assertEquals('1.21 EiB', Filter::formatHumanReadableSize(1234 * $exponent));
-        $exponent *= 1024;
-        $this->assertEquals('1 000.00 EiB', Filter::formatHumanReadableSize(1000 * $exponent));
-        $this->assertEquals('1.00 ZiB', Filter::formatHumanReadableSize(1024 * $exponent));
-        $this->assertEquals('1.21 ZiB', Filter::formatHumanReadableSize(1234 * $exponent));
-        $exponent *= 1024;
-        $this->assertEquals('1 000.00 ZiB', Filter::formatHumanReadableSize(1000 * $exponent));
-        $this->assertEquals('1.00 YiB', Filter::formatHumanReadableSize(1024 * $exponent));
-        $this->assertEquals('1.21 YiB', Filter::formatHumanReadableSize(1234 * $exponent));
+        $this->assertEquals('1.00 kB', Filter::formatHumanReadableSize(1000));
+        $this->assertEquals('1.02 kB', Filter::formatHumanReadableSize(1024));
+        $this->assertEquals('1.23 kB', Filter::formatHumanReadableSize(1234));
+        $exponent = 1000;
+        $this->assertEquals('1.00 MB', Filter::formatHumanReadableSize(1000 * $exponent));
+        $this->assertEquals('1.02 MB', Filter::formatHumanReadableSize(1024 * $exponent));
+        $this->assertEquals('1.23 MB', Filter::formatHumanReadableSize(1234 * $exponent));
+        $exponent *= 1000;
+        $this->assertEquals('1.00 GB', Filter::formatHumanReadableSize(1000 * $exponent));
+        $this->assertEquals('1.02 GB', Filter::formatHumanReadableSize(1024 * $exponent));
+        $this->assertEquals('1.23 GB', Filter::formatHumanReadableSize(1234 * $exponent));
+        $exponent *= 1000;
+        $this->assertEquals('1.00 TB', Filter::formatHumanReadableSize(1000 * $exponent));
+        $this->assertEquals('1.02 TB', Filter::formatHumanReadableSize(1024 * $exponent));
+        $this->assertEquals('1.23 TB', Filter::formatHumanReadableSize(1234 * $exponent));
+        $exponent *= 1000;
+        $this->assertEquals('1.00 PB', Filter::formatHumanReadableSize(1000 * $exponent));
+        $this->assertEquals('1.02 PB', Filter::formatHumanReadableSize(1024 * $exponent));
+        $this->assertEquals('1.23 PB', Filter::formatHumanReadableSize(1234 * $exponent));
+        $exponent *= 1000;
+        $this->assertEquals('1.00 EB', Filter::formatHumanReadableSize(1000 * $exponent));
+        $this->assertEquals('1.02 EB', Filter::formatHumanReadableSize(1024 * $exponent));
+        $this->assertEquals('1.23 EB', Filter::formatHumanReadableSize(1234 * $exponent));
+        $exponent *= 1000;
+        $this->assertEquals('1.00 ZB', Filter::formatHumanReadableSize(1000 * $exponent));
+        $this->assertEquals('1.02 ZB', Filter::formatHumanReadableSize(1024 * $exponent));
+        $this->assertEquals('1.23 ZB', Filter::formatHumanReadableSize(1234 * $exponent));
+        $exponent *= 1000;
+        $this->assertEquals('1.00 YB', Filter::formatHumanReadableSize(1000 * $exponent));
+        $this->assertEquals('1.02 YB', Filter::formatHumanReadableSize(1024 * $exponent));
+        $this->assertEquals('1.23 YB', Filter::formatHumanReadableSize(1234 * $exponent));
     }
 }