diff options
| author | Christophe Simonis <chs@odoo.com> | 2017-10-17 11:42:05 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2017-10-17 11:42:05 +0200 |
| commit | cbca27d0052430743fe2c996964d7aca0ca682c9 (patch) | |
| tree | 09a4e7e6a8e1c0cde24d464e595b786e3ea247ad /odoo | |
| parent | 25725eae578d126f79c69f72a7a4e3b4136b4e5d (diff) | |
| parent | d5c0cae60b5cf7834ca9d669f9408a7c55694ff9 (diff) | |
[MERGE] forward port branch 9.0 up to d5c0cae60b5
Diffstat (limited to 'odoo')
| -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 ebc3dd616f7..454d6459219 100644 --- a/odoo/tools/translate.py +++ b/odoo/tools/translate.py @@ -935,7 +935,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 |