Merge branch 'savoirfairelinux:master' into master

README.rst

@@ -79,7 +79,7 @@ Besides the numerical argument, there are two main optional arguments, ``to:`` a
 * ``am`` (Amharic)
 * ``ar`` (Arabic)
 * ``az`` (Azerbaijani)
-* ``by`` (Belarusian)
+* ``be`` (Belarusian)
 * ``ce`` (Chechen)
 * ``cy`` (Welsh)
 * ``cz`` (Czech)
@@ -121,6 +121,7 @@ Besides the numerical argument, there are two main optional arguments, ``to:`` a
 * ``ro`` (Romanian)
 * ``ru`` (Russian)
 * ``te`` (Telugu)
+* ``tet`` (Tetum)
 * ``tg`` (Tajik)
 * ``tr`` (Turkish)
 * ``th`` (Thai)

num2words/__init__.py

@@ -17,21 +17,22 @@
 
 from __future__ import unicode_literals
 
-from . import (lang_AM, lang_AR, lang_AZ, lang_BY, lang_CE, lang_CY, lang_CZ,
-               lang_DE, lang_DK, lang_EN, lang_EN_IN, lang_EN_NG, lang_EO,
-               lang_ES, lang_ES_CO, lang_ES_CR, lang_ES_GT, lang_ES_NI,
-               lang_ES_VE, lang_FA, lang_FI, lang_FR, lang_FR_BE, lang_FR_CH,
-               lang_FR_DZ, lang_HE, lang_HU, lang_ID, lang_IS, 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_SK, lang_SL, lang_SR, lang_SV, lang_TE, lang_TG, lang_TH,
-               lang_TR, lang_UK, lang_VI)
+from . import (lang_AM, lang_AR, lang_AZ, lang_BE, lang_CA, lang_CE, lang_CY,
+               lang_CZ, lang_DE, lang_DK, lang_EN, lang_EN_IN, lang_EN_NG,
+               lang_EO, lang_ES, lang_ES_CO, lang_ES_CR, lang_ES_GT,
+               lang_ES_NI, lang_ES_VE, lang_FA, lang_FI, lang_FR, lang_FR_BE,
+               lang_FR_CH, lang_FR_DZ, lang_HE, lang_HU, lang_ID, lang_IS,
+               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_SK, lang_SL, lang_SR, lang_SV, lang_TE, lang_TET,
+               lang_TG, lang_TH, lang_TR, lang_UK, lang_VI)
 
 CONVERTER_CLASSES = {
     'am': lang_AM.Num2Word_AM(),
     'ar': lang_AR.Num2Word_AR(),
     'az': lang_AZ.Num2Word_AZ(),
-    'by': lang_BY.Num2Word_BY(),
+    'be': lang_BE.Num2Word_BE(),
+    'ca': lang_CA.Num2Word_CA(),
     'ce': lang_CE.Num2Word_CE(),
     'cy': lang_CY.Num2Word_CY(),
     'cz': lang_CZ.Num2Word_CZ(),
@@ -79,8 +80,9 @@
     'nl': lang_NL.Num2Word_NL(),
     'uk': lang_UK.Num2Word_UK(),
     'te': lang_TE.Num2Word_TE(),
+    'tet': lang_TET.Num2Word_TET(),
     'hu': lang_HU.Num2Word_HU(),
-    'is': lang_IS.Num2Word_IS()
+    'is': lang_IS.Num2Word_IS(),
 }
 
 CONVERTES_TYPES = ['cardinal', 'ordinal', 'ordinal_num', 'year', 'currency']

num2words/lang_BY.py → num2words/lang_BE.py

@@ -94,6 +94,17 @@
     9: "дзевяноста",
 }
 
+TWENTIES_ORD = (
+    ("дваццаць", "дваццаці"),
+    ("трыццаць", "трыццаці"),
+    ("сорак", "сарака"),
+    ("пяцьдзясят", "пяцідзясяці"),
+    ("шэсцьдзясят", "шaсцідзясяці"),
+    ("семдзесят", "сямідзесяці"),
+    ("восемдзесят", "васьмідзесяці"),
+    ("дзевяноста", "дзевяноста"),
+)
+
 HUNDREDS = {
     1: "сто",
     2: "дзвесце",
@@ -120,7 +131,7 @@
 }
 
 
-class Num2Word_BY(Num2Word_Base):
+class Num2Word_BE(Num2Word_Base):
     CURRENCY_FORMS = {
         "RUB": (
             ("расійскі рубель", "расійскія рублі", "расійскіх рублёў"),
@@ -138,6 +149,7 @@ class Num2Word_BY(Num2Word_Base):
             ("капейка", "капейкі", "капеек"),
         ),
         "UZS": (("сум", "сумы", "сумаў"), ("тыйін", "тыйіны", "тыйінаў")),
+        "PLN": (("злоты", "злотых", "злотых"), ("грош", "грошы", "грошаў")),
     }
 
     def setup(self):
@@ -204,6 +216,8 @@ def pluralize(self, n, forms):
 
     def to_ordinal(self, number, gender="m"):
         self.verify_ordinal(number)
+        if isinstance(gender, bool) and gender:
+            gender = "f"
         outwords = self.to_cardinal(number, gender).split(" ")
         lastword = outwords[-1].lower()
         try:
@@ -223,8 +237,6 @@ def to_ordinal(self, number, gender="m"):
                 lastword = (
                     self.ords_adjective.get(lastword[:-3], lastword) + "соты"
                 )
-            elif lastword[-5:] == "шэсць":
-                lastword = "шосты"
             elif lastword[-7:] == "дзесяць":
                 lastword = "дзясяты"
             elif lastword[-9:] == "семдзесят":
@@ -242,6 +254,8 @@ def to_ordinal(self, number, gender="m"):
 
             elif lastword[-1] == "н" or lastword[-2] == "н":
                 lastword = lastword[: lastword.rfind("н") + 1] + "ны"
+            elif lastword[-3:] == "наў":
+                lastword = lastword[: lastword.rfind("н") + 1] + "ны"
             elif lastword[-1] == "д" or lastword[-2] == "д":
                 lastword = lastword[: lastword.rfind("д") + 1] + "ны"
 
@@ -254,9 +268,7 @@ def to_ordinal(self, number, gender="m"):
                 lastword = lastword[:-1] + "ая"
 
         if gender == "n":
-            if lastword[-2:] in [
-                "ці", "ца"
-            ]:
+            if lastword[-2:] in ["ці", "ца"]:
                 lastword = lastword[:-2] + "цяе"
             else:
                 lastword = lastword[:-1] + "ае"
@@ -266,16 +278,20 @@ def to_ordinal(self, number, gender="m"):
             outwords[-2] = outwords[-1]
             del outwords[-1]
 
-        if len(outwords) > 2 and "тысяч" in outwords[-1]:
-            if 'сорак' in outwords[-3]:
-                outwords[-3] = outwords[-3].replace('сорак', 'сарака')
-            outwords[-3] = outwords[-3] + outwords[-2] + outwords[-1]
-            del outwords[-1]
-            del outwords[-1]
+        if len(outwords) > 1 and (
+            (any(x[0] in outwords[-1] for x in THOUSANDS.values()))
+            or "тысяч" in outwords[-1]
+        ):
+            new_outwords = []
+            for _w in outwords:
+                replacement = next(
+                    (x for x in TWENTIES_ORD if x[0] in _w), None
+                )
+                if replacement:
+                    _w = _w.replace(replacement[0], replacement[1])
+                new_outwords.append(_w)
+            outwords = ["".join(new_outwords)]
 
-        elif len(outwords) > 1 and "тысяч" in outwords[-1]:
-            outwords[-2] = outwords[-2] + outwords[-1]
-            del outwords[-1]
         return " ".join(outwords).strip()
 
     def _money_verbose(self, number, currency):
@@ -294,8 +310,6 @@ def _cents_verbose(self, number, currency):
         return self._int2word(number, gender)
 
     def _int2word(self, n, gender="m"):
-        if isinstance(gender, bool) and gender:
-            gender = "f"
         if n < 0:
             return " ".join([self.negword, self._int2word(abs(n), gender)])