Merge branch 'master' into master

This commit is contained in:
Marek Madejski
2019-01-14 15:19:17 +01:00
committed by GitHub
4 changed files with 12 additions and 2 deletions

View File

@@ -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
---------------------------

View File

@@ -55,7 +55,7 @@ import sys
from docopt import docopt
import num2words
__version__ = "0.5.8"
__version__ = "0.5.9"
__license__ = "LGPL"

View File

@@ -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):

View File

@@ -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')
)