[IMP]Reworked the files ES_CO and ES_VE.

num2words/lang_ES_CO.py

@@ -17,140 +17,10 @@
 # MA 02110-1301 USA
 
 from __future__ import unicode_literals, print_function
-from .lang_EU import Num2Word_EU
+from .lang_ES import Num2Word_ES
 
 
-class Num2Word_ES_CO(Num2Word_EU):
-    # //CHECK: Is this sufficient??
-    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-3)] = word + "illón"
-
-    def setup(self):
-        lows = ["cuatr", "tr", "b", "m"]
-        self.high_numwords = self.gen_high_numwords([], [], lows)
-        self.negword = "menos "
-        self.pointword = "punto"
-        self.errmsg_nonnum = "Solo números pueden ser convertidos a letras."
-        self.errmsg_toobig = "Numero muy grande para ser convertido a letras."
-        self.gender_stem = "o"
-        self.exclude_title = ["y", "menos", "punto"]
-        self.mid_numwords = [(1000, "mil"), (100, "cien"),
-                                            (90, "noventa"), (80, "ochenta"),
-                                            (70, "setenta"), (60, "sesenta"),
-                                            (50, "cincuenta"), (40, "cuarenta"),
-                                            (30, "treinta")]
-        self.low_numwords = ["veintinueve", "veintiocho", "veintisiete",
-                             "veintiséis", "veinticinco", "veinticuatro",
-                             "veintitrés", "veintidós", "veintiuno",
-                             "veinte", "diecinueve", "dieciocho", "diecisiete",
-                             "dieciseis", "quince", "catorce", "trece", "doce",
-                             "once", "diez", "nueve", "ocho", "siete", "seis",
-                             "cinco", "cuatro", "tres", "dos", "uno", "cero"]
-        self.ords = {
-            1: "primer",
-            2: "segund",
-            3: "tercer",
-            4: "cuart",
-            5: "quint",
-            6: "sext",
-            7: "séptim",
-            8: "octav",
-            9: "noven",
-            10: "décim",
-            20: "vigésim",
-            30: "trigésim",
-            40: "quadragésim",
-            50: "quincuagésim",
-            60: "sexagésim",
-            70: "septuagésim",
-            80: "octogésim",
-            90: "nonagésim",
-            100: "centésim",
-            200: "ducentésim",
-            300: "tricentésim",
-            400: "cuadrigentésim",
-            500: "quingentésim",
-            600: "sexcentésim",
-            700: "septigentésim",
-            800: "octigentésim",
-            900: "noningentésim",
-            1e3: "milésim",
-            1e6: "millonésim",
-            1e9: "billonésim",
-            1e12: "trillonésim",
-            1e15: "cuadrillonésim"
-        }
-
-    def merge(self, curr, next):
-        ctext, cnum, ntext, nnum = curr + next
-
-        if cnum == 1:
-            if nnum < 1000000:
-                return next
-            ctext = "un"
-        elif cnum == 100 and not nnum == 1000:
-            ctext += "t" + self.gender_stem
-
-        if nnum < cnum:
-            if cnum < 100:
-                return ("%s y %s" % (ctext, ntext), cnum + nnum)
-            return ("%s %s" % (ctext, ntext), cnum + nnum)
-        elif (not nnum % 1000000) and cnum > 1:
-            ntext = ntext[:-3] + "lones"
-
-        if nnum == 100:
-            if cnum == 5:
-                ctext = "quinien"
-                ntext = ""
-            elif cnum == 7:
-                ctext = "sete"
-            elif cnum == 9:
-                ctext = "nove"
-            ntext += "t" + self.gender_stem + "s"
-        else:
-            ntext = " " + ntext
-
-        return (ctext + ntext, cnum * nnum)
-
-    def to_ordinal(self, value):
-        self.verify_ordinal(value)
-        text = ""
-        try:
-            if value == 0:
-                text = ""
-            elif value <= 10:
-                text = "%s%s" % (self.ords[value], self.gender_stem)
-            elif value <= 12:
-                text = "%s%s%s" % (self.ords[10], self.gender_stem, 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 = "%s%s%s %s" % (cardinal, self.ords[dec], self.gender_stem, self.to_ordinal(value - part))
-            else:
-                text = self.to_cardinal(value)
-        except KeyError:
-            text = self.to_cardinal(value)
-        return text.strip()
-
-    def to_ordinal_num(self, value):
-        self.verify_ordinal(value)
-        return "%s%s" % (value, "º" if self.gender_stem == 'o' else "ª")
+class Num2Word_ES_CO(Num2Word_ES):
 
     def to_currency(self, val, longval=True, old=False):
         if old:
@@ -160,7 +30,7 @@ class Num2Word_ES_CO(Num2Word_EU):
                                                     longval=longval)
 
 
-n2w = Num2Word_ES()
+n2w = Num2Word_ES_CO()
 to_card = n2w.to_cardinal
 to_ord = n2w.to_ordinal
 to_ordnum = n2w.to_ordinal_num