From f2fb5bc67f2eb5f419f08b508dcb37da1500a545 Mon Sep 17 00:00:00 2001 From: Ernesto Rodriguez Ortiz Date: Thu, 10 Jan 2019 20:09:08 -0500 Subject: [PATCH 1/2] Release 0.5.9 --- CHANGES.rst | 7 +++++++ bin/num2words | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGES.rst b/CHANGES.rst index 0f15372..0cbd250 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,6 +1,13 @@ Changelog ========= +Version 0.5.9 -- 2019/01/10 +--------------------------- + +* Fix encoding issue on release 0.5.8 (#229) +* Improve Polish localization (#228) + + Version 0.5.8 -- 2018/11/17 --------------------------- diff --git a/bin/num2words b/bin/num2words index 18e70a3..7c9d595 100755 --- a/bin/num2words +++ b/bin/num2words @@ -55,7 +55,7 @@ import sys from docopt import docopt import num2words -__version__ = "0.5.8" +__version__ = "0.5.9" __license__ = "LGPL" From 778786b65b5468f60a36d24394125893dfc643be Mon Sep 17 00:00:00 2001 From: Zeno Gantner Date: Sat, 12 Jan 2019 19:10:31 +0100 Subject: [PATCH 2/2] fix ordinal_num for French numbers ending with 1 (#236) --- num2words/lang_FR.py | 2 +- tests/test_fr.py | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/num2words/lang_FR.py b/num2words/lang_FR.py index 4524cb5..85ef87e 100644 --- a/num2words/lang_FR.py +++ b/num2words/lang_FR.py @@ -89,7 +89,7 @@ class Num2Word_FR(Num2Word_EU): def to_ordinal_num(self, value): self.verify_ordinal(value) out = str(value) - out += {"1": "er"}.get(out[-1], "me") + out += "er" if value == 1 else "me" return out def to_currency(self, val, longval=True, old=False): diff --git a/tests/test_fr.py b/tests/test_fr.py index 1299dcc..6170cb7 100644 --- a/tests/test_fr.py +++ b/tests/test_fr.py @@ -107,10 +107,13 @@ TEST_CASES_ORDINAL = ( TEST_CASES_ORDINAL_NUM = ( (1, '1er'), (8, '8me'), + (11, '11me'), (12, '12me'), (14, '14me'), + (21, '21me'), (28, '28me'), (100, '100me'), + (101, '101me'), (1000, '1000me'), (1000000, '1000000me') )