mirror of
https://github.com/bblaz/num2words.git
synced 2025-12-06 06:42:25 +00:00
Merge pull request #67 from 10537/master
[IMP]Adds es_CO and es_VE support.
This commit is contained in:
@@ -33,8 +33,11 @@ from . import lang_DK
|
||||
from . import lang_PT_BR
|
||||
from . import lang_HE
|
||||
from . import lang_IT
|
||||
from . import lang_ES_VE
|
||||
from . import lang_ES_CO
|
||||
from . import lang_VN
|
||||
|
||||
|
||||
CONVERTER_CLASSES = {
|
||||
'en': lang_EN.Num2Word_EN(),
|
||||
'en_GB': lang_EN_GB.Num2Word_EN_GB(),
|
||||
@@ -43,6 +46,8 @@ CONVERTER_CLASSES = {
|
||||
'fr_CH': lang_FR_CH.Num2Word_FR_CH(),
|
||||
'de': lang_DE.Num2Word_DE(),
|
||||
'es': lang_ES.Num2Word_ES(),
|
||||
'es_CO': lang_ES_CO.Num2Word_ES_CO(),
|
||||
'es_VE': lang_ES_VE.Num2Word_ES_VE(),
|
||||
'id': lang_ID.Num2Word_ID(),
|
||||
'lt': lang_LT.Num2Word_LT(),
|
||||
'lv': lang_LV.Num2Word_LV(),
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
#encoding: UTF-8
|
||||
# encoding: UTF-8
|
||||
|
||||
# Copyright (c) 2003, Taro Ogawa. All Rights Reserved.
|
||||
# Copyright (c) 2013, Savoir-faire Linux inc. All Rights Reserved.
|
||||
@@ -19,16 +19,16 @@
|
||||
from __future__ import unicode_literals, print_function
|
||||
from .lang_EU import Num2Word_EU
|
||||
|
||||
|
||||
class Num2Word_ES(Num2Word_EU):
|
||||
|
||||
#//CHECK: Is this sufficient??
|
||||
# //CHECK: Is this sufficient??
|
||||
def set_high_numwords(self, high):
|
||||
max = 3 + 6*len(high)
|
||||
|
||||
for word, n in zip(high, range(max, 3, -6)):
|
||||
self.cards[10**(n-3)] = word + "illón"
|
||||
|
||||
|
||||
def setup(self):
|
||||
lows = ["cuatr", "tr", "b", "m"]
|
||||
self.high_numwords = self.gen_high_numwords([], [], lows)
|
||||
@@ -81,7 +81,6 @@ class Num2Word_ES(Num2Word_EU):
|
||||
1e12 : "trillonésim",
|
||||
1e15 : "cuadrillonésim" }
|
||||
|
||||
|
||||
def merge(self, curr, next):
|
||||
ctext, cnum, ntext, nnum = curr + next
|
||||
|
||||
@@ -94,8 +93,8 @@ class Num2Word_ES(Num2Word_EU):
|
||||
|
||||
if nnum < cnum:
|
||||
if cnum < 100:
|
||||
return ("%s y %s"%(ctext, ntext), cnum + nnum)
|
||||
return ("%s %s"%(ctext, ntext), cnum + nnum)
|
||||
return "%s y %s"%(ctext, ntext), cnum + nnum
|
||||
return "%s %s"%(ctext, ntext), cnum + nnum
|
||||
elif (not nnum % 1000000) and cnum > 1:
|
||||
ntext = ntext[:-3] + "lones"
|
||||
|
||||
@@ -113,7 +112,6 @@ class Num2Word_ES(Num2Word_EU):
|
||||
|
||||
return (ctext + ntext, cnum * nnum)
|
||||
|
||||
|
||||
def to_ordinal(self, value):
|
||||
self.verify_ordinal(value)
|
||||
text = ""
|
||||
@@ -125,10 +123,10 @@ class Num2Word_ES(Num2Word_EU):
|
||||
elif value <= 12:
|
||||
text = "%s%s%s" % (self.ords[10], self.gender_stem, self.to_ordinal(value - 10))
|
||||
elif value <= 100:
|
||||
dec = (value / 10) * 10
|
||||
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
|
||||
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:
|
||||
@@ -151,7 +149,6 @@ class Num2Word_ES(Num2Word_EU):
|
||||
self.verify_ordinal(value)
|
||||
return "%s%s" % (value, "º" if self.gender_stem == 'o' else "ª")
|
||||
|
||||
|
||||
def to_currency(self, val, longval=True, old=False):
|
||||
if old:
|
||||
return self.to_splitnum(val, hightxt="peso/s", lowtxt="peseta/s",
|
||||
@@ -165,11 +162,12 @@ to_card = n2w.to_cardinal
|
||||
to_ord = n2w.to_ordinal
|
||||
to_ordnum = n2w.to_ordinal_num
|
||||
|
||||
|
||||
def main():
|
||||
for val in [ 1, 11, 12, 21, 31, 33, 71, 80, 81, 91, 99, 100, 101, 102, 155,
|
||||
180, 300, 308, 832, 1000, 1001, 1061, 1100, 1500, 1701, 3000,
|
||||
8280, 8291, 150000, 500000, 1000000, 2000000, 2000001,
|
||||
-21212121211221211111, -2.121212, -1.0000100]:
|
||||
for val in [1, 11, 12, 21, 31, 33, 71, 80, 81, 91, 99, 100, 101, 102, 155,
|
||||
180, 300, 308, 832, 1000, 1001, 1061, 1100, 1500, 1701, 3000,
|
||||
8280, 8291, 150000, 500000, 1000000, 2000000, 2000001,
|
||||
-21212121211221211111, -2.121212, -1.0000100]:
|
||||
n2w.test(val)
|
||||
|
||||
n2w.test(1325325436067876801768700107601001012212132143210473207540327057320957032975032975093275093275093270957329057320975093272950730)
|
||||
|
||||
50
num2words/lang_ES_CO.py
Normal file
50
num2words/lang_ES_CO.py
Normal file
@@ -0,0 +1,50 @@
|
||||
# encoding: UTF-8
|
||||
|
||||
# Copyright (c) 2003, Taro Ogawa. All Rights Reserved.
|
||||
# Copyright (c) 2013, 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, print_function
|
||||
from .lang_ES import Num2Word_ES
|
||||
|
||||
|
||||
class Num2Word_ES_CO(Num2Word_ES):
|
||||
|
||||
def to_currency(self, val, longval=True, old=False):
|
||||
return self.to_splitnum(val, hightxt="peso/s", lowtxt="peso/s",
|
||||
divisor=1000, jointxt="y", longval=longval)
|
||||
|
||||
|
||||
n2w = Num2Word_ES_CO()
|
||||
to_card = n2w.to_cardinal
|
||||
to_ord = n2w.to_ordinal
|
||||
to_ordnum = n2w.to_ordinal_num
|
||||
|
||||
|
||||
def main():
|
||||
for val in [1, 11, 12, 21, 31, 33, 71, 80, 81, 91, 99, 100, 101, 102, 155,
|
||||
180, 300, 308, 832, 1000, 1001, 1061, 1100, 1500, 1701, 3000,
|
||||
8280, 8291, 150000, 500000, 1000000, 2000000, 2000001,
|
||||
-21212121211221211111, -2.121212, -1.0000100]:
|
||||
n2w.test(val)
|
||||
|
||||
n2w.test(1325325436067876801768700107601001012212132143210473207540327057320957032975032975093275093275093270957329057320975093272950730)
|
||||
print(n2w.to_currency(1222))
|
||||
print(n2w.to_currency(1222, old=True))
|
||||
print(n2w.to_year(1222))
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
49
num2words/lang_ES_VE.py
Normal file
49
num2words/lang_ES_VE.py
Normal file
@@ -0,0 +1,49 @@
|
||||
# encoding: UTF-8
|
||||
|
||||
# Copyright (c) 2003, Taro Ogawa. All Rights Reserved.
|
||||
# Copyright (c) 2013, 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, print_function
|
||||
from .lang_ES import Num2Word_ES
|
||||
|
||||
|
||||
class Num2Word_ES_VE(Num2Word_ES):
|
||||
|
||||
def to_currency(self, val, longval=True, old=False):
|
||||
return self.to_splitnum(val, hightxt="bolívar/es Fuerte/s", lowtxt="bolívar/es fuerte/s",
|
||||
divisor=1000, jointxt="y", longval=longval)
|
||||
|
||||
n2w = Num2Word_ES_VE()
|
||||
to_card = n2w.to_cardinal
|
||||
to_ord = n2w.to_ordinal
|
||||
to_ordnum = n2w.to_ordinal_num
|
||||
|
||||
|
||||
def main():
|
||||
for val in [1, 11, 12, 21, 31, 33, 71, 80, 81, 91, 99, 100, 101, 102, 155,
|
||||
180, 300, 308, 832, 1000, 1001, 1061, 1100, 1500, 1701, 3000,
|
||||
8280, 8291, 150000, 500000, 1000000, 2000000, 2000001,
|
||||
-21212121211221211111, -2.121212, -1.0000100]:
|
||||
n2w.test(val)
|
||||
|
||||
n2w.test(1325325436067876801768700107601001012212132143210473207540327057320957032975032975093275093275093270957329057320975093272950730)
|
||||
print(n2w.to_currency(1222))
|
||||
print(n2w.to_currency(1222, old=True))
|
||||
print(n2w.to_year(1222))
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
95
tests/test_es.py
Normal file
95
tests/test_es.py
Normal file
@@ -0,0 +1,95 @@
|
||||
# encoding: UTF-8
|
||||
# Copyright (c) 2013, 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
|
||||
|
||||
TEST_CASES_CARDINAL = (
|
||||
(1, 'uno'),
|
||||
(2, 'dos'),
|
||||
(3, 'tres'),
|
||||
(11, 'once'),
|
||||
(12, 'doce'),
|
||||
(16, 'dieciseis'),
|
||||
(19, 'diecinueve'),
|
||||
(20, 'veinte'),
|
||||
(21, 'veintiuno'),
|
||||
(26, 'veintiséis'),
|
||||
(28, 'veintiocho'),
|
||||
(30, 'treinta'),
|
||||
(31, 'treinta y uno'),
|
||||
(40, 'cuarenta'),
|
||||
(44, 'cuarenta y cuatro'),
|
||||
(50, 'cincuenta'),
|
||||
(55, 'cincuenta y cinco'),
|
||||
(60, 'sesenta'),
|
||||
(67, 'sesenta y siete'),
|
||||
(70, 'setenta'),
|
||||
(79, 'setenta y nueve'),
|
||||
(100, 'cien'),
|
||||
(101, 'ciento uno'),
|
||||
(199, 'ciento noventa y nueve'),
|
||||
(203, 'doscientos tres'),
|
||||
(287, 'doscientos ochenta y siete'),
|
||||
(300, 'trescientos'),
|
||||
(356, 'trescientos cincuenta y seis'),
|
||||
(400, 'cuatrocientos'),
|
||||
(434, 'cuatrocientos treinta y cuatro'),
|
||||
(578, 'quinientos setenta y ocho'),
|
||||
(689, 'seiscientos ochenta y nueve'),
|
||||
(729, 'setecientos veintinueve'),
|
||||
(894, 'ochocientos noventa y cuatro'),
|
||||
(999, 'novecientos noventa y nueve'),
|
||||
(1000, 'mil'),
|
||||
(1001, 'mil uno'),
|
||||
(1097, 'mil noventa y siete'),
|
||||
(1104, 'mil ciento cuatro'),
|
||||
(1243, 'mil doscientos cuarenta y tres'),
|
||||
(2385, 'dos mil trescientos ochenta y cinco'),
|
||||
(3766, 'tres mil setecientos sesenta y seis'),
|
||||
(4196, 'cuatro mil ciento noventa y seis'),
|
||||
(5846, 'cinco mil ochocientos cuarenta y seis'),
|
||||
(6459, 'seis mil cuatrocientos cincuenta y nueve'),
|
||||
(7232, 'siete mil doscientos treinta y dos'),
|
||||
(8569, 'ocho mil quinientos sesenta y nueve'),
|
||||
(9539, 'nueve mil quinientos treinta y nueve'),
|
||||
(1000000, 'un millón'),
|
||||
(1000001, 'un millón uno'),
|
||||
)
|
||||
|
||||
TEST_CASES_ORDINAL = (
|
||||
(1, 'primero'),
|
||||
(8, 'octavo'),
|
||||
(12, 'décimosegundo'),
|
||||
(14, 'décimo cuarto'),
|
||||
(28, 'vigésimo octavo'),
|
||||
(100, 'centésimo'),
|
||||
)
|
||||
|
||||
class Num2WordsESTest(TestCase):
|
||||
|
||||
def test_number(self):
|
||||
for test in TEST_CASES_CARDINAL:
|
||||
self.assertEqual(num2words(test[0], lang='es'), test[1])
|
||||
|
||||
def test_ordinal(self):
|
||||
for test in TEST_CASES_ORDINAL:
|
||||
self.assertEqual(
|
||||
num2words(test[0], lang='es', ordinal=True),
|
||||
test[1]
|
||||
)
|
||||
34
tests/test_es_co.py
Normal file
34
tests/test_es_co.py
Normal file
@@ -0,0 +1,34 @@
|
||||
# encoding: UTF-8
|
||||
# Copyright (c) 2013, 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 num2words import num2words
|
||||
from . import test_es
|
||||
|
||||
|
||||
class Num2WordsESCOTest(test_es.Num2WordsESTest):
|
||||
|
||||
def test_number(self):
|
||||
for test in test_es.TEST_CASES_CARDINAL:
|
||||
self.assertEqual(num2words(test[0], lang='es_CO'), test[1])
|
||||
|
||||
def test_ordinal(self):
|
||||
for test in test_es.TEST_CASES_ORDINAL:
|
||||
self.assertEqual(
|
||||
num2words(test[0], lang='es_CO', ordinal=True),
|
||||
test[1]
|
||||
)
|
||||
34
tests/test_es_ve.py
Normal file
34
tests/test_es_ve.py
Normal file
@@ -0,0 +1,34 @@
|
||||
# encoding: UTF-8
|
||||
# Copyright (c) 2013, 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 num2words import num2words
|
||||
from . import test_es
|
||||
|
||||
|
||||
class Num2WordsESVETest(test_es.Num2WordsESTest):
|
||||
|
||||
def test_number(self):
|
||||
for test in test_es.TEST_CASES_CARDINAL:
|
||||
self.assertEqual(num2words(test[0], lang='es_VE'), test[1])
|
||||
|
||||
def test_ordinal(self):
|
||||
for test in test_es.TEST_CASES_ORDINAL:
|
||||
self.assertEqual(
|
||||
num2words(test[0], lang='es_VE', ordinal=True),
|
||||
test[1]
|
||||
)
|
||||
Reference in New Issue
Block a user