Skip to content

Interpolate the number into ordinal, intword and filesize translations #403

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alexei wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Interpolate the number into ordinal, intword and filesize translations #403

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 25 additions & 23 deletions src/humanize/filesize.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,31 +5,32 @@
__lazy_modules__ = {"humanize.i18n"}

from humanize.i18n import _gettext as _
from humanize.i18n import _gettext_noop as N_

suffixes = {
"decimal": (
"kB",
"MB",
"GB",
"TB",
"PB",
"EB",
"ZB",
"YB",
"RB",
"QB",
N_("%s kB"),
N_("%s MB"),
N_("%s GB"),
N_("%s TB"),
N_("%s PB"),
N_("%s EB"),
N_("%s ZB"),
N_("%s YB"),
N_("%s RB"),
N_("%s QB"),
),
"binary": (
"KiB",
"MiB",
"GiB",
"TiB",
"PiB",
"EiB",
"ZiB",
"YiB",
"RiB",
"QiB",
N_("%s KiB"),
N_("%s MiB"),
N_("%s GiB"),
N_("%s TiB"),
N_("%s PiB"),
N_("%s EiB"),
N_("%s ZiB"),
N_("%s YiB"),
N_("%s RiB"),
N_("%s QiB"),
),
"gnu": "KMGTPEZYRQ",
}
Expand Down Expand Up @@ -105,6 +106,7 @@ def naturalsize(
# suffix is available, step up one suffix so the result reads "1.0 MB".
if exp < len(suffix) and abs(float(format % (abs_bytes / (base**exp)))) >= base:
exp += 1
space = "" if gnu else " "
ret: str = format % (bytes_ / (base**exp)) + space + _(suffix[exp - 1])
return ret
number: str = format % (bytes_ / (base**exp))
if gnu:
return number + _(suffix[exp - 1])
return _(suffix[exp - 1]) % number
Loading