bblaz/num2words
1
0
Fork 0
mirror of https://github.com/bblaz/num2words.git synced 2025-12-06 06:42:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Small corrections concerning the plural of millions, milliards, cents and vingts

Browse Source
This commit is contained in:
Lise Rebout
2018-09-13 09:59:16 -04:00
committed by Ernesto Rodriguez Ortiz
parent 2a99ff1061
commit c71d99cddf
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
num2words/lang_FR.py
View File

@@ -51,7 +51,10 @@ class Num2Word_FR(Num2Word_EU):
if nnum < 1000000: if nnum < 1000000:
return next return next
else: else:
if (not (cnum - 80) % 100 or not cnum % 100) and ctext[-1] == "s": if (not (cnum - 80) % 100
or (not cnum % 100 and cnum < 1000))\
and nnum < 1000000 \
and ctext[-1] == "s":
ctext = ctext[:-1] ctext = ctext[:-1]
if cnum < 1000 and nnum != 1000 and \ if cnum < 1000 and nnum != 1000 and \
ntext[-1] != "s" and not nnum % 100: ntext[-1] != "s" and not nnum % 100:

5
tests/test_fr.py
View File

@@ -79,7 +79,12 @@ TEST_CASES_CARDINAL = (
(1000000, 'un million'), (1000000, 'un million'),
(1000001, 'un million un'), (1000001, 'un million un'),
(4000000, 'quatre millions'), (4000000, 'quatre millions'),
(4000004, 'quatre millions quatre'),
(4300000, 'quatre millions trois cent mille'),
(80000000, 'quatre-vingts millions'),
(300000000, 'trois cents millions'),
(10000000000000, 'dix billions'), (10000000000000, 'dix billions'),
(10000000000010, 'dix billions dix'),
(100000000000000, 'cent billions'), (100000000000000, 'cent billions'),
(1000000000000000000, 'un trillion'), (1000000000000000000, 'un trillion'),
(1000000000000000000000, 'un trilliard'), (1000000000000000000000, 'un trilliard'),