Merge lp://qastaging/~openerp-dev/openobject-server/6.1-opw-581687-cbi into lp://qastaging/openobject-server/6.1
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://qastaging/~openerp-dev/openobject-server/6.1-opw-581687-cbi |
| Merge into: | lp://qastaging/openobject-server/6.1 |
| Diff against target: |
20 lines (+2/-2) 1 file modified
openerp/tools/translate.py (+2/-2) |
| To merge this branch: | bzr merge lp://qastaging/~openerp-dev/openobject-server/6.1-opw-581687-cbi |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| OpenERP Core Team | Pending | ||
|
Review via email:
|
|||
Description of the change
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)
-
[FIX] Syncing the translations on operating systems that do not use / as file separator will now no longer create duplicate translation entries
