archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Some i18n tools fixes (I'm ashamed...), and merge func for I18nMessages objects.

Browse Source
This commit is contained in:
Bastien Montagne
2013-04-18 15:26:22 +00:00
parent 6db3375e4f
commit 01ffbab8f5
1 changed files with 27 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
release/scripts/modules/bl_i18n_utils/utils.py
View File

@@ -132,7 +132,7 @@ def find_best_isocode_matches(uid, iso_codes):
return tuple(e[0] for e in sorted((e for e in tmp if e[1] is not ... and e[1] >= 0), key=lambda e: e[1])) return tuple(e[0] for e in sorted((e for e in tmp if e[1] is not ... and e[1] >= 0), key=lambda e: e[1]))
def get_po_files_from_dir(root_dir, langs=set()) def get_po_files_from_dir(root_dir, langs=set()):
""" """
Yield tuples (uid, po_path) of translations for each po file found in the given dir, which should be either Yield tuples (uid, po_path) of translations for each po file found in the given dir, which should be either
a dir containing po files using language uid's as names (e.g. fr.po, es_ES.po, etc.), or a dir containing po files using language uid's as names (e.g. fr.po, es_ES.po, etc.), or
@@ -140,12 +140,13 @@ def get_po_files_from_dir(root_dir, langs=set())
""" """
found_uids = set() found_uids = set()
for p in os.listdir(root_dir): for p in os.listdir(root_dir):
uid = po_file = None uid = None
if p.endswith(".po") and os.path.isfile(p): po_file = os.path.join(root_dir, p)
print(p)
if p.endswith(".po") and os.path.isfile(po_file):
uid = p[:-3] uid = p[:-3]
if langs and uid not in langs: if langs and uid not in langs:
continue continue
po_file = os.path.join(root_dir, p)
elif os.path.isdir(p): elif os.path.isdir(p):
uid = p uid = p
if langs and uid not in langs: if langs and uid not in langs:
@@ -489,9 +490,27 @@ class I18nMessages:
for k, t in zip(keys, trans): for k, t in zip(keys, trans):
self.msgs[k].msgstr = t self.msgs[k].msgstr = t
def merge(self, replace=False, *args): def merge(self, msgs, replace=False):
# TODO """
pass Merge translations from msgs into self, following those rules:
* If a msg is in self and not in msgs, keep self untouched.
* If a msg is in msgs and not in self, skip it.
* Else (msg both in self and msgs):
* If self is not translated and msgs is translated or fuzzy, replace by msgs.
* If self is fuzzy, and msgs is translated, replace by msgs.
* If self is fuzzy, and msgs is fuzzy, and replace is True, replace by msgs.
* If self is translated, and msgs is translated, and replace is True, replace by msgs.
* Else, skip it!
"""
for k, m in msgs.msgs.items():
if k not in self.msgs:
continue
sm = self.msgs[k]
if (sm.is_commented or m.is_commented or not m.msgstr):
continue
if (not sm.msgstr or replace or (sm.is_fuzzy and (not m.is_fuzzy or replace))):
sm.msgstr = m.msgstr
sm.is_fuzzy = m.is_fuzzy
def update(self, ref, use_similar=None, keep_old_commented=True): def update(self, ref, use_similar=None, keep_old_commented=True):
""" """
@@ -1379,7 +1398,7 @@ class I18n:
translations = self.trans.keys() - {self.settings.PARSER_TEMPLATE_ID, self.settings.PARSER_PY_ID} translations = self.trans.keys() - {self.settings.PARSER_TEMPLATE_ID, self.settings.PARSER_PY_ID}
if langs: if langs:
translations &= langs translations &= langs
translations = [('"' + lng + '"', " " * (len(lng) + 4), self.trans[lng]) for lng in sorted(translations)] translations = [('"' + lng + '"', " " * (len(lng) + 6), self.trans[lng]) for lng in sorted(translations)]
print(k for k in keys.keys()) print(k for k in keys.keys())
for key in keys.keys(): for key in keys.keys():
if ref.msgs[key].is_commented: if ref.msgs[key].is_commented: