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

Million etc. are upper case in German

Browse Source
This commit is contained in:
Zeno Gantner
2019-01-13 23:25:54 +01:00
parent df65296a80
commit e321caf392
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
num2words/lang_DE.py
View File

@@ -45,7 +45,7 @@ class Num2Word_DE(Num2Word_EU):
self.errmsg_toobig = "Die Zahl %s muss kleiner als %s sein." self.errmsg_toobig = "Die Zahl %s muss kleiner als %s sein."
self.exclude_title = [] self.exclude_title = []
lows = ["non", "okt", "sept", "sext", "quint", "quadr", "tr", "b", "m"] lows = ["Non", "Okt", "Sept", "Sext", "Quint", "Quadr", "Tr", "B", "M"]
units = ["", "un", "duo", "tre", "quattuor", "quin", "sex", "sept", units = ["", "un", "duo", "tre", "quattuor", "quin", "sex", "sept",
"okto", "novem"] "okto", "novem"]
tens = ["dez", "vigint", "trigint", "quadragint", "quinquagint", tens = ["dez", "vigint", "trigint", "quadragint", "quinquagint",
@@ -118,7 +118,7 @@ class Num2Word_DE(Num2Word_EU):
# Exception: "hundertste" is usually preferred over "einhundertste" # Exception: "hundertste" is usually preferred over "einhundertste"
if res == "eintausendste" or res == "einhundertste": if res == "eintausendste" or res == "einhundertste":
res = res.replace("ein", "", 1) res = res.replace("ein", "", 1)
if res == "eine millionste": if res == "eine Millionste":
res = res.replace("eine ", "", 1) res = res.replace("eine ", "", 1)
return res return res

18
tests/test_de.py
View File

@@ -48,22 +48,22 @@ class Num2WordsDETest(TestCase):
num2words(4000, ordinal=True, lang='de'), "viertausendste" num2words(4000, ordinal=True, lang='de'), "viertausendste"
) )
self.assertEqual( self.assertEqual(
num2words(1000000, ordinal=True, lang='de'), "millionste" num2words(1000000, ordinal=True, lang='de'), "Millionste"
) )
self.assertEqual( self.assertEqual(
num2words(2000000, ordinal=True, lang='de'), "zwei millionste" num2words(2000000, ordinal=True, lang='de'), "zwei Millionste"
) )
self.assertEqual( self.assertEqual(
num2words(5000000000, ordinal=True, lang='de'), num2words(5000000000, ordinal=True, lang='de'),
"fünf milliardste" "fünf Milliardste"
) )
def test_cardinal_at_some_numbers(self): def test_cardinal_at_some_numbers(self):
self.assertEqual(num2words(100, lang='de'), "einhundert") self.assertEqual(num2words(100, lang='de'), "einhundert")
self.assertEqual(num2words(1000000, lang='de'), "eine million") self.assertEqual(num2words(1000000, lang='de'), "eine Million")
self.assertEqual(num2words(2000000, lang='de'), "zwei millionen") self.assertEqual(num2words(2000000, lang='de'), "zwei Millionen")
self.assertEqual(num2words(4000000000, lang='de'), "vier milliarden") self.assertEqual(num2words(4000000000, lang='de'), "vier Milliarden")
self.assertEqual(num2words(1000000000, lang='de'), "eine milliarde") self.assertEqual(num2words(1000000000, lang='de'), "eine Milliarde")
def test_cardinal_for_decimal_number(self): def test_cardinal_for_decimal_number(self):
self.assertEqual( self.assertEqual(
@@ -73,8 +73,8 @@ class Num2WordsDETest(TestCase):
def test_giant_cardinal_for_merge(self): def test_giant_cardinal_for_merge(self):
self.assertEqual( self.assertEqual(
num2words(4500072900000111, lang='de'), num2words(4500072900000111, lang='de'),
"vier billiarden fünfhundert billionen " + "vier Billiarden fünfhundert Billionen " +
"zweiundsiebzig milliarden neunhundert millionen einhundertelf" "zweiundsiebzig Milliarden neunhundert Millionen einhundertelf"
) )
def test_ordinal_num(self): def test_ordinal_num(self):