From 7277751b38a7b8cdb8b0d219d69b26f29e22674b Mon Sep 17 00:00:00 2001 From: Francisco Flores Date: Thu, 10 Oct 2024 12:28:06 -0600 Subject: [PATCH 1/4] solving conflict in __init__.py --- num2words/__init__.py | 3 ++- num2words/lang_ES_HN.py | 32 +++++++++++++++++++++++++++++++ tests/test_es_hn.py | 42 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 76 insertions(+), 1 deletion(-) create mode 100644 num2words/lang_ES_HN.py create mode 100644 tests/test_es_hn.py diff --git a/num2words/__init__.py b/num2words/__init__.py index c513d853..9935c4e9 100644 --- a/num2words/__init__.py +++ b/num2words/__init__.py @@ -25,7 +25,7 @@ lang_IT, lang_JA, lang_KN, lang_KO, lang_KZ, lang_LT, lang_LV, lang_NL, lang_NO, lang_PL, lang_PT, lang_PT_BR, lang_RO, lang_RU, lang_SK, lang_SL, lang_SR, lang_SV, lang_TE, lang_TET, - lang_TG, lang_TH, lang_TR, lang_UK, lang_VI) + lang_TG, lang_TH, lang_TR, lang_UK, lang_VI, lang_ES_HN) CONVERTER_CLASSES = { 'am': lang_AM.Num2Word_AM(), @@ -51,6 +51,7 @@ 'es_CO': lang_ES_CO.Num2Word_ES_CO(), 'es_CR': lang_ES_CR.Num2Word_ES_CR(), 'es_GT': lang_ES_GT.Num2Word_ES_GT(), + 'es_HN': lang_ES_HN.Num2Word_ES_HN(), 'es_NI': lang_ES_NI.Num2Word_ES_NI(), 'es_VE': lang_ES_VE.Num2Word_ES_VE(), 'id': lang_ID.Num2Word_ID(), diff --git a/num2words/lang_ES_HN.py b/num2words/lang_ES_HN.py new file mode 100644 index 00000000..c2d00701 --- /dev/null +++ b/num2words/lang_ES_HN.py @@ -0,0 +1,32 @@ +# 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 print_function, unicode_literals + +from .lang_ES import Num2Word_ES + + +class Num2Word_ES_HN(Num2Word_ES): + CURRENCY_FORMS = { + 'HNL': (('lempira', 'lempiras'), ('centavo', 'centavos')), + } + + def to_currency(self, val, currency='HNL', cents=True, separator=' con', + adjective=False): + result = super(Num2Word_ES, self).to_currency( + val, currency=currency, cents=cents, separator=separator, + adjective=adjective) + return result.replace("uno", "un") diff --git a/tests/test_es_hn.py b/tests/test_es_hn.py new file mode 100644 index 00000000..ca1e890e --- /dev/null +++ b/tests/test_es_hn.py @@ -0,0 +1,42 @@ +# -*- coding: 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 + +from num2words import num2words + +from . import test_es + +TEST_HNL = ( + (1.0, 'un lempira con cero centavos'), + (2.0, 'dos lempiras con cero centavos'), + (8.5, 'ocho lempiras con cincuenta centavos'), + (12.256, 'doce lempiras con veintiséis centavos'), + (25.6, 'veinticinco lempiras con sesenta centavos'), + (96.55, 'noventa y seis lempiras con cincuenta y cinco centavos'), + (100.00, 'cien lempiras con cero centavos'), +) + + +class Num2WordsHNHNLTest(test_es.Num2WordsESTest): + + def test_currency(self): + for test in TEST_HNL: + self.assertEqual( + num2words(test[0], lang='es_HN', to='currency'), + test[1] + ) From c3a0090f827333970628a4be832d50b354414f72 Mon Sep 17 00:00:00 2001 From: Francisco Flores Date: Thu, 10 Oct 2024 12:32:35 -0600 Subject: [PATCH 2/4] removing python 3.8 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 68330d4c..c1369d3d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,7 +8,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: [3.7, 3.8, 3.9, '3.10', '3.11', '3.12'] + python-version: [3.7, 3.9, '3.10', '3.11', '3.12'] steps: - uses: actions/checkout@v2 From 553c272cf53920fc4ec95be4e37b82816c8fd48d Mon Sep 17 00:00:00 2001 From: Francisco Flores Date: Thu, 10 Oct 2024 12:33:47 -0600 Subject: [PATCH 3/4] fixing python versions --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c1369d3d..d8752494 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,7 +8,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: [3.7, 3.9, '3.10', '3.11', '3.12'] + python-version: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12'] steps: - uses: actions/checkout@v2 From b530baed4a92ce54948539ae403539cab6d2f7f1 Mon Sep 17 00:00:00 2001 From: Francisco Flores Date: Thu, 10 Oct 2024 12:45:21 -0600 Subject: [PATCH 4/4] fixing python versions --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d8752494..68330d4c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,7 +8,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12'] + python-version: [3.7, 3.8, 3.9, '3.10', '3.11', '3.12'] steps: - uses: actions/checkout@v2