forked from bartvdbraak/blender
Few minor fixes to i18n tools (mostly use ordered dicts too for "xgettexted" messages...).
This commit is contained in:
parent
459a2b38e0
commit
7b8dc4be0d
@ -117,9 +117,9 @@ def check_file(path, rel_path, messages):
|
||||
|
||||
|
||||
def py_xgettext(messages):
|
||||
with open(SRC_POTFILES) as src:
|
||||
forbidden = set()
|
||||
forced = set()
|
||||
with open(SRC_POTFILES) as src:
|
||||
for l in src:
|
||||
if l[0] == '-':
|
||||
forbidden.add(l[1:].rstrip('\n'))
|
||||
@ -133,8 +133,10 @@ def py_xgettext(messages):
|
||||
continue
|
||||
path = os.path.join(root, fname)
|
||||
rel_path = os.path.relpath(path, SOURCE_DIR)
|
||||
if rel_path in forbidden | forced:
|
||||
if rel_path in forbidden:
|
||||
continue
|
||||
elif rel_path in forced:
|
||||
forced.remove(rel_path)
|
||||
check_file(path, rel_path, messages)
|
||||
for path in forced:
|
||||
if os.path.exists(path):
|
||||
@ -250,7 +252,7 @@ def main():
|
||||
|
||||
print("Running fake py gettext…")
|
||||
# Not using any more xgettext, simpler to do it ourself!
|
||||
messages = {}
|
||||
messages = utils.new_messages()
|
||||
py_xgettext(messages)
|
||||
print("Finished, found {} messages.".format(len(messages)))
|
||||
|
||||
@ -268,7 +270,7 @@ def main():
|
||||
|
||||
# add messages collected automatically from RNA
|
||||
print("\tMerging RNA messages from {}…".format(FILE_NAME_MESSAGES))
|
||||
messages = {}
|
||||
messages = utils.new_messages()
|
||||
with open(FILE_NAME_MESSAGES, encoding="utf-8") as f:
|
||||
srcs = []
|
||||
context = ""
|
||||
|
@ -41,6 +41,10 @@ def is_tooltip(msgid):
|
||||
return len(msgid) > 30
|
||||
|
||||
|
||||
def new_messages():
|
||||
return getattr(collections, 'OrderedDict', dict)()
|
||||
|
||||
|
||||
def parse_messages(fname):
|
||||
"""
|
||||
Returns a tupple (messages, states, stats).
|
||||
@ -78,7 +82,7 @@ def parse_messages(fname):
|
||||
msgctxt_lines = []
|
||||
comment_lines = []
|
||||
|
||||
messages = getattr(collections, 'OrderedDict', dict)()
|
||||
messages = new_messages()
|
||||
translated_messages = set()
|
||||
fuzzy_messages = set()
|
||||
commented_messages = set()
|
||||
@ -282,7 +286,7 @@ def gen_empty_messages(blender_rev, time_str, year_str):
|
||||
"""Generate an empty messages & state data (only header if present!)."""
|
||||
header_key = ("", "")
|
||||
|
||||
messages = getattr(collections, 'OrderedDict', dict)()
|
||||
messages = new_messages()
|
||||
messages[header_key] = {
|
||||
"msgid_lines": [""],
|
||||
"msgctxt_lines": [],
|
||||
|
Loading…
Reference in New Issue
Block a user