diff options
author | Roman Pogribnyi <pogribnyi@gmail.com> | 2015-03-15 21:57:06 +0300 |
---|---|---|
committer | Roman Pogribnyi <pogribnyi@gmail.com> | 2015-03-15 21:57:06 +0300 |
commit | 5c64aa25541b973db4ec90c97e30b02d09b00075 (patch) | |
tree | 0cd3a8912d8b0cbfc5fe0bb94a2a42751e98dcd6 /release/scripts/modules/bl_i18n_utils/merge_po.py | |
parent | 2a1a6bc5720a4310e42a67754998e0480bf7c59b (diff) | |
parent | 225027ce5dea3785626908b58b01fb3959cf8362 (diff) |
Merge branch 'master' into soc-2014-fluid
Diffstat (limited to 'release/scripts/modules/bl_i18n_utils/merge_po.py')
-rwxr-xr-x | release/scripts/modules/bl_i18n_utils/merge_po.py | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/release/scripts/modules/bl_i18n_utils/merge_po.py b/release/scripts/modules/bl_i18n_utils/merge_po.py index d7dade22ffd..2fda42199bb 100755 --- a/release/scripts/modules/bl_i18n_utils/merge_po.py +++ b/release/scripts/modules/bl_i18n_utils/merge_po.py @@ -30,17 +30,20 @@ import sys -try: +if __package__ is None: import settings import utils -except: - from . import (settings, utils) +else: + from . import ( + settings, + utils, + ) # XXX This is a quick hack to make it work with new I18n... objects! To be reworked! def main(): import argparse - parser = argparse.ArgumentParser(description="" + parser = argparse.ArgumentParser(description= "Merge one or more .po files into the first dest one.\n" "If a msgkey (msgctxt, msgid) is present in more than one merged po, the one in the first file " "wins, unless it’s marked as fuzzy and one later is not.\n" |