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

Updates accents on céntimos in Spanish (#240)

Browse Source 
* Updates accents on céntimos in Spanish

* Update test_es.py

* Update test_es.py

* fix tests

* fix encoding

* Update tox.ini

* Update test_cli.py

* Update test_cli.py

* Update test_cli.py

* Update lang_AR.py

flake-8 compliant

* Update test_cli.py

flake8 compliant

* Update test_cli.py

* Update test_cli.py
This commit is contained in:
Alvaro
2019-02-12 19:59:46 +01:00
committed by Ernesto Rodriguez Ortiz
parent aa9b882fe6
commit eef5b03593
5 changed files with 51 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
num2words/lang_AR.py
View File

@@ -188,11 +188,11 @@ class Num2Word_AR(object):
ones = tens % 10
tens = (tens / 10) - 2
if ones > 0:
if ret_val is not "" and tens < 4:
if ret_val != "" and tens < 4:
ret_val += " و "
ret_val += self.digit_feminine_status(ones, group_level)
if ret_val is not "" and ones != 0:
if ret_val != "" and ones != 0:
ret_val += " و "
ret_val += self.arabicTens[int(tens)]
@@ -226,9 +226,9 @@ class Num2Word_AR(object):
self.process_arabic_group(number_to_process,
group,
Decimal(floor(temp_number)))
if group_description is not '':
if group_description != '':
if group > 0:
if ret_val is not "":
if ret_val != "":
ret_val = "{} و {}".format("", ret_val)
if number_to_process != 2:
if number_to_process % 100 != 1:
@@ -236,7 +236,7 @@ class Num2Word_AR(object):
ret_val = "{} {}".format(
self.arabicPluralGroups[group], ret_val)
else:
if ret_val is not "":
if ret_val != "":
ret_val = "{} {}".format(
self.arabicAppendedGroup[group],
ret_val)
@@ -250,7 +250,7 @@ class Num2Word_AR(object):
ret_val = "{} {}".format(group_description, ret_val)
group += 1
formatted_number = ""
if self.arabicPrefixText is not "":
if self.arabicPrefixText != "":
formatted_number += "{} ".format(self.arabicPrefixText)
formatted_number += ret_val
if self.integer_value != 0:
@@ -288,7 +288,7 @@ class Num2Word_AR(object):
elif 11 <= remaining100 <= 99:
formatted_number += self.currency_subunit[3]
if self.arabicSuffixText is not "":
if self.arabicSuffixText != "":
formatted_number += " {}".format(self.arabicSuffixText)
return formatted_number
@@ -299,10 +299,10 @@ class Num2Word_AR(object):
return number
def set_currency_prefer(self, currency):
if currency is 'EGP':
if currency == 'EGP':
self.currency_unit = CURRENCY_EGP[0]
self.currency_subunit = CURRENCY_EGP[1]
elif currency is 'KWD':
elif currency == 'KWD':
self.currency_unit = CURRENCY_KWD[0]
self.currency_subunit = CURRENCY_KWD[1]
else:

8
num2words/lang_ES.py
View File

@@ -22,10 +22,10 @@ from .lang_EU import Num2Word_EU
class Num2Word_ES(Num2Word_EU):
CURRENCY_FORMS = {
'EUR': (('euro', 'euros'), ('centimo', 'centimos')),
'ESP': (('peseta', 'pesetas'), ('centimo', 'centimos')),
'USD': (('dolar', 'dolares'), ('centavo', 'centavos')),
'PEN': (('sol', 'soles'), ('centimo', 'centimos')),
'EUR': (('euro', 'euros'), ('céntimo', 'céntimos')),
'ESP': (('peseta', 'pesetas'), ('céntimo', 'céntimos')),
'USD': (('dolar', 'dólares'), ('centavo', 'centavos')),
'PEN': (('sol', 'soles'), ('céntimo', 'céntimos')),
}
# //CHECK: Is this sufficient??