v0.5.3

fixes #21

CHANGES.rst

@@ -1,6 +1,11 @@
 Changelog
 =========
 
+Version 0.5.3 -- 2015/06/09
+---------------------------
+
+* Fix packaging issues. (#21, #22)
+
 Version 0.5.2 -- 2015/01/23
 ---------------------------
 

MANIFEST.in

@@ -1 +1,2 @@
 include CHANGES.rst
+include COPYING

README.rst

@@ -18,6 +18,10 @@ Otherwise, you can download the source package and then execute::
 
     python setup.py install
 
+The test suite in this library new, so it's rather thin, but it can be ran with::
+
+    python setup.py test
+
 Usage
 -----
 

num2words/lang_DE.py

@@ -40,7 +40,7 @@ class Num2Word_DE(Num2Word_EU):
         tens = ["dez", "vigint", "trigint", "quadragint", "quinquagint",
                 "sexagint", "septuagint", "oktogint", "nonagint"]
         self.high_numwords = ["zent"]+self.gen_high_numwords(units, tens, lows)
-        self.mid_numwords = [(1000, "tausand"), (100, "hundert"),
+        self.mid_numwords = [(1000, "tausend"), (100, "hundert"),
                              (90, "neunzig"), (80, "achtzig"), (70, "siebzig"),
                              (60, "sechzig"), (50, "f\xFCnfzig"), (40, "vierzig"),
                              (30, "drei\xDFig")]

num2words/lang_FR.py

@@ -19,7 +19,6 @@ from __future__ import unicode_literals
 from .lang_EU import Num2Word_EU
 
 #//TODO: error messages in French
-#//TODO: ords
 class Num2Word_FR(Num2Word_EU):
     def setup(self):
         self.negword = "moins "
@@ -35,6 +34,10 @@ class Num2Word_FR(Num2Word_EU):
                              "seize", "quinze", "quatorze", "treize", "douze",
                              "onze", "dix", "neuf", "huit", "sept", "six",
                              "cinq", "quatre", "trois", "deux", "un", "zéro"]
+        self.ords = {
+            "cinq": "cinquième",
+            "neuf": "neuvième",
+        }
 
 
     def merge(self, curr, next):
@@ -67,10 +70,15 @@ class Num2Word_FR(Num2Word_EU):
         if value == 1:
             return "premier"
         word = self.to_cardinal(value)
+        for src, repl in self.ords.items():
+            if word.endswith(src):
+                word = word[:-len(src)] + repl
+                break
+        else:
             if word[-1] == "e":
                 word = word[:-1]
-        return word + "ième"
-
+            word = word + "ième"
+        return word
 
     def to_ordinal_num(self, value):
         self.verify_ordinal(value)

setup.py

@@ -17,7 +17,7 @@ LONG_DESC = open('README.rst', 'rt').read() + '\n\n' + open('CHANGES.rst', 'rt')
 
 setup(
     name='num2words',
-    version='0.5.2',
+    version='0.5.3',
     description='Modules to convert numbers to words. Easily extensible.',
     long_description=LONG_DESC,
     license='LGPL',
@@ -27,7 +27,7 @@ setup(
     maintainer_email='virgil.dupras@savoirfairelinux.com',
     keywords=' number word numbers words convert conversion i18n localisation localization internationalisation internationalization',
     url='https://github.com/savoirfairelinux/num2words',
-    packages=find_packages(),
+    packages=find_packages(exclude=['tests']),
     test_suite='tests',
     use_2to3=True,
 )

tests/test_fr.py

@@ -0,0 +1,30 @@
+# -*- 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 Num2WordsENTest(TestCase):
+    def test_ordinal_special_joins(self):
+        # ref https://github.com/savoirfairelinux/num2words/issues/18
+        self.assertEqual(num2words(5, ordinal=True, lang='fr'), "cinquième")
+        self.assertEqual(num2words(35, ordinal=True, lang='fr'), "trente-cinquième")
+        self.assertEqual(num2words(9, ordinal=True, lang='fr'), "neuvième")
+        self.assertEqual(num2words(49, ordinal=True, lang='fr'), "quarante-neuvième")
+