Merge lp:~openerp-dev/openobject-server/6.1-opw-581687-cbi into lp:openobject-server/6.1

[Chris Biersbach (OpenERP)]

The issue that was encountered: When syncing the translations on windows, duplicate entries were created for the terms of type "code", with the slash replaced by a backslash. (ex.: x/y/z -> x\y\z)

The reason: We use the OS path separator when generating the translations. The preloaded translations always have a slash, if you sync on windows, the separator is a backslash and you will thus get the new translations with the backslash, because it is considered as a different entry from the one with slashes.

The fix: I changed the method that generates the paths for code terms to always use slashes, regardless of the OS.
That way, no more duplicated entries are created.

Unmerged revisions

4320. By Chris Biersbach (OpenERP) on 2012-12-19

[FIX] Syncing the translations on operating systems that do not use / as file separator will now no longer create duplicate translation entries

=== modified file 'openerp/tools/translate.py'
--- openerp/tools/translate.py	2012-10-08 11:09:46 +0000
+++ openerp/tools/translate.py	2012-12-20 08:30:33 +0000
@@ -827,7 +827,7 @@
                 # now, since we did a binary read of a python source file, we
                 # have to expand pythonic escapes like the interpreter does.
                 src = src.decode('string_escape')
-                push_translation(module, terms_type, frelativepath, code_line, encode(src))
+                push_translation(module, terms_type, '/'.join(frelativepath.split(os.path.sep)), code_line, encode(src))
                 code_line += i.group(1).count('\n')
                 code_offset = i.end() # we have counted newlines up to the match end
 
@@ -843,7 +843,7 @@
                     src = join_quotes.sub(r'\1', src)
                 code_line += code_string[code_offset:i.start(1)].count('\n')
                 src = src.decode('string_escape')
-                push_translation(module, terms_type, frelativepath, code_line, encode(src))
+                push_translation(module, terms_type, '/'.join(frelativepath.split(os.path.sep)), code_line, encode(src))
                 code_line += i.group(1).count('\n')
                 code_offset = i.end() # we have counted newlines up to the match end