Skip to content

Commit

Permalink
Merge branch 'master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
mrodriguezg1991 authored Jan 6, 2025
2 parents 5c90a1f + beca211 commit a8a4ff6
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.8, 3.9, '3.10', '3.11', '3.12', '3.13']

steps:
- uses: actions/checkout@v2
Expand Down
8 changes: 6 additions & 2 deletions num2words/lang_EU.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,9 @@ class Num2Word_EU(Num2Word_Base):
'HUF': (('forint', 'forint'), ('fillér', 'fillér')),
'ISK': (('króna', 'krónur'), ('aur', 'aurar')),
'UZS': (('sum', 'sums'), ('tiyin', 'tiyins')),
'SAR': (('saudi riyal', 'saudi riyals'), ('halalah', 'halalas'))
'SAR': (('saudi riyal', 'saudi riyals'), ('halalah', 'halalas')),
'JPY': (('yen', 'yen'), ('sen', 'sen')),
'KRW': (('won', 'won'), ('jeon', 'jeon')),

}

Expand All @@ -65,7 +67,9 @@ class Num2Word_EU(Num2Word_Base):
'HUF': 'Hungarian',
'ISK': 'íslenskar',
'UZS': 'Uzbekistan',
'SAR': 'Saudi'
'SAR': 'Saudi',
'JPY': 'Japanese',
'KRW': 'Korean',
}

GIGA_SUFFIX = "illiard"
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@
'Intended Audience :: Developers',
'License :: OSI Approved :: GNU Library or Lesser General Public License '
'(LGPL)',
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9',
'Programming Language :: Python :: 3.10',
'Programming Language :: Python :: 3.11',
'Programming Language :: Python :: 3.12',
'Programming Language :: Python :: 3.13',
'Topic :: Software Development :: Internationalization',
'Topic :: Software Development :: Libraries :: Python Modules',
'Topic :: Software Development :: Localization',
Expand Down
12 changes: 12 additions & 0 deletions tests/test_en.py
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,18 @@ def test_to_currency(self):
"two thousand sums and zero tiyins"
)

self.assertEqual(
num2words('2000.00', lang='en', to='currency', separator=' and',
cents=True, currency='JPY'),
"two thousand yen and zero sen"
)

self.assertEqual(
num2words('2000.00', lang='en', to='currency', separator=' and',
cents=True, currency='KRW'),
"two thousand won and zero jeon"
)

def test_to_year(self):
# issue 141
# "e2 e2"
Expand Down
4 changes: 2 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
[tox]
envlist = py37,py38,py39,py310,py311,py312,flake8,isort
envlist = py38,py39,py310,py311,py312,py313,flake8,isort

[gh-actions]
python =
3.7: py37
3.8: py38
3.9: py39
3.10: isort, flake8, py310
3.11: py311
3.12: py312
3.13: py313


[testenv]
Expand Down

0 comments on commit a8a4ff6

Please sign in to comment.