[MERGE] trunk

[odoo/odoo.git] / openerp / tools / amount_to_text_en.py

diff --git a/openerp/tools/amount_to_text_en.py b/openerp/tools/amount_to_text_en.py
index 9147941..97d690c 100644 (file)
--- a/openerp/tools/amount_to_text_en.py
+++ b/openerp/tools/amount_to_text_en.py
@@ -19,10 +19,14 @@
 #
 ##############################################################################
 
+import logging
+from translate import _
+
+_logger = logging.getLogger(__name__)
+
 #-------------------------------------------------------------
 #ENGLISH
 #-------------------------------------------------------------
-from translate import _
 
 to_19 = ( 'Zero',  'One',   'Two',  'Three', 'Four',   'Five',   'Six',
           'Seven', 'Eight', 'Nine', 'Ten',   'Eleven', 'Twelve', 'Thirteen',
@@ -84,8 +88,8 @@ def amount_to_text(number, currency):
     end_word = english_number(int(list[1]))
     cents_number = int(list[1])
     cents_name = (cents_number > 1) and 'Cents' or 'Cent'
-    final_result = start_word +' '+units_name+' and ' + end_word +' '+cents_name
-    return final_result
+
+    return ' '.join(filter(None, [start_word, units_name, (start_word or units_name) and (end_word or cents_name) and 'and', end_word, cents_name]))
 
 
 #-------------------------------------------------------------
@@ -105,11 +109,11 @@ def amount_to_text(nbr, lang='en', currency='euro'):
     """
     import openerp.loglevels as loglevels
 #    if nbr > 10000000:
-#        netsvc.Logger().notifyChannel('translate', netsvc.LOG_WARNING, _("Number too large '%d', can not translate it"))
+#        _logger.warning(_("Number too large '%d', can not translate it"))
 #        return str(nbr)
     
     if not _translate_funcs.has_key(lang):
-        loglevels.Logger().notifyChannel('translate', loglevels.LOG_WARNING, _("no translation function found for lang: '%s'" % (lang,)))
+        _logger.warning(_("no translation function found for lang: '%s'"), lang)
         #TODO: (default should be en) same as above
         lang = 'en'
     return _translate_funcs[lang](abs(nbr), currency)
@@ -126,3 +130,5 @@ if __name__=='__main__':
     else:
         print int_to_text(int(argv[1]), lang)
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: