Merge branch 'master' into en_coverage

num2words/lang_ES.py

@@ -15,7 +15,9 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA 02110-1301 USA
 
-from __future__ import print_function, unicode_literals
+from __future__ import division, print_function, unicode_literals
+
+import math
 
 from .lang_EU import Num2Word_EU
 
@@ -120,47 +122,47 @@ class Num2Word_ES(Num2Word_EU):
 
     def to_ordinal(self, value):
         self.verify_ordinal(value)
-        try:
+        if value == 0:
-            if value == 0:
+            text = ""
-                text = ""
+        elif value <= 10:
-            elif value <= 10:
+            text = "%s%s" % (self.ords[value], self.gender_stem)
-                text = "%s%s" % (self.ords[value], self.gender_stem)
+        elif value <= 12:
-            elif value <= 12:
+            text = (
-                text = (
+                "%s%s%s" % (self.ords[10], self.gender_stem,
-                    "%s%s%s" % (self.ords[10], self.gender_stem,
+                            self.to_ordinal(value - 10))
-                                self.to_ordinal(value - 10))
-                        )
-            elif value <= 100:
-                dec = (value // 10) * 10
-                text = (
-                    "%s%s %s" % (self.ords[dec], self.gender_stem,
-                                 self.to_ordinal(value - dec))
-                        )
-            elif value <= 1e3:
-                cen = (value // 100) * 100
-                text = (
-                    "%s%s %s" % (self.ords[cen], self.gender_stem,
-                                 self.to_ordinal(value - cen))
-                        )
-            elif value < 1e18:
-                # dec contains the following:
-                # [ 1e3,  1e6): 1e3
-                # [ 1e6,  1e9): 1e6
-                # [ 1e9, 1e12): 1e9
-                # [1e12, 1e15): 1e12
-                # [1e15, 1e18): 1e15
-                dec = 10 ** ((((len(str(int(value))) - 1) / 3 - 1) + 1) * 3)
-                part = int(float(value / dec) * dec)
-                cardinal = (
-                    self.to_cardinal(part / dec) if part / dec != 1 else ""
                     )
-                text = (
+        elif value <= 100:
-                    "%s%s%s %s" % (cardinal, self.ords[dec], self.gender_stem,
+            dec = (value // 10) * 10
-                                   self.to_ordinal(value - part))
+            text = (
-                        )
+                "%s%s %s" % (self.ords[dec], self.gender_stem,
-            else:
+                             self.to_ordinal(value - dec))
-                text = self.to_cardinal(value)
+                    )
-        except KeyError:
+        elif value <= 1e3:
+            cen = (value // 100) * 100
+            text = (
+                "%s%s %s" % (self.ords[cen], self.gender_stem,
+                             self.to_ordinal(value - cen))
+                    )
+        elif value < 1e18:
+            # Round down to the nearest 1e(3n)
+            # dec contains the following:
+            # [ 1e3,  1e6): 1e3
+            # [ 1e6,  1e9): 1e6
+            # [ 1e9, 1e12): 1e9
+            # [1e12, 1e15): 1e12
+            # [1e15, 1e18): 1e15
+            dec = 1000 ** int(math.log(int(value), 1000))
+
+            # Split the parts before and after the word for 'dec'
+            # eg (12, 345) = divmod(12_345, 1_000)
+            high_part, low_part = divmod(value, dec)
+
+            cardinal = self.to_cardinal(high_part) if high_part != 1 else ""
+            text = (
+                "%s%s%s %s" % (cardinal, self.ords[dec], self.gender_stem,
+                               self.to_ordinal(low_part))
+                    )
+        else:
             text = self.to_cardinal(value)
         return text.strip()
 

tests/test_dk.py

@@ -0,0 +1,37 @@
+# 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 Num2WordsDKTest(TestCase):
+    def test_ordinal(self):
+        self.assertEqual(num2words(1, to="ordinal", lang="dk"), "første")
+        self.assertEqual(num2words(5, to="ordinal", lang="dk"), "femte")
+
+    def test_cardinal(self):
+        self.assertEqual(num2words(0, to="cardinal", lang="dk"), "nul")
+        self.assertEqual(num2words(1, to="cardinal", lang="dk"), "et")
+        self.assertEqual(num2words(2, to="cardinal", lang="dk"), "to")
+        self.assertEqual(num2words(5, to="cardinal", lang="dk"), "fem")
+        self.assertEqual(num2words(8, to="cardinal", lang="dk"), "otte")
+        self.assertEqual(num2words(18, to="cardinal", lang="dk"), "atten")
+        self.assertEqual(num2words(45, to="cardinal", lang="dk"), "femogfyrre")

tests/test_es.py

@@ -95,6 +95,7 @@ TEST_CASES_ORDINAL = (
     (28, 'vigésimo octavo'),
     (100, 'centésimo'),
     (1000, 'milésimo'),
+    (12345, 'docemilésimo tricentésimo quadragésimo quinto'),
     (1000000, 'millonésimo'),
     (1000000000000000, 'cuadrillonésimo'),
     (1000000000000000000, 'un trillón')  # over 1e18 is not supported