Skip to content

Fix French decimal separator and apply to naturalsize #357

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

Closed
SpiliosDimakopoulos wants to merge 1 commit into from
+36 −34
Closed

Fix French decimal separator and apply to naturalsize #357

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
4 changes: 3 additions & 1 deletion src/humanize/filesize.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
from math import log

from humanize.i18n import _gettext as _
from humanize.i18n import decimal_separator

suffixes = {
"decimal": (
Expand Down Expand Up @@ -106,5 +107,6 @@ def naturalsize(
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])
number = (format % (bytes_ / (base**exp))).replace(".", decimal_separator())
ret: str = number + space + _(suffix[exp - 1])
return ret
2 changes: 1 addition & 1 deletion src/humanize/i18n.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
# Mapping of locale to decimal separator
_DECIMAL_SEPARATOR: dict[str | None, str] = {
"de_DE": ",",
"fr_FR": ".",
"fr_FR": ",",
"it_IT": ",",
"pt_BR": ",",
"hu_HU": ",",
Expand Down
64 changes: 32 additions & 32 deletions tests/test_i18n.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ def test_intcomma() -> None:

humanize.i18n.activate("fr_FR")
assert humanize.intcomma(number) == "10 000 000"
assert humanize.intcomma(1_234_567.89) == "1 234 567.89"
assert humanize.intcomma("1 234 567.89") == "1 234 567.89"
assert humanize.intcomma(1_234_567.89) == "1 234 567,89"
assert humanize.intcomma("1 234 567,89") == "1 234 567,89"

humanize.i18n.activate("pt_BR")
assert humanize.intcomma(number) == "10.000.000"
Expand Down Expand Up @@ -117,46 +117,46 @@ def test_naturaldelta() -> None:
("lv", 2_000_000, "2,0 miljoni"),
("lv", 11_000_000, "11,0 miljoni"),
("lv", 21_000_000, "21,0 miljons"),
("fr_FR", "1_000", "1.0 mille"),
("fr_FR", "12_400", "12.4 milles"),
("fr_FR", "12_490", "12.5 milles"),
("fr_FR", "1_000_000", "1.0 million"),
("fr_FR", "-1_000_000", "-1.0 million"),
("fr_FR", "1_200_000", "1.2 millions"),
("fr_FR", "1_290_000", "1.3 millions"),
("fr_FR", "999_999_999", "1.0 milliard"),
("fr_FR", "1_000_000_000", "1.0 milliard"),
("fr_FR", "-1_000_000_000", "-1.0 milliard"),
("fr_FR", "2_000_000_000", "2.0 milliards"),
("fr_FR", "999_999_999_999", "1.0 billion"),
("fr_FR", "1_000_000_000_000", "1.0 billion"),
("fr_FR", "6_000_000_000_000", "6.0 billions"),
("fr_FR", "-6_000_000_000_000", "-6.0 billions"),
("fr_FR", "999_999_999_999_999", "1.0 billiard"),
("fr_FR", "1_000_000_000_000_000", "1.0 billiard"),
("fr_FR", "1_300_000_000_000_000", "1.3 billiards"),
("fr_FR", "-1_300_000_000_000_000", "-1.3 billiards"),
("fr_FR", "3_500_000_000_000_000_000_000", "3.5 trilliards"),
("fr_FR", "8_100_000_000_000_000_000_000_000_000_000_000", "8.1 quintilliards"),
("fr_FR", "1_000", "1,0 mille"),
("fr_FR", "12_400", "12,4 milles"),
("fr_FR", "12_490", "12,5 milles"),
("fr_FR", "1_000_000", "1,0 million"),
("fr_FR", "-1_000_000", "-1,0 million"),
("fr_FR", "1_200_000", "1,2 millions"),
("fr_FR", "1_290_000", "1,3 millions"),
("fr_FR", "999_999_999", "1,0 milliard"),
("fr_FR", "1_000_000_000", "1,0 milliard"),
("fr_FR", "-1_000_000_000", "-1,0 milliard"),
("fr_FR", "2_000_000_000", "2,0 milliards"),
("fr_FR", "999_999_999_999", "1,0 billion"),
("fr_FR", "1_000_000_000_000", "1,0 billion"),
("fr_FR", "6_000_000_000_000", "6,0 billions"),
("fr_FR", "-6_000_000_000_000", "-6,0 billions"),
("fr_FR", "999_999_999_999_999", "1,0 billiard"),
("fr_FR", "1_000_000_000_000_000", "1,0 billiard"),
("fr_FR", "1_300_000_000_000_000", "1,3 billiards"),
("fr_FR", "-1_300_000_000_000_000", "-1,3 billiards"),
("fr_FR", "3_500_000_000_000_000_000_000", "3,5 trilliards"),
("fr_FR", "8_100_000_000_000_000_000_000_000_000_000_000", "8,1 quintilliards"),
(
"fr_FR",
"-8_100_000_000_000_000_000_000_000_000_000_000",
"-8.1 quintilliards",
"-8,1 quintilliards",
),
(
"fr_FR",
1_000_000_000_000_000_000_000_000_000_000_000_000,
"1000.0 quintilliards",
"1000,0 quintilliards",
),
(
"fr_FR",
1_100_000_000_000_000_000_000_000_000_000_000_000,
"1100.0 quintilliards",
"1100,0 quintilliards",
),
(
"fr_FR",
2_100_000_000_000_000_000_000_000_000_000_000_000,
"2100.0 quintilliards",
"2100,0 quintilliards",
),
],
)
Expand All @@ -176,10 +176,10 @@ def test_intword_i18n(locale: str, number: int, expected_result: str) -> None:
[
("fr_FR", 1, "1 octet"),
("fr_FR", 42, "42 octets"),
("fr_FR", 42_000, "42.0 Ko"),
("fr_FR", 42_000_000, "42.0 Mo"),
("fr_FR", 42_000_000_000, "42.0 Go"),
("fr_FR", -42_000, "-42.0 Ko"),
("fr_FR", 42_000, "42,0 Ko"),
("fr_FR", 42_000_000, "42,0 Mo"),
("fr_FR", 42_000_000_000, "42,0 Go"),
("fr_FR", -42_000, "-42,0 Ko"),
],
)
def test_naturalsize_i18n(locale: str, value: float, expected_result: str) -> None:
Expand All @@ -199,7 +199,7 @@ def test_naturalsize_i18n_binary() -> None:
except FileNotFoundError:
pytest.skip("Generate .mo with scripts/generate-translation-binaries.sh")
else:
assert humanize.naturalsize(3000, binary=True) == "2.9 Kio"
assert humanize.naturalsize(3000, binary=True) == "2,9 Kio"
finally:
humanize.i18n.deactivate()

Expand Down
Loading