Merge lp:~chris-ormaza/aeroo/openerp6 into lp:aeroo/openerp6

[Christopher Ormaza - (Ecuadorenlinea.net)]

Add Spanish Support

[sraps (Alistek) (erpsraps)]

Hi, Christopher!

First of all - thanks for the work!
We will implement your localization in Aeroo, still some remarks:
* Do you think that it would be good to use just "es" in supported_language variable, preferably express them in form equal to OpenERP's language list (lv_LV, en_US,...). Even though there would be some dummy language codes, still user would not need to do a conversion on template. So templates would become generic even for languages not directly developed to.

* we will not include this inside Aeroo Reports 1.0, but rather port it to the trunk version with completely redesigned this function. Although technically function in this form performed fair enough, it already has become unmanageable by increasing number of languages present.

Please provide your answer on the es/es_ES question...

BR
Kaspars

review: Needs Information

[Christopher Ormaza - (Ecuadorenlinea.net) (chris-ormaza)]

Hi, Kaspars!

I think the code should have 'es_ES' too, really I just put 'es' because I thought it would be more generic, but if you are agree, I put the 'es_ES' in the code and re-merge the branch, I don't have problem with this, and thanks for your revision and add for this fantastic work

Regards
Christopher

> Hi, Christopher!
>
> First of all - thanks for the work!
> We will implement your localization in Aeroo, still some remarks:
> * Do you think that it would be good to use just "es" in supported_language
> variable, preferably express them in form equal to OpenERP's language list
> (lv_LV, en_US,...). Even though there would be some dummy language codes,
> still user would not need to do a conversion on template. So templates would
> become generic even for languages not directly developed to.
>
> * we will not include this inside Aeroo Reports 1.0, but rather port it to the
> trunk version with completely redesigned this function. Although technically
> function in this form performed fair enough, it already has become
> unmanageable by increasing number of languages present.
>
> Please provide your answer on the es/es_ES question...
>
> BR
> Kaspars

Unmerged revisions

7. By Christopher Ormaza - (Ecuadorenlinea.net) on 2011-12-30

Add Spanish Support

=== modified file 'report_aeroo/currency_to_text.py'
--- report_aeroo/currency_to_text.py	2011-11-15 11:01:45 +0000
+++ report_aeroo/currency_to_text.py	2011-12-30 18:05:26 +0000
@@ -4,15 +4,16 @@
 ###########################################################
 # Developed by Kaspars Vilkens - Alistek Ltd (c) 2011
 #     pep-8, unicode and doctests by Paul Stevens, [e-mail], 2010
+#     Spanish Support added by Christopher Ormaza - Ecuadorenlinea.net <[e-mail]>, 2011
 #
 # Supported currencies: LVL, EUR, USD, UAH
 # Supported sum: 0 ... 999999999999.99
-# Supported languages: lv_LV, en_US, ru_RU, uk_UA
+# Supported languages: lv_LV, en_US, ru_RU, uk_UA, es
 ###########################################################
 import string
 
-supported_currency = ['LVL','EUR','USD', 'UAH']
-supported_language = ['lv_LV','en_US','ru_RU', 'uk_UA']
+supported_currency = ['LVL', 'EUR', 'USD', 'UAH']
+supported_language = ['lv_LV', 'en_US', 'ru_RU', 'uk_UA','es']
 
 def currency_to_text(sum, currency, language):
     """
@@ -46,17 +47,17 @@
         raise Exception('Sum out of bounds: must be from 0 to 999999999999.99')
     if currency not in supported_currency: 
         raise Exception("""Unsupported or no currency: must be one of (%s)""" % \
-            string.join(supported_currency,','))
+            string.join(supported_currency, ','))
     if language not in supported_language: 
         raise Exception("""Unsupported or no language: must be one of (%s)""" % \
-            string.join(supported_language,','))
+            string.join(supported_language, ','))
 #--------------for currencies with 100 fractions
     sum = float(sum)
     sum = round(sum, 2)
     # find out digits before floating point - currency
     sum_cur = int(sum)
     # find out digits after floating point - fractions
-    sum_frc = int(round((sum - sum_cur) * 100,0))
+    sum_frc = int(round((sum - sum_cur) * 100, 0))
     cur_in_words = dtowords(sum_cur, language)
     #print cur_in_words
     frc_in_words = dtowords(sum_frc, language)
@@ -122,6 +123,33 @@
                 frc_in_words += u' santims'
             elif currency == 'EUR' or currency == 'USD' :
                 frc_in_words += u' cents'
+
+    #------------------------------------
+    if language == 'es' :
+        if sum_cur == 1 or (str(sum_cur)[-1] == '1' and str(sum_cur)[-2] != '1'): # is the currency sum one
+            if currency == 'LVL':
+                cur_in_words += u' Latvian lats'
+            elif currency == 'EUR':
+                cur_in_words += u' Euro'
+            elif currency == 'USD':
+                cur_in_words += u' Dolar Américano'
+        else:
+            if currency == 'LVL':
+                cur_in_words += u' Latvian lats'
+            elif currency == 'EUR':
+                cur_in_words += u' Euros'
+            elif currency == 'USD':
+                cur_in_words += u' Dolares Américanos'
+        if sum_frc == 1 or (str(sum_frc)[-1] == '1' and str(sum_frc)[-2] != '1'): # is the fraction sum one
+            if currency == 'LVL':
+                frc_in_words += u' santim'
+            elif currency == 'EUR' or currency == 'USD':
+                frc_in_words += u' Centavo'
+        else:
+            if currency == 'LVL':
+                frc_in_words += u' santims'
+            elif currency == 'EUR' or currency == 'USD' :
+                frc_in_words += u' Centavos'
     #------------------------------------
     if language == 'ru_RU' :
         if sum_cur == 1 or (str(sum_cur)[-1] == '1' and str(sum_cur)[-2] != '1'): # is the currency sum one
@@ -282,7 +310,7 @@
         lengthx = len(str(sum_integers))
         nrchunks = (lengthx / 3)
     if nrchunks < (float(lengthx) / 3) :
-        nrchunks+=1
+        nrchunks += 1
     inc = 1
     while inc <= nrchunks:
         startpos = (lengthx - inc * 3)
@@ -292,7 +320,7 @@
             startpos = 0
         chunk = str(sum_integers)[startpos : startpos + chunklength]
         #print str(startpos)+' '+str(chunklength)+' '+ chunk
-        wordified = wordify(chunk, inc-1, language)
+        wordified = wordify(chunk, inc - 1, language)
         inc += 1
         spacer = ''
         if len(diginwords) > 0 :
@@ -326,6 +354,16 @@
         daudzums = [u' hundred', u' thousand', u' million', u' billion']
         daudzumsx = daudzums
 
+    elif language == 'es':
+        skaitli = [u'Cero', u'Uno', u'Dos', u'Tres', u'Cuatro', u'Cinco', u'Seis',
+                   u'Siete', u'Ocho', u'Nueve']
+        skaitlix = [u'Cero', u'Diez', u'Veinte', u'Treinta', u'Cuarenta', u'Cincuenta', u'Sesenta',
+                    u'Setenta', u'Ochenta', u'Noventa']
+        skaitli_teens = [u'Diez', u'Once', u'Doce', u'Trece', u'Catorce',
+                         u'Quince', u'Diez y Seis', u'Diez y Siete', u'Diez y Ocho', u'Diez y Nueve']
+        daudzums = [u' Cien', u' Mil', u' Millon', u' Billon']
+        daudzumsx = daudzums
+
     elif language == 'ru_RU':
         skaitli = [u'ноль', u'один', u'два', u'три', u'четыре', u'пять', u'шесть',
                    u'семь', u'восемь', u'девять']
@@ -361,8 +399,9 @@
         digit1 = chunk[0 : 1]
         digit2 = chunk[1 : 2]
         digit3 = chunk[-1]
+    
     # processing zero
-    if chunklength == 1 and digit3  == '0' :
+    if chunklength == 1 and digit3 == '0' :
         return skaitli[0]
     # processing hundreds
     if chunklength == 3 :
@@ -371,11 +410,15 @@
                 words += daudzums[0]
             elif language == 'en_US' :
                 words += skaitli[int(digit1)] + daudzumsx[0]
+            elif language == 'es' :
+                words += skaitli[int(digit1)] + daudzumsx[0]
         else :
             if language == 'lv_LV' :
                 if int(digit1) > 1 : words += skaitli[int(digit1)] + daudzumsx[0]
             elif language == 'en_US' :
                 if int(digit1) > 1 : words += skaitli[int(digit1)] + daudzumsx[0]
+            elif language == 'es' :
+                if int(digit1) > 1 : words += skaitli[int(digit1)] + daudzumsx[0] + u'tos'
             elif language == 'ru_RU' :
                 if int(digit1) == 2 :
                     words += u'двести'
@@ -399,7 +442,7 @@
         spacer = ''
         if len(words) > 0 : spacer = ' '
         if digit2 == '1':
-	    if language == 'lv_LV' or language == 'en_US' or language == 'ru_RU' or language == 'uk_UA':
+	    if language == 'lv_LV' or language == 'en_US' or language == 'ru_RU' or language == 'uk_UA' or language == 'es':
                 words += spacer + skaitli_teens[int(digit3)]
         else:
             if language == 'lv_LV':
@@ -408,6 +451,11 @@
             elif language == 'en_US':
                 if int(digit2) > 1 and int(digit2) > 0:
                     words += spacer + skaitlix[int(digit2)] + u'ty'
+            elif language == 'es':
+                if int(digit2) > 1 and int(digit2) > 0:
+                    words += spacer + skaitlix[int(digit2)] 
+                if int(digit3) > 0:
+                    words += u' y'
 	    elif language == 'ru_RU':
                 if int(digit2) > 1 and int(digit2) < 4:
                     words += spacer + skaitlix[int(digit2)] + u'дцать'
@@ -430,7 +478,7 @@
     if chunklength > 0 and digit2 != '1' :
         spacer = ''
         if len(words) > 0: spacer = u' '
-        if language == 'lv_LV' or language == 'en_US':
+        if language == 'lv_LV' or language == 'en_US' or language == 'es':
 	    if int(digit3) > 0:
                 words += spacer + skaitli[int(digit3)]
 	elif language == 'ru_RU':
@@ -456,7 +504,7 @@
         if digit3 == '1' and chunknr > 0:
 	    return words + daudzums[chunknr]
         elif digit3 != '1' and chunknr > 0:
-	    if language == 'lv_LV' or language == 'en_US' :
+	    if language == 'lv_LV' or language == 'en_US' or language == 'es' :
 		return words + daudzumsx[chunknr]
 	    elif language == 'ru_RU' :
 		if (int(digit3) == 2 or int(digit3) == 3 or int(digit3) == 4) and digit2 != '1' :