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

Merge pull request #237 from zenogantner/master

Browse Source 
German improvements
This commit is contained in:
kkonieczny
2019-01-18 15:05:24 -05:00
committed by GitHub
parent cebcaa6e64 a3a0961b7d
commit 83cfcdc999
2 changed files with 31 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
num2words/lang_DE.py
View File

@@ -17,6 +17,8 @@
from __future__ import print_function, unicode_literals from __future__ import print_function, unicode_literals
import re
from .lang_EU import Num2Word_EU from .lang_EU import Num2Word_EU
@@ -45,7 +47,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",
@@ -107,7 +109,7 @@ class Num2Word_DE(Num2Word_EU):
def to_ordinal(self, value): def to_ordinal(self, value):
self.verify_ordinal(value) self.verify_ordinal(value)
outword = self.to_cardinal(value) outword = self.to_cardinal(value).lower()
for key in self.ords: for key in self.ords:
if outword.endswith(key): if outword.endswith(key):
outword = outword[:len(outword) - len(key)] + self.ords[key] outword = outword[:len(outword) - len(key)] + self.ords[key]
@@ -118,6 +120,13 @@ 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)
# ... similarly for "millionste" etc.
res = re.sub(r'eine ([a-z]+(illion|illiard)ste)$',
lambda m: m.group(1), res)
# Ordinals involving "Million" etc. are written without a space.
# see https://de.wikipedia.org/wiki/Million#Sprachliches
res = re.sub(r' ([a-z]+(illion|illiard)ste)$',
lambda m: m.group(1), res)
return res return res

27
tests/test_de.py
View File

@@ -23,7 +23,10 @@ from num2words import num2words
class Num2WordsDETest(TestCase): class Num2WordsDETest(TestCase):
def test_ordinal_less_than_twenty(self): def test_ordinal_less_than_twenty(self):
self.assertEqual(num2words(0, ordinal=True, lang='de'), "nullte")
self.assertEqual(num2words(1, ordinal=True, lang='de'), "erste")
self.assertEqual(num2words(7, ordinal=True, lang='de'), "siebte") self.assertEqual(num2words(7, ordinal=True, lang='de'), "siebte")
self.assertEqual(num2words(8, ordinal=True, lang='de'), "achte") self.assertEqual(num2words(8, ordinal=True, lang='de'), "achte")
self.assertEqual(num2words(12, ordinal=True, lang='de'), "zwölfte") self.assertEqual(num2words(12, ordinal=True, lang='de'), "zwölfte")
@@ -45,18 +48,28 @@ class Num2WordsDETest(TestCase):
num2words(4000, ordinal=True, lang='de'), "viertausendste" num2words(4000, ordinal=True, lang='de'), "viertausendste"
) )
self.assertEqual( self.assertEqual(
num2words(2000000, ordinal=True, lang='de'), "zwei millionste" num2words(1000000, ordinal=True, lang='de'), "millionste"
)
self.assertEqual(
num2words(2000000, ordinal=True, lang='de'), "zweimillionste"
)
self.assertEqual(
num2words(1000000000, ordinal=True, lang='de'), "milliardste"
) )
self.assertEqual( self.assertEqual(
num2words(5000000000, ordinal=True, lang='de'), num2words(5000000000, ordinal=True, lang='de'),
"fünf milliardste" "fünfmilliardste"
) )
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(2000000, lang='de'), "zwei millionen") self.assertEqual(num2words(1000, lang='de'), "eintausend")
self.assertEqual(num2words(4000000000, lang='de'), "vier milliarden") self.assertEqual(num2words(5000, lang='de'), "fünftausend")
self.assertEqual(num2words(1000000000, lang='de'), "eine milliarde") self.assertEqual(num2words(10000, lang='de'), "zehntausend")
self.assertEqual(num2words(1000000, lang='de'), "eine Million")
self.assertEqual(num2words(2000000, lang='de'), "zwei Millionen")
self.assertEqual(num2words(4000000000, lang='de'), "vier Milliarden")
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(
@@ -66,8 +79,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):