diff options
| author | Christophe Simonis <chs@odoo.com> | 2017-10-17 12:09:58 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2017-10-17 12:09:58 +0200 |
| commit | fbdda5437a8ecb575ffbcac7961aad44c9cf4ff8 (patch) | |
| tree | 239d86ce417811cb4a0d8cbc3b278c81131f22b5 /odoo/tools | |
| parent | f4332118d3156e2ba2408c1d31ab92ee2066ef73 (diff) | |
| parent | cbca27d0052430743fe2c996964d7aca0ca682c9 (diff) | |
[MERGE] forward port branch 10.0 up to cbca27d0052
Diffstat (limited to 'odoo/tools')
| -rw-r--r-- | odoo/tools/translate.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/odoo/tools/translate.py b/odoo/tools/translate.py index fbef3443929..8d6703a5d17 100644 --- a/odoo/tools/translate.py +++ b/odoo/tools/translate.py @@ -949,7 +949,8 @@ def trans_generate(lang, modules, cr): def get_module_from_path(path): for (mp, rec) in path_list: mp = os.path.join(mp, '') - if rec and path.startswith(mp) and os.path.dirname(path) != mp: + dirname = os.path.join(os.path.dirname(path), '') + if rec and path.startswith(mp) and dirname != mp: path = path[len(mp):] return path.split(os.path.sep)[0] return 'base' # files that are not in a module are considered as being in 'base' module |