Fix 5 and 9 ordinals in french

fixes #18
This commit is contained in:
Virgil Dupras
2015-04-06 15:06:17 -04:00
parent 90cce9a0eb
commit fdeb061eca
2 changed files with 43 additions and 5 deletions

View File

@@ -19,7 +19,6 @@ from __future__ import unicode_literals
from .lang_EU import Num2Word_EU
#//TODO: error messages in French
#//TODO: ords
class Num2Word_FR(Num2Word_EU):
def setup(self):
self.negword = "moins "
@@ -35,6 +34,10 @@ class Num2Word_FR(Num2Word_EU):
"seize", "quinze", "quatorze", "treize", "douze",
"onze", "dix", "neuf", "huit", "sept", "six",
"cinq", "quatre", "trois", "deux", "un", "zéro"]
self.ords = {
"cinq": "cinquième",
"neuf": "neuvième",
}
def merge(self, curr, next):
@@ -67,10 +70,15 @@ class Num2Word_FR(Num2Word_EU):
if value == 1:
return "premier"
word = self.to_cardinal(value)
for src, repl in self.ords.items():
if word.endswith(src):
word = word[:-len(src)] + repl
break
else:
if word[-1] == "e":
word = word[:-1]
return word + "ième"
word = word + "ième"
return word
def to_ordinal_num(self, value):
self.verify_ordinal(value)

30
tests/test_fr.py Normal file
View File

@@ -0,0 +1,30 @@
# -*- encoding: utf-8 -*-
# Copyright (c) 2015, Savoir-faire Linux inc. All Rights Reserved.
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
# License as published by the Free Software Foundation; either
# version 2.1 of the License, or (at your option) any later version.
# This library is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# Lesser General Public License for more details.
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
# MA 02110-1301 USA
from __future__ import unicode_literals
from unittest import TestCase
from num2words import num2words
class Num2WordsENTest(TestCase):
def test_ordinal_special_joins(self):
# ref https://github.com/savoirfairelinux/num2words/issues/18
self.assertEqual(num2words(5, ordinal=True, lang='fr'), "cinquième")
self.assertEqual(num2words(35, ordinal=True, lang='fr'), "trente-cinquième")
self.assertEqual(num2words(9, ordinal=True, lang='fr'), "neuvième")
self.assertEqual(num2words(49, ordinal=True, lang='fr'), "quarante-neuvième")