From 895af7dccfad73e51f8ea66b6b7577279cc51f75 Mon Sep 17 00:00:00 2001 From: Peter Nordstrom Date: Mon, 7 Dec 2020 14:24:51 +0100 Subject: [PATCH 1/6] added swedish language including test cases --- num2words/__init__.py | 3 +- num2words/lang_SV.py | 113 ++++++++++++++++++++++++++++++++++++++++++ tests/test_sv.py | 46 +++++++++++++++++ 3 files changed, 161 insertions(+), 1 deletion(-) create mode 100644 num2words/lang_SV.py create mode 100644 tests/test_sv.py diff --git a/num2words/__init__.py b/num2words/__init__.py index 931d28a..6d40774 100644 --- a/num2words/__init__.py +++ b/num2words/__init__.py @@ -22,7 +22,7 @@ from . import (lang_AR, lang_CZ, lang_DE, lang_DK, lang_EN, lang_EN_IN, lang_FR_BE, lang_FR_CH, lang_FR_DZ, lang_HE, lang_HU, lang_ID, 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_SL, lang_SR, lang_TE, lang_TH, lang_TR, lang_UK, + lang_RU, lang_SL, lang_SR, lang_SV, lang_TE, lang_TH, lang_TR, lang_UK, lang_VI) CONVERTER_CLASSES = { @@ -52,6 +52,7 @@ CONVERTER_CLASSES = { 'ru': lang_RU.Num2Word_RU(), 'sl': lang_SL.Num2Word_SL(), 'sr': lang_SR.Num2Word_SR(), + 'sv': lang_SV.Num2Word_SV(), 'no': lang_NO.Num2Word_NO(), 'dk': lang_DK.Num2Word_DK(), 'pt': lang_PT.Num2Word_PT(), diff --git a/num2words/lang_SV.py b/num2words/lang_SV.py new file mode 100644 index 0000000..215c196 --- /dev/null +++ b/num2words/lang_SV.py @@ -0,0 +1,113 @@ +# -*- 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 division, print_function, unicode_literals + +from . import lang_EU + + +class Num2Word_SV(lang_EU.Num2Word_EU): + GIGA_SUFFIX = "iljarder" + MEGA_SUFFIX = "iljoner" + + def set_high_numwords(self, high): + cap = 3 + 6 * len(high) + + for word, n in zip(high, range(cap, 3, -6)): + if self.GIGA_SUFFIX: + self.cards[10 ** n] = word + self.GIGA_SUFFIX + + if self.MEGA_SUFFIX: + self.cards[10 ** (n - 3)] = word + self.MEGA_SUFFIX + + def setup(self): + super(Num2Word_SV, self).setup() + + self.negword = "minus " + self.pointword = "komma" + self.exclude_title = ["och", "komma", "minus"] + + self.mid_numwords = [(1000, "tusen"), (100, "hundra"), + (90, "nittio"), (80, "\åttio"), (70, "sjuttio"), + (60, "sextio"), (50, "femtio"), (40, "förtio"), + (30, "trettio")] + self.low_numwords = ["tjugo", "nitton", "arton", "sjutton", + "sexton", "femton", "fjorton", "tretton", + "tolv", "elva", "tio", "nio", "åtta", + "sju", "sex", "fem", "fyra", "tre", "två", + "ett", "noll"] + self.ords = {"noll": "nollte", + "ett": "första", + "två": "andra", + "tre": "tredje", + "fyra": "fjärde", + "fem": "femte", + "sex": "sjätte", + "sju": "sjunde", + "åtta": "åttonde", + "nio": "nionde", + "tio": "tionde", + "elva": "elfte", + "tolv": "tolfte", + "tjugo": "tjugonde"} + + def merge(self, lpair, rpair): + ltext, lnum = lpair + rtext, rnum = rpair + if lnum == 1 and rnum < 100: + return (rtext, rnum) + elif 100 > lnum > rnum: + return ("%s%s" % (ltext, rtext), lnum + rnum) + elif lnum >= 100 > rnum: + return ("%s%s" % (ltext, rtext), lnum + rnum) + elif rnum >= 1000000 and lnum == 1: + return ("%s %s" % ('en', rtext[:-2]), lnum + rnum) + elif rnum >= 1000000 and lnum > 1: + return ("%s %s" % (ltext, rtext), lnum + rnum) + elif rnum > lnum: + return ("%s%s" % (ltext, rtext), lnum * rnum) + return ("%s %s" % (ltext, rtext), lnum + rnum) + + def to_ordinal(self, value): + self.verify_ordinal(value) + outwords = self.to_cardinal(value).split(" ") + lastwords = outwords[-1].split("-") + lastword = lastwords[-1].lower() + try: + lastword = self.ords[lastword] + except KeyError: + if lastword[-2:] == "tio": + lastword = lastword + "onde" + else: + lastword += "de" + lastwords[-1] = self.title(lastword) + outwords[-1] = "".join(lastwords) + return " ".join(outwords) + + def to_ordinal_num(self, value): + self.verify_ordinal(value) + return "%s%s" % (value, self.to_ordinal(value)[-2:]) + + def to_year(self, val, longval=True): + if not (val // 100) % 10: + return self.to_cardinal(val) + return self.to_splitnum(val, hightxt="hundra", jointxt="och", + longval=longval) + + def to_currency(self, val, longval=True): + return self.to_splitnum(val, hightxt="krone/r", lowtxt="öre/n", + jointxt="och", longval=longval, cents=True) diff --git a/tests/test_sv.py b/tests/test_sv.py new file mode 100644 index 0000000..fa3d48d --- /dev/null +++ b/tests/test_sv.py @@ -0,0 +1,46 @@ +# 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 unittest import TestCase + +from num2words import num2words + + +class Num2WordsSVTest(TestCase): + def test_ordinal(self): + pass + self.assertEqual(num2words(1, to="ordinal", lang="sv"), "första") + self.assertEqual(num2words(5, to="ordinal", lang="sv"), "femte") + self.assertEqual(num2words(32, to="ordinal", lang="sv"), "trettioandra") + + + def test_cardinal(self): + self.assertEqual(num2words(0, to="cardinal", lang="sv"), "noll") + self.assertEqual(num2words(1, to="cardinal", lang="sv"), "ett") + self.assertEqual(num2words(2, to="cardinal", lang="sv"), "två") + self.assertEqual(num2words(5, to="cardinal", lang="sv"), "fem") + self.assertEqual(num2words(8, to="cardinal", lang="sv"), "åtta") + self.assertEqual(num2words(18, to="cardinal", lang="sv"), "arton") + self.assertEqual(num2words(45, to="cardinal", lang="sv"), "förtiofem") + self.assertEqual(num2words(1245, to="cardinal", lang="sv"), "etttusen tvåhundraförtiofem") + self.assertEqual(num2words(4235, to="cardinal", lang="sv"), "fyratusen tvåhundratrettiofem") + self.assertEqual(num2words(1004135, to="cardinal", lang="sv"), "en miljon fyratusen etthundratrettiofem") + self.assertEqual(num2words(14004235000, to="cardinal", lang="sv"), "fjorton miljarder fyra miljoner tvåhundratrettiofemtusen") + self.assertEqual(num2words(14004235, to="cardinal", lang="sv"), "fjorton miljoner fyratusen tvåhundratrettiofem") + self.assertEqual(num2words(1.25, to="cardinal", lang="sv"), "ett komma två fem") From e88f3d75e35bda8a5d7386fe231c72290258d202 Mon Sep 17 00:00:00 2001 From: Peter Nordstrom Date: Mon, 7 Dec 2020 16:24:58 +0100 Subject: [PATCH 2/6] added correct ordinal handling and more test cases --- num2words/lang_SV.py | 22 +++++++++++++--------- tests/test_sv.py | 6 +++--- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/num2words/lang_SV.py b/num2words/lang_SV.py index 215c196..12ba9ae 100644 --- a/num2words/lang_SV.py +++ b/num2words/lang_SV.py @@ -85,17 +85,21 @@ class Num2Word_SV(lang_EU.Num2Word_EU): def to_ordinal(self, value): self.verify_ordinal(value) outwords = self.to_cardinal(value).split(" ") - lastwords = outwords[-1].split("-") - lastword = lastwords[-1].lower() + lastword = outwords[-1] + # lastword = lastwords[-1].lower() + ending_length = 0 try: - lastword = self.ords[lastword] - except KeyError: - if lastword[-2:] == "tio": - lastword = lastword + "onde" - else: + lastword_ending = self.ords[lastword[-4:]] + ending_length = 4 + except: + try: + lastword_ending = self.ords[lastword[-3:]] + ending_length = 3 + except KeyError: lastword += "de" - lastwords[-1] = self.title(lastword) - outwords[-1] = "".join(lastwords) + lastword_first_part = self.title(lastword)[:-ending_length] + lastword_correct = lastword_first_part + lastword_ending + outwords[-1] = lastword_correct return " ".join(outwords) def to_ordinal_num(self, value): diff --git a/tests/test_sv.py b/tests/test_sv.py index fa3d48d..e4ce466 100644 --- a/tests/test_sv.py +++ b/tests/test_sv.py @@ -24,11 +24,11 @@ from num2words import num2words class Num2WordsSVTest(TestCase): def test_ordinal(self): - pass + self.assertEqual(num2words(1435, to="ordinal", lang="sv"), "etttusen fyrahundratrettiofemte") + self.assertEqual(num2words(32, to="ordinal", lang="sv"), "trettioandra") self.assertEqual(num2words(1, to="ordinal", lang="sv"), "första") self.assertEqual(num2words(5, to="ordinal", lang="sv"), "femte") - self.assertEqual(num2words(32, to="ordinal", lang="sv"), "trettioandra") - + self.assertEqual(num2words(10, to="ordinal", lang="sv"), "tionde") def test_cardinal(self): self.assertEqual(num2words(0, to="cardinal", lang="sv"), "noll") From 3b52c5f92411db6ddd4ef91e8371c2eff25767db Mon Sep 17 00:00:00 2001 From: Peter Nordstrom Date: Mon, 25 Jan 2021 14:30:43 +0100 Subject: [PATCH 3/6] updated test case to increase coverage. raised NotImplementedError for options not implemented. --- num2words/lang_SV.py | 20 ++++++++++---------- tests/test_sv.py | 15 +++++++++++++++ 2 files changed, 25 insertions(+), 10 deletions(-) diff --git a/num2words/lang_SV.py b/num2words/lang_SV.py index 12ba9ae..34a8827 100644 --- a/num2words/lang_SV.py +++ b/num2words/lang_SV.py @@ -96,22 +96,22 @@ class Num2Word_SV(lang_EU.Num2Word_EU): lastword_ending = self.ords[lastword[-3:]] ending_length = 3 except KeyError: - lastword += "de" - lastword_first_part = self.title(lastword)[:-ending_length] + # lastword += "de" + lastword_ending = "de" + if lastword_ending == 'de': + lastword_first_part = self.title(lastword)[:] + else: + lastword_first_part = self.title(lastword)[:-ending_length] lastword_correct = lastword_first_part + lastword_ending outwords[-1] = lastword_correct return " ".join(outwords) def to_ordinal_num(self, value): - self.verify_ordinal(value) - return "%s%s" % (value, self.to_ordinal(value)[-2:]) + raise NotImplementedError("'ordinal_num' is not implemented for swedish language") def to_year(self, val, longval=True): - if not (val // 100) % 10: - return self.to_cardinal(val) - return self.to_splitnum(val, hightxt="hundra", jointxt="och", - longval=longval) + raise NotImplementedError("'year' is not implemented for swedish language") + def to_currency(self, val, longval=True): - return self.to_splitnum(val, hightxt="krone/r", lowtxt="öre/n", - jointxt="och", longval=longval, cents=True) + raise NotImplementedError("'currency' is not implemented for swedish language") diff --git a/tests/test_sv.py b/tests/test_sv.py index e4ce466..fffbd0e 100644 --- a/tests/test_sv.py +++ b/tests/test_sv.py @@ -24,6 +24,7 @@ from num2words import num2words class Num2WordsSVTest(TestCase): def test_ordinal(self): + self.assertEqual(num2words(14, to="ordinal", lang="sv"), "fjortonde") self.assertEqual(num2words(1435, to="ordinal", lang="sv"), "etttusen fyrahundratrettiofemte") self.assertEqual(num2words(32, to="ordinal", lang="sv"), "trettioandra") self.assertEqual(num2words(1, to="ordinal", lang="sv"), "första") @@ -44,3 +45,17 @@ class Num2WordsSVTest(TestCase): self.assertEqual(num2words(14004235000, to="cardinal", lang="sv"), "fjorton miljarder fyra miljoner tvåhundratrettiofemtusen") self.assertEqual(num2words(14004235, to="cardinal", lang="sv"), "fjorton miljoner fyratusen tvåhundratrettiofem") self.assertEqual(num2words(1.25, to="cardinal", lang="sv"), "ett komma två fem") + + def test_not_implemented_options(self): + + with self.assertRaises(NotImplementedError) as context: + num2words(1235, to="year", lang="sv") + self.assertTrue("'year' is not implemented for swedish language" in str(context.exception)) + + with self.assertRaises(NotImplementedError) as context: + num2words(1235, to="currency", lang="sv") + self.assertTrue("'currency' is not implemented for swedish language" in str(context.exception)) + + with self.assertRaises(NotImplementedError) as context: + num2words(1235, to="ordinal_num", lang="sv") + self.assertTrue("'ordinal_num' is not implemented for swedish language" in str(context.exception)) \ No newline at end of file From e6fb2b128b57eb2f8ec228fd198d0d4bdfe7dafd Mon Sep 17 00:00:00 2001 From: Peter Nordstrom Date: Tue, 26 Jan 2021 08:40:17 +0100 Subject: [PATCH 4/6] updated failing flake8 test --- num2words/__init__.py | 5 ++--- num2words/lang_SV.py | 4 +--- tests/test_sv.py | 37 +++++++++++++++++++++++-------------- 3 files changed, 26 insertions(+), 20 deletions(-) diff --git a/num2words/__init__.py b/num2words/__init__.py index 6d40774..a8c4737 100644 --- a/num2words/__init__.py +++ b/num2words/__init__.py @@ -22,8 +22,8 @@ from . import (lang_AR, lang_CZ, lang_DE, lang_DK, lang_EN, lang_EN_IN, lang_FR_BE, lang_FR_CH, lang_FR_DZ, lang_HE, lang_HU, lang_ID, 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_SL, lang_SR, lang_SV, lang_TE, lang_TH, lang_TR, lang_UK, - lang_VI) + lang_RU, lang_SL, lang_SR, lang_SV, lang_TE, lang_TH, lang_TR, + lang_UK, lang_VI) CONVERTER_CLASSES = { 'ar': lang_AR.Num2Word_AR(), @@ -68,7 +68,6 @@ CONVERTER_CLASSES = { 'hu': lang_HU.Num2Word_HU() } - CONVERTES_TYPES = ['cardinal', 'ordinal', 'ordinal_num', 'year', 'currency'] diff --git a/num2words/lang_SV.py b/num2words/lang_SV.py index 34a8827..afdd31e 100644 --- a/num2words/lang_SV.py +++ b/num2words/lang_SV.py @@ -86,17 +86,15 @@ class Num2Word_SV(lang_EU.Num2Word_EU): self.verify_ordinal(value) outwords = self.to_cardinal(value).split(" ") lastword = outwords[-1] - # lastword = lastwords[-1].lower() ending_length = 0 try: lastword_ending = self.ords[lastword[-4:]] ending_length = 4 - except: + except KeyError: try: lastword_ending = self.ords[lastword[-3:]] ending_length = 3 except KeyError: - # lastword += "de" lastword_ending = "de" if lastword_ending == 'de': lastword_first_part = self.title(lastword)[:] diff --git a/tests/test_sv.py b/tests/test_sv.py index fffbd0e..a780dae 100644 --- a/tests/test_sv.py +++ b/tests/test_sv.py @@ -25,8 +25,10 @@ from num2words import num2words class Num2WordsSVTest(TestCase): def test_ordinal(self): self.assertEqual(num2words(14, to="ordinal", lang="sv"), "fjortonde") - self.assertEqual(num2words(1435, to="ordinal", lang="sv"), "etttusen fyrahundratrettiofemte") - self.assertEqual(num2words(32, to="ordinal", lang="sv"), "trettioandra") + self.assertEqual(num2words(1435, to="ordinal", lang="sv"), + "etttusen fyrahundratrettiofemte") + self.assertEqual(num2words(32, to="ordinal", lang="sv"), + "trettioandra") self.assertEqual(num2words(1, to="ordinal", lang="sv"), "första") self.assertEqual(num2words(5, to="ordinal", lang="sv"), "femte") self.assertEqual(num2words(10, to="ordinal", lang="sv"), "tionde") @@ -34,28 +36,35 @@ class Num2WordsSVTest(TestCase): def test_cardinal(self): self.assertEqual(num2words(0, to="cardinal", lang="sv"), "noll") self.assertEqual(num2words(1, to="cardinal", lang="sv"), "ett") - self.assertEqual(num2words(2, to="cardinal", lang="sv"), "två") + self.assertEqual(num2words(3, to="cardinal", lang="sv"), "tre") self.assertEqual(num2words(5, to="cardinal", lang="sv"), "fem") - self.assertEqual(num2words(8, to="cardinal", lang="sv"), "åtta") self.assertEqual(num2words(18, to="cardinal", lang="sv"), "arton") self.assertEqual(num2words(45, to="cardinal", lang="sv"), "förtiofem") - self.assertEqual(num2words(1245, to="cardinal", lang="sv"), "etttusen tvåhundraförtiofem") - self.assertEqual(num2words(4235, to="cardinal", lang="sv"), "fyratusen tvåhundratrettiofem") - self.assertEqual(num2words(1004135, to="cardinal", lang="sv"), "en miljon fyratusen etthundratrettiofem") - self.assertEqual(num2words(14004235000, to="cardinal", lang="sv"), "fjorton miljarder fyra miljoner tvåhundratrettiofemtusen") - self.assertEqual(num2words(14004235, to="cardinal", lang="sv"), "fjorton miljoner fyratusen tvåhundratrettiofem") - self.assertEqual(num2words(1.25, to="cardinal", lang="sv"), "ett komma två fem") + self.assertEqual(num2words(1345, to="cardinal", lang="sv"), + "etttusen trehundraförtiofem") + self.assertEqual(num2words(4435, to="cardinal", lang="sv"), + "fyratusen fyrahundratrettiofem") + self.assertEqual(num2words(1004135, to="cardinal", lang="sv"), + "en miljon fyratusen etthundratrettiofem") + self.assertEqual(num2words(4335000, to="cardinal", lang="sv"), + "fyra miljoner trehundratrettiofemtusen") + self.assertEqual(num2words(14004535, to="cardinal", lang="sv"), + "fjorton miljoner fyratusen femhundratrettiofem") + self.assertEqual(num2words(1.5, to="cardinal", lang="sv"), + "ett komma fem") def test_not_implemented_options(self): - with self.assertRaises(NotImplementedError) as context: num2words(1235, to="year", lang="sv") - self.assertTrue("'year' is not implemented for swedish language" in str(context.exception)) + self.assertTrue("'year' is not implemented for swedish language" + in str(context.exception)) with self.assertRaises(NotImplementedError) as context: num2words(1235, to="currency", lang="sv") - self.assertTrue("'currency' is not implemented for swedish language" in str(context.exception)) + self.assertTrue("'currency' is not implemented for swedish language" + in str(context.exception)) with self.assertRaises(NotImplementedError) as context: num2words(1235, to="ordinal_num", lang="sv") - self.assertTrue("'ordinal_num' is not implemented for swedish language" in str(context.exception)) \ No newline at end of file + self.assertTrue("'ordinal_num' is not implemented for swedish language" + in str(context.exception)) From 219c2a5eb4efc77b8bfd7db918e64a4a21c11d02 Mon Sep 17 00:00:00 2001 From: Peter Nordstrom Date: Wed, 27 Jan 2021 08:09:27 +0100 Subject: [PATCH 5/6] split some lines that were too long for flake8 --- num2words/lang_SV.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/num2words/lang_SV.py b/num2words/lang_SV.py index afdd31e..4e32841 100644 --- a/num2words/lang_SV.py +++ b/num2words/lang_SV.py @@ -42,7 +42,7 @@ class Num2Word_SV(lang_EU.Num2Word_EU): self.exclude_title = ["och", "komma", "minus"] self.mid_numwords = [(1000, "tusen"), (100, "hundra"), - (90, "nittio"), (80, "\åttio"), (70, "sjuttio"), + (90, "nittio"), (80, "åttio"), (70, "sjuttio"), (60, "sextio"), (50, "femtio"), (40, "förtio"), (30, "trettio")] self.low_numwords = ["tjugo", "nitton", "arton", "sjutton", @@ -105,11 +105,13 @@ class Num2Word_SV(lang_EU.Num2Word_EU): return " ".join(outwords) def to_ordinal_num(self, value): - raise NotImplementedError("'ordinal_num' is not implemented for swedish language") + raise NotImplementedError( + "'ordinal_num' is not implemented for swedish language") def to_year(self, val, longval=True): - raise NotImplementedError("'year' is not implemented for swedish language") - + raise NotImplementedError( + "'year' is not implemented for swedish language") def to_currency(self, val, longval=True): - raise NotImplementedError("'currency' is not implemented for swedish language") + raise NotImplementedError( + "'currency' is not implemented for swedish language") From 94db9521b06f69bd5ba0f9f88fa131d0aa1f2f78 Mon Sep 17 00:00:00 2001 From: Peter Nordstrom Date: Thu, 28 Jan 2021 08:09:56 +0100 Subject: [PATCH 6/6] updated readme (added swedish) --- README.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/README.rst b/README.rst index c84b491..ab4cf65 100644 --- a/README.rst +++ b/README.rst @@ -107,6 +107,7 @@ Besides the numerical argument, there are two main optional arguments. * ``pt_BR`` (Portuguese - Brazilian) * ``sl`` (Slovene) * ``sr`` (Serbian) +* ``sv`` (Swedish) * ``ro`` (Romanian) * ``ru`` (Russian) * ``te`` (Telugu)