Merge lp:~openerp-dev/openobject-server/trunk-bug-1015867-api into lp:openobject-server

[Arnaud Pineux (OpenERP)]

[lp:~openerp-dev/openobject-server/trunk-bug-1015867-api]

4545. By Arnaud Pineux (OpenERP) on 2012-11-29

[REVERT] changelog, lt_LT, nl_NL, UK_UA

4546. By Vo Minh Thu on 2012-12-04

[MERGE] merged trunk.

4547. By Vo Minh Thu on 2012-12-04

[IMP] amount_to_text: use logging (as did the previous amount_to_text_en).

[Vo Minh Thu (thu)]

Seems good.

Just waiting to be sure for the corresponding addons branch https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-1015867-api/+merge/133958

review: Approve

Unmerged revisions

4547. By Vo Minh Thu on 2012-12-04

[IMP] amount_to_text: use logging (as did the previous amount_to_text_en).

4546. By Vo Minh Thu on 2012-12-04

[MERGE] merged trunk.

4545. By Arnaud Pineux (OpenERP) on 2012-11-29

[REVERT] changelog, lt_LT, nl_NL, UK_UA

4544. By Arnaud Pineux (OpenERP) on 2012-11-12

[FIX] account_check_writing and amout_to_text

4543. By Arnaud Pineux (OpenERP) on 2012-11-12

[FIX] account_check_writing and amout_to_text

=== modified file 'openerp/tools/__init__.py'
--- openerp/tools/__init__.py	2012-11-06 11:54:20 +0000
+++ openerp/tools/__init__.py	2012-12-04 16:21:23 +0000
@@ -28,7 +28,6 @@
 from graph import graph
 from image import *
 from amount_to_text import *
-from amount_to_text_en import *
 from pdf_utils import *
 from yaml_import import *
 from sql import *

=== modified file 'openerp/tools/amount_to_text.py'
--- openerp/tools/amount_to_text.py	2011-06-23 09:03:11 +0000
+++ openerp/tools/amount_to_text.py	2012-12-04 16:21:23 +0000
@@ -19,6 +19,10 @@
 #
 ##############################################################################
 
+import logging
+
+_logger = logging.getLogger(__name__)
+
 #-------------------------------------------------------------
 # French
 #-------------------------------------------------------------
@@ -156,18 +160,96 @@
     final_result = start_word +' '+units_name+' '+ end_word +' '+cents_name
     return final_result
 
+
+#-------------------------------------------------------------
+# ENGLISH
+#-------------------------------------------------------------
+
+to_19 = ( 'Zero',  'One',   'Two',  'Three', 'Four',   'Five',   'Six',
+          'Seven', 'Eight', 'Nine', 'Ten',   'Eleven', 'Twelve', 'Thirteen',
+          'Fourteen', 'Fifteen', 'Sixteen', 'Seventeen', 'Eighteen', 'Nineteen' )
+tens  = ( 'Twenty', 'Thirty', 'Forty', 'Fifty', 'Sixty', 'Seventy', 'Eighty', 'Ninety')
+denom = ( '',
+          'Thousand',     'Million',         'Billion',       'Trillion',       'Quadrillion',
+          'Quintillion',  'Sextillion',      'Septillion',    'Octillion',      'Nonillion',
+          'Decillion',    'Undecillion',     'Duodecillion',  'Tredecillion',   'Quattuordecillion',
+          'Sexdecillion', 'Septendecillion', 'Octodecillion', 'Novemdecillion', 'Vigintillion' )
+
+def _convert_nn(val):
+    """convert a value < 100 to English.
+    """
+    if val < 20:
+        return to_19[val]
+    for (dcap, dval) in ((k, 20 + (10 * v)) for (v, k) in enumerate(tens)):
+        if dval + 10 > val:
+            if val % 10:
+                return dcap + '-' + to_19[val % 10]
+            return dcap
+
+def _convert_nnn(val):
+    """
+        convert a value < 1000 to english, special cased because it is the level that kicks 
+        off the < 100 special case.  The rest are more general.  This also allows you to
+        get strings in the form of 'forty-five hundred' if called directly.
+    """
+    word = ''
+    (mod, rem) = (val % 100, val // 100)
+    if rem > 0:
+        word = to_19[rem] + ' Hundred'
+        if mod > 0:
+            word = word + ' '
+    if mod > 0:
+        word = word + _convert_nn(mod)
+    return word
+
+def english_number(val):
+    if val < 100:
+        return _convert_nn(val)
+    if val < 1000:
+         return _convert_nnn(val)
+    for (didx, dval) in ((v - 1, 1000 ** v) for v in range(len(denom))):
+        if dval > val:
+            mod = 1000 ** didx
+            l = val // mod
+            r = val - (l * mod)
+            ret = _convert_nnn(l) + ' ' + denom[didx]
+            if r > 0:
+                ret = ret + ', ' + english_number(r)
+            return ret
+
+def amount_to_text_en(number, currency):
+    number = '%.2f' % number
+    if currency == "EUR":
+        currency = "euro"
+    if currency == "USD":
+        currency = "dollars"
+    units_name = currency
+    list = str(number).split('.')
+    start_word = english_number(int(list[0]))
+    end_word = english_number(int(list[1]))
+    cents_number = int(list[1])
+    cents_name = (cents_number > 1) and 'Cents' or 'Cent'
+
+    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]))
+
+
+
 #-------------------------------------------------------------
 # Generic functions
 #-------------------------------------------------------------
 
-_translate_funcs = {'fr' : amount_to_text_fr, 'nl' : amount_to_text_nl}
+_translate_funcs = {
+    'en': amount_to_text_en,
+    'fr': amount_to_text_fr,
+    'nl': amount_to_text_nl,
+}
 
 def add_amount_to_text_function(lang, func):
     _translate_funcs[lang] = func
     
 #TODO: we should use the country AND language (ex: septante VS soixante dix)
 #TODO: we should use en by default, but the translation func is yet to be implemented
-def amount_to_text(nbr, lang='fr', currency='euro'):
+def amount_to_text(nbr, lang='en', currency='euro'):
     """ Converts an integer to its textual representation, using the language set in the context if any.
 
         Example::
@@ -178,12 +260,9 @@
 ##TODO: use logger   
 #        print "WARNING: number too large '%d', can't translate it!" % (nbr,)
 #        return str(nbr)
-    
     if not _translate_funcs.has_key(lang):
-#TODO: use logger   
-        print "WARNING: no translation function found for lang: '%s'" % (lang,)
-#TODO: (default should be en) same as above
-        lang = 'fr'
+        _logger.warning(_("No translation function found for language '%s'."), lang)
+        lang = 'en'
     return _translate_funcs[lang](abs(nbr), currency)
 
 if __name__=='__main__':

=== removed file 'openerp/tools/amount_to_text_en.py'
--- openerp/tools/amount_to_text_en.py	2012-09-04 10:02:50 +0000
+++ openerp/tools/amount_to_text_en.py	1970-01-01 00:00:00 +0000
@@ -1,134 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program 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 Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import logging
-from translate import _
-
-_logger = logging.getLogger(__name__)
-
-#-------------------------------------------------------------
-#ENGLISH
-#-------------------------------------------------------------
-
-to_19 = ( 'Zero',  'One',   'Two',  'Three', 'Four',   'Five',   'Six',
-          'Seven', 'Eight', 'Nine', 'Ten',   'Eleven', 'Twelve', 'Thirteen',
-          'Fourteen', 'Fifteen', 'Sixteen', 'Seventeen', 'Eighteen', 'Nineteen' )
-tens  = ( 'Twenty', 'Thirty', 'Forty', 'Fifty', 'Sixty', 'Seventy', 'Eighty', 'Ninety')
-denom = ( '',
-          'Thousand',     'Million',         'Billion',       'Trillion',       'Quadrillion',
-          'Quintillion',  'Sextillion',      'Septillion',    'Octillion',      'Nonillion',
-          'Decillion',    'Undecillion',     'Duodecillion',  'Tredecillion',   'Quattuordecillion',
-          'Sexdecillion', 'Septendecillion', 'Octodecillion', 'Novemdecillion', 'Vigintillion' )
-
-def _convert_nn(val):
-    """convert a value < 100 to English.
-    """
-    if val < 20:
-        return to_19[val]
-    for (dcap, dval) in ((k, 20 + (10 * v)) for (v, k) in enumerate(tens)):
-        if dval + 10 > val:
-            if val % 10:
-                return dcap + '-' + to_19[val % 10]
-            return dcap
-
-def _convert_nnn(val):
-    """
-        convert a value < 1000 to english, special cased because it is the level that kicks 
-        off the < 100 special case.  The rest are more general.  This also allows you to
-        get strings in the form of 'forty-five hundred' if called directly.
-    """
-    word = ''
-    (mod, rem) = (val % 100, val // 100)
-    if rem > 0:
-        word = to_19[rem] + ' Hundred'
-        if mod > 0:
-            word = word + ' '
-    if mod > 0:
-        word = word + _convert_nn(mod)
-    return word
-
-def english_number(val):
-    if val < 100:
-        return _convert_nn(val)
-    if val < 1000:
-         return _convert_nnn(val)
-    for (didx, dval) in ((v - 1, 1000 ** v) for v in range(len(denom))):
-        if dval > val:
-            mod = 1000 ** didx
-            l = val // mod
-            r = val - (l * mod)
-            ret = _convert_nnn(l) + ' ' + denom[didx]
-            if r > 0:
-                ret = ret + ', ' + english_number(r)
-            return ret
-
-def amount_to_text(number, currency):
-    number = '%.2f' % number
-    units_name = currency
-    list = str(number).split('.')
-    start_word = english_number(int(list[0]))
-    end_word = english_number(int(list[1]))
-    cents_number = int(list[1])
-    cents_name = (cents_number > 1) and 'Cents' or 'Cent'
-
-    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]))
-
-
-#-------------------------------------------------------------
-# Generic functions
-#-------------------------------------------------------------
-
-_translate_funcs = {'en' : amount_to_text}
-    
-#TODO: we should use the country AND language (ex: septante VS soixante dix)
-#TODO: we should use en by default, but the translation func is yet to be implemented
-def amount_to_text(nbr, lang='en', currency='euro'):
-    """ Converts an integer to its textual representation, using the language set in the context if any.
-    
-        Example::
-        
-            1654: thousands six cent cinquante-quatre.
-    """
-    import openerp.loglevels as loglevels
-#    if nbr > 10000000:
-#        _logger.warning(_("Number too large '%d', can not translate it"))
-#        return str(nbr)
-    
-    if not _translate_funcs.has_key(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)
-
-if __name__=='__main__':
-    from sys import argv
-    
-    lang = 'nl'
-    if len(argv) < 2:
-        for i in range(1,200):
-            print i, ">>", int_to_text(i, lang)
-        for i in range(200,999999,139):
-            print i, ">>", int_to_text(i, lang)
-    else:
-        print int_to_text(int(argv[1]), lang)
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: