From 3c8938fdc39b16fac8ae00ef8c7d40d34985b538 Mon Sep 17 00:00:00 2001
From: "P. Christeas" <p_christ@hol.gr>
Date: Wed, 28 Jan 2009 15:44:53 +0200
Subject: [PATCH] Improve the language loading, when locales fail.

bzr revid: p_christ@hol.gr-20090128134453-cwa212xxqmfowv95
---
 bin/tools/translate.py | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/bin/tools/translate.py b/bin/tools/translate.py
index e9841fcc6e1..d840560ef2b 100644
--- a/bin/tools/translate.py
+++ b/bin/tools/translate.py
@@ -555,7 +555,7 @@ def trans_load_data(db_name, fileobj, fileformat, lang, strict=False, lang_name=
         lc, encoding = locale.getdefaultlocale()
         if not encoding:
             encoding = 'UTF-8'
-        if encoding == 'utf':
+        if encoding == 'utf' or encoding == 'UTF8':
             encoding = 'UTF-8'
         if encoding == 'cp1252':
             encoding= '1252'
@@ -564,6 +564,8 @@ def trans_load_data(db_name, fileobj, fileformat, lang, strict=False, lang_name=
         if encoding == 'latin1':
             encoding= 'latin9'
 
+	# this block temporarily sets the locale to the requested lang, so that
+	# some defaults are read from it.
         try:
             if os.name == 'nt':
                 locale.setlocale(locale.LC_ALL, str(_LOCALE2WIN32.get(lang, lang) + '.' + encoding))
@@ -571,8 +573,13 @@ def trans_load_data(db_name, fileobj, fileformat, lang, strict=False, lang_name=
                 locale.setlocale(locale.LC_ALL, str(lang + '.' + encoding))
         except Exception:
             netsvc.Logger().notifyChannel(' ', netsvc.LOG_WARNING,
-                    'unable to set locale "%s"' % (lang)) 
-            
+                    'unable to set locale "%s"' % (str(lang + '.' + encoding)))
+	    # Now, the default locale is still active, so the values can be
+	    # read from that.
+	    try:
+		locale.setlocale(locale.LC_ALL, str(lc + '.' + encoding))
+	    except:
+		pass
 
         if not ids:
             if not lang_name:
@@ -597,7 +604,8 @@ def trans_load_data(db_name, fileobj, fileformat, lang, strict=False, lang_name=
                                           'decimal_point' : str(locale.nl_langinfo(locale.RADIXCHAR)),
                                           'thousands_sep' : str(locale.nl_langinfo(locale.THOUSEP))
                                             })
-        locale.resetlocale(locale.LC_ALL)
+	# Here we try to reset the locale regardless.
+        locale.setlocale(locale.LC_ALL, str(lc + '.' + encoding))
         lang_ids = lang_obj.search(cr, uid, [])
         langs = lang_obj.read(cr, uid, lang_ids)
         ls = map(lambda x: (x['code'],x['name']), langs)
@@ -691,6 +699,12 @@ def trans_load_data(db_name, fileobj, fileformat, lang, strict=False, lang_name=
     except IOError:
         filename = '[lang: %s][format: %s]' % (lang or 'new', fileformat)
         logger.notifyChannel("init", netsvc.LOG_ERROR, "couldn't read translation file %s" % (filename,))
+	cr.commit()
+	cr.close()
+    except:
+	cr.commit()
+	cr.close()
+	raise
 
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: