[IMP] base: improved import language wizard

- more user-friendly error
- proper file format check

1 files changed, 12 insertions, 3 deletions

diff --git a/openerp/addons/base/module/wizard/base_import_language.py b/openerp/addons/base/module/wizard/base_import_language.py
index f4108094207..0a5cc592651 100644
--- a/openerp/addons/base/module/wizard/base_import_language.py
+++ b/openerp/addons/base/module/wizard/base_import_language.py
@@ -1,11 +1,18 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
+import os
 import base64
+import logging
 from tempfile import TemporaryFile
 
 from openerp import tools
 from openerp.osv import osv, fields
+from openerp.exceptions import UserError
+from openerp.tools.translate import _
+
+_logger = logging.getLogger(__name__)
+
 
 class base_language_import(osv.osv_memory):
     """ Language Import """
@@ -16,6 +23,7 @@ class base_language_import(osv.osv_memory):
         'name': fields.char('Language Name', required=True),
         'code': fields.char('ISO Code', size=5, help="ISO Language and Country code, e.g. en_US", required=True),
         'data': fields.binary('File', required=True),
+        'filename': fields.char('File Name', required=True),
         'overwrite': fields.boolean('Overwrite Existing Terms',
                                     help="If you enable this option, existing translations (including custom ones) "
                                          "will be overwritten and replaced by those in this file"),
@@ -33,11 +41,12 @@ class base_language_import(osv.osv_memory):
     
             # now we determine the file format
             fileobj.seek(0)
-            first_line = fileobj.readline().strip().replace('"', '').replace(' ', '')
-            fileformat = first_line.endswith("type,name,res_id,src,value") and 'csv' or 'po'
-            fileobj.seek(0)
+            fileformat = os.path.splitext(this.filename)[-1][1:].lower()
     
             tools.trans_load_data(cr, fileobj, fileformat, this.code, lang_name=this.name, context=context)
+        except Exception, e:
+            _logger.exception('File unsuccessfully imported, due to format mismatch.')
+            raise UserError(_('File not imported due to format mismatch or a malformed file. (Valid formats are .csv, .po, .pot)\n\nTechnical Details:\n%s') % tools.ustr(e))
         finally:
             fileobj.close()
         return True