Odoo Server (MOVED TO GITHUB)

Merge lp:~openerp-dev/openobject-server/trunk-bug-826623-gpa into lp:openobject-server

  1. trunk-bug-826623-gpa
  2. Merge into trunk
Proposed by gpa(OpenERP)
Status: Merged
Merged at revision: 3622
Proposed branch: lp:~openerp-dev/openobject-server/trunk-bug-826623-gpa
Merge into: lp:openobject-server
Diff against target: 53 lines (+12/-3)
2 files modified
openerp/addons/base/module/wizard/base_import_language.py (+11/-3)
openerp/addons/base/module/wizard/base_import_language_view.xml (+1/-0)
To merge this branch: bzr merge lp:~openerp-dev/openobject-server/trunk-bug-826623-gpa
Reviewer Review Type Date Requested Status
Olivier Dony (Odoo) Approve
Andriy Podanenko (community) Approve
Naresh(OpenERP) (community) Approve
Review via email: mp+71987@code.launchpad.net

Description of the change

fixed problem import translation do not work after another import

To post a comment you must log in.
Revision history for this message
Naresh(OpenERP) (nch-openerp) :
review: Approve
Revision history for this message
Andriy Podanenko (podarokua) wrote :

work for me

review: Approve
Revision history for this message
Olivier Dony (Odoo) (odo-openerp) wrote :

Thanks for the feedback about the fix Andriy, very much appreciated.
This was merged in trunk at revision 3622 rev-id: <email address hidden>

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'openerp/addons/base/module/wizard/base_import_language.py'
2--- openerp/addons/base/module/wizard/base_import_language.py 2011-01-06 13:06:54 +0000
3+++ openerp/addons/base/module/wizard/base_import_language.py 2011-08-18 06:31:08 +0000
4@@ -35,9 +35,13 @@
5 'name': fields.char('Language Name',size=64 , required=True),
6 'code': fields.char('Code (eg:en__US)',size=5 , required=True),
7 'data': fields.binary('File', required=True),
8+ 'overwrite': fields.boolean('Overwrite Existing Terms'),
9+ }
10+ _defaults = {
11+ 'overwrite': False
12 }
13
14- def import_lang(self, cr, uid, ids, context):
15+ def import_lang(self, cr, uid, ids, context=None):
16 """
17 Import Language
18 @param cr: the current row, from the database cursor.
19@@ -45,8 +49,12 @@
20 @param ids: the ID or list of IDs
21 @param context: A standard dictionary
22 """
23-
24+ if context is None:
25+ context = {}
26+
27 import_data = self.browse(cr, uid, ids)[0]
28+ if import_data.overwrite:
29+ context = {'overwrite': True}
30 fileobj = TemporaryFile('w+')
31 fileobj.write(base64.decodestring(import_data.data))
32
33@@ -56,7 +64,7 @@
34 fileformat = first_line.endswith("type,name,res_id,src,value") and 'csv' or 'po'
35 fileobj.seek(0)
36
37- tools.trans_load_data(cr, fileobj, fileformat, import_data.code, lang_name=import_data.name)
38+ tools.trans_load_data(cr, fileobj, fileformat, import_data.code, lang_name=import_data.name, context=context)
39 tools.trans_update_res_ids(cr)
40 fileobj.close()
41 return {}
42
43=== modified file 'openerp/addons/base/module/wizard/base_import_language_view.xml'
44--- openerp/addons/base/module/wizard/base_import_language_view.xml 2010-11-12 11:08:42 +0000
45+++ openerp/addons/base/module/wizard/base_import_language_view.xml 2011-08-18 06:31:08 +0000
46@@ -27,6 +27,7 @@
47 <field name="name" width="200"/>
48 <field name="code"/>
49 <field name="data" colspan="4"/>
50+ <field name="overwrite"/>
51 </group>
52 <group colspan="8" col="8">
53 <separator string="" colspan="8"/>