Merge branch 'master' into master

README.rst

@@ -67,6 +67,7 @@ cardinal one.
 * ``no`` (Norwegian)
 * ``pl`` (Polish)
 * ``pt_BR`` (Brazilian Portuguese)
+* ``sl`` (Slovene)
 * ``ru`` (Russian)
 * ``tr`` (Turkish)
 * ``vn`` (Vietnamese)

num2words/__init__.py

@@ -41,6 +41,7 @@ from . import lang_VN
 from . import lang_TR
 from . import lang_NL
 from . import lang_UK
+from . import lang_SL
 
 CONVERTER_CLASSES = {
     'ar': lang_AR.Num2Word_AR(),
@@ -59,6 +60,7 @@ CONVERTER_CLASSES = {
     'lv': lang_LV.Num2Word_LV(),
     'pl': lang_PL.Num2Word_PL(),
     'ru': lang_RU.Num2Word_RU(),
+    'sl': lang_SL.Num2Word_SL(),
     'no': lang_NO.Num2Word_NO(),
     'dk': lang_DK.Num2Word_DK(),
     'pt_BR': lang_PT_BR.Num2Word_PT_BR(),
@@ -71,7 +73,7 @@ CONVERTER_CLASSES = {
 }
 
 
-def num2words(number, ordinal=False, lang='en'):
+def num2words(number, ordinal=False, lang='en', to='cardinal'):
     # We try the full language first
     if lang not in CONVERTER_CLASSES:
         # ... and then try only the first 2 letters
@@ -79,7 +81,11 @@ def num2words(number, ordinal=False, lang='en'):
     if lang not in CONVERTER_CLASSES:
         raise NotImplementedError()
     converter = CONVERTER_CLASSES[lang]
+    # backwards compatible
     if ordinal:
         return converter.to_ordinal(number)
-    else:
+
-        return converter.to_cardinal(number)
+    if to not in CONVERTES_TYPES:
+        raise NotImplementedError()
+
+    return getattr(converter, 'to_{}'.format(to))(number)

num2words/lang_DK.py

@@ -15,7 +15,7 @@
 # MA 02110-1301 USA
 
 from __future__ import division, unicode_literals, print_function
-from num2words import lang_EU
+from . import lang_EU
 
 
 class Num2Word_DK(lang_EU.Num2Word_EU):

num2words/lang_SL.py

@@ -0,0 +1,165 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2003, Taro Ogawa.  All Rights Reserved.
+# Copyright (c) 2013, Savoir-faire Linux inc.  All Rights Reserved.
+# Copyright (c) 2015, Blaz Bregar. 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
+
+# -*- coding: utf-8 -*-
+
+from __future__ import unicode_literals
+from .lang_EU import Num2Word_EU
+
+class Num2Word_SL(Num2Word_EU):
+    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] = word + "iljard"
+            self.cards[10**(n-3)] = word + "iljon"
+
+
+    def setup(self):
+        self.negword = "minus "
+        self.pointword = "celih"
+        self.errmsg_nonnum = "Only numbers may be converted to words."
+        self.errmsg_toobig = "Number is too large to convert to words."
+        self.exclude_title = []
+
+        self.mid_numwords = [(1000, "tisoč"), (900, "devetsto"), (800, "osemsto"),
+                             (700, "sedemsto"), (600, "šesto"), (500, "petsto"), (400, "štiristo"), (300, "tristo"),
+                             (200, "dvesto"), (100, "sto"),
+                             (90, "devetdeset"), (80, "osemdeset"), (70, "sedemdeset"),
+                             (60, "šestdeset"), (50, "petdeset"), (40, "štirideset"),
+                             (30, "trideset")]
+        self.low_numwords = ["dvajset", "devetnajst", "osemnajst", "sedemnajst",
+                             "šestnajst", "petnajst", "štirinajst", "trinajst",
+                             "dvanajst", "enajst", "deset", "devet", "osem", "sedem",
+                             "šest", "pet", "štiri", "tri", "dve", "ena",
+                             "nič"]
+        self.ords = { "ena"     : "prv",
+                      "dve"     : "drug",
+                      "tri"     : "tretj",
+                      "štiri"   : "četrt",
+                      "sedem"   : "sedm",
+                      "osem"    : "osm",
+                      "sto"     : "stot",
+                      "tisoč"   : "tisoč",
+                      "miljon"  : "miljont"
+                     }
+        self.ordflag = False
+
+
+    def merge(self, curr, next):
+        ctext, cnum, ntext, nnum = curr + next
+
+        if ctext == "dve" and not self.ordflag:
+            ctext = "dva"
+
+        if cnum == 1:
+            if nnum < 10**6 or self.ordflag:
+                return next
+            ctext = ""
+
+        if nnum > cnum:
+            if nnum >= 10**6:
+                if self.ordflag:
+                    ntext += "t"
+
+                elif cnum == 2:
+                    if ntext.endswith("d"):
+                        ntext += "i"
+                    else:
+                        ntext += "a"
+
+                elif 2 < cnum < 5:
+                    if ntext.endswith("d"):
+                        ntext += "e"
+                    elif not ntext.endswith("d"):
+                        ntext += "i"
+
+                else:
+                    if ntext.endswith("d"):
+                        ntext += ""
+                    elif ntext.endswith("d"):
+                        ntext += "e"
+                    else:
+                        ntext += "ov"
+
+            if nnum >= 10**2 and self.ordflag == False:
+                ctext += " "
+
+            val = cnum * nnum
+        else:
+            if nnum < 10 < cnum < 100:
+                ntext, ctext =  ctext, ntext + "in"
+            elif cnum >= 10**2 and self.ordflag == False:
+                ctext += " "
+            val = cnum + nnum
+
+        word = ctext + ntext
+        return (word, val)
+
+
+    def to_ordinal(self, value):
+        self.verify_ordinal(value)
+        self.ordflag = True
+        outword = self.to_cardinal(value)
+        self.ordflag = False
+        for key in self.ords:
+            if outword.endswith(key):
+                outword = outword[:len(outword) - len(key)] + self.ords[key]
+                break
+        return outword + "i"
+
+
+    # Is this correct??
+    def to_ordinal_num(self, value):
+        self.verify_ordinal(value)
+        return str(value) + "."
+
+
+    def to_currency(self, val, longval=True, old=False):
+        if old:
+            return self.to_splitnum(val, hightxt="evro/a/v", lowtxt="stotin/a/i/ov",
+                                    jointxt="in",longval=longval)
+        return super(Num2Word_SL, self).to_currency(val, jointxt="in",
+                                                    longval=longval)
+
+    def to_year(self, val, longval=True):
+        if not (val//100)%10:
+            return self.to_cardinal(val)
+        return self.to_splitnum(val, hightxt="hundert", longval=longval)
+
+
+
+n2w = Num2Word_SL()
+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(112121))
+    print(n2w.to_year(2000))
+
+if __name__ == "__main__":
+    main()

tests/test_sl.py

@@ -0,0 +1,55 @@
+# -*- encoding: utf-8 -*-
+# Copyright (c) 2015, 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 Num2WordsDETest(TestCase):
+    def test_ordinal_less_than_twenty(self):
+        self.assertEqual(num2words(2, ordinal=True, lang='sl'), "drugi")
+        self.assertEqual(num2words(4, ordinal=True, lang='sl'), "četrti")
+        self.assertEqual(num2words(7, ordinal=True, lang='sl'), "sedmi")
+        self.assertEqual(num2words(8, ordinal=True, lang='sl'), "osmi")
+        self.assertEqual(num2words(12, ordinal=True, lang='sl'), "dvanajsti")
+        self.assertEqual(num2words(17, ordinal=True, lang='sl'), "sedemnajsti")
+
+    def test_ordinal_more_than_twenty(self):
+        self.assertEqual(num2words(81, ordinal=True, lang='sl'), "enainosemdeseti")
+
+    def test_ordinal_at_crucial_number(self):
+        self.assertEqual(num2words(100, ordinal=True, lang='sl'), "stoti")
+        self.assertEqual(num2words(1000, ordinal=True, lang='sl'), "tisoči")
+        self.assertEqual(num2words(4000, ordinal=True, lang='sl'), "štiritisoči")
+        self.assertEqual(num2words(2000000, ordinal=True, lang='sl'), "dvemiljonti")
+        self.assertEqual(num2words(5000000000, ordinal=True, lang='sl'), "petmiljardti")
+
+    def test_cardinal_at_some_numbers(self):
+        self.assertEqual(num2words(2, lang='sl'), "dve")
+        self.assertEqual(num2words(4000, lang='sl'), "štiri tisoč")
+        self.assertEqual(num2words(2000000, lang='sl'), "dva miljona")
+        self.assertEqual(num2words(4000000000, lang='sl'), "štiri miljarde")
+
+    def test_cardinal_for_decimal_number(self):
+        self.assertEqual(num2words(3.486, lang='sl'), "tri celih štiri osem")
+
+    def test_ordinal_for_negative_numbers(self):
+        self.assertRaises(TypeError, num2words, -12, ordinal=True, lang='sl')
+
+    def test_ordinal_for_floating_numbers(self):
+        self.assertRaises(TypeError, num2words, 2.453, ordinal=True, lang='sl')