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 #287 from btharper/es_coverage

Browse Source 
Add ordinal 12,345 to ES test suite to increase coverage
This commit is contained in:
Ernesto Rodriguez Ortiz
2019-12-31 09:32:23 -05:00
committed by GitHub
parent b594ac0513 cb9fff1189
commit 432b763e1d
2 changed files with 44 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
num2words/lang_ES.py
View File

@@ -15,7 +15,9 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
# MA 02110-1301 USA # MA 02110-1301 USA
from __future__ import print_function, unicode_literals from __future__ import division, print_function, unicode_literals
import math
from .lang_EU import Num2Word_EU from .lang_EU import Num2Word_EU
@@ -120,47 +122,47 @@ class Num2Word_ES(Num2Word_EU):
def to_ordinal(self, value): def to_ordinal(self, value):
self.verify_ordinal(value) self.verify_ordinal(value)
try: if value == 0:
if value == 0: text = ""
text = "" elif value <= 10:
elif value <= 10: text = "%s%s" % (self.ords[value], self.gender_stem)
text = "%s%s" % (self.ords[value], self.gender_stem) elif value <= 12:
elif value <= 12: text = (
text = ( "%s%s%s" % (self.ords[10], self.gender_stem,
"%s%s%s" % (self.ords[10], self.gender_stem, self.to_ordinal(value - 10))
self.to_ordinal(value - 10))
)
elif value <= 100:
dec = (value // 10) * 10
text = (
"%s%s %s" % (self.ords[dec], self.gender_stem,
self.to_ordinal(value - dec))
)
elif value <= 1e3:
cen = (value // 100) * 100
text = (
"%s%s %s" % (self.ords[cen], self.gender_stem,
self.to_ordinal(value - cen))
)
elif value < 1e18:
# dec contains the following:
# [ 1e3, 1e6): 1e3
# [ 1e6, 1e9): 1e6
# [ 1e9, 1e12): 1e9
# [1e12, 1e15): 1e12
# [1e15, 1e18): 1e15
dec = 10 ** ((((len(str(int(value))) - 1) / 3 - 1) + 1) * 3)
part = int(float(value / dec) * dec)
cardinal = (
self.to_cardinal(part / dec) if part / dec != 1 else ""
) )
text = ( elif value <= 100:
"%s%s%s %s" % (cardinal, self.ords[dec], self.gender_stem, dec = (value // 10) * 10
self.to_ordinal(value - part)) text = (
) "%s%s %s" % (self.ords[dec], self.gender_stem,
else: self.to_ordinal(value - dec))
text = self.to_cardinal(value) )
except KeyError: elif value <= 1e3:
cen = (value // 100) * 100
text = (
"%s%s %s" % (self.ords[cen], self.gender_stem,
self.to_ordinal(value - cen))
)
elif value < 1e18:
# Round down to the nearest 1e(3n)
# dec contains the following:
# [ 1e3, 1e6): 1e3
# [ 1e6, 1e9): 1e6
# [ 1e9, 1e12): 1e9
# [1e12, 1e15): 1e12
# [1e15, 1e18): 1e15
dec = 1000 ** int(math.log(int(value), 1000))
# Split the parts before and after the word for 'dec'
# eg (12, 345) = divmod(12_345, 1_000)
high_part, low_part = divmod(value, dec)
cardinal = self.to_cardinal(high_part) if high_part != 1 else ""
text = (
"%s%s%s %s" % (cardinal, self.ords[dec], self.gender_stem,
self.to_ordinal(low_part))
)
else:
text = self.to_cardinal(value) text = self.to_cardinal(value)
return text.strip() return text.strip()

1
tests/test_es.py
View File

@@ -95,6 +95,7 @@ TEST_CASES_ORDINAL = (
(28, 'vigésimo octavo'), (28, 'vigésimo octavo'),
(100, 'centésimo'), (100, 'centésimo'),
(1000, 'milésimo'), (1000, 'milésimo'),
(12345, 'docemilésimo tricentésimo quadragésimo quinto'),
(1000000, 'millonésimo'), (1000000, 'millonésimo'),
(1000000000000000, 'cuadrillonésimo'), (1000000000000000, 'cuadrillonésimo'),
(1000000000000000000, 'un trillón') # over 1e18 is not supported (1000000000000000000, 'un trillón') # over 1e18 is not supported