This commit implements described in the #104573. The goal is to fix the confusion of the submodule hashes change, which are not ideal for any of the supported git-module configuration (they are either always visible causing confusion, or silently staged and committed, also causing confusion). This commit replaces submodules with a checkout of addons and addons_contrib, covered by the .gitignore, and locale and developer tools are moved to the main repository. This also changes the paths: - /release/scripts are moved to the /scripts - /source/tools are moved to the /tools - /release/datafiles/locale is moved to /locale This is done to avoid conflicts when using bisect, and also allow buildbot to automatically "recover" wgen building older or newer branches/patches. Running `make update` will initialize the local checkout to the changed repository configuration. Another aspect of the change is that the make update will support Github style of remote organization (origin remote pointing to thy fork, upstream remote pointing to the upstream blender/blender.git). Pull Request #104755
131 lines
5.3 KiB
Python
Executable File
131 lines
5.3 KiB
Python
Executable File
#!/usr/bin/env python3
|
||
# SPDX-License-Identifier: GPL-2.0-or-later
|
||
|
||
# Merge one or more .po files into the first dest one.
|
||
# If a msgkey 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.
|
||
# The fuzzy flag is removed if necessary.
|
||
# All other comments are never modified.
|
||
# However, commented messages in dst will always remain commented, and commented messages are
|
||
# never merged from sources.
|
||
|
||
import sys
|
||
|
||
if __package__ is None:
|
||
import settings
|
||
import 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=(
|
||
"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"
|
||
"The fuzzy flag is removed if necessary.\n"
|
||
"All other comments are never modified.\n"
|
||
"Commented messages in dst will always remain commented, and commented messages are never merged "
|
||
"from sources."
|
||
),
|
||
)
|
||
parser.add_argument('-s', '--stats', action="store_true", help="Show statistics info.")
|
||
parser.add_argument('-r', '--replace', action="store_true",
|
||
help="Replace existing messages of same \"level\" already in dest po.")
|
||
parser.add_argument('dst', metavar='dst.po', help="The dest po into which merge the others.")
|
||
parser.add_argument('src', metavar='src.po', nargs='+', help="The po's to merge into the dst.po one.")
|
||
args = parser.parse_args()
|
||
|
||
ret = 0
|
||
done_msgkeys = set()
|
||
done_fuzzy_msgkeys = set()
|
||
nbr_merged = 0
|
||
nbr_replaced = 0
|
||
nbr_added = 0
|
||
nbr_unfuzzied = 0
|
||
|
||
dst_msgs = utils.I18nMessages(kind='PO', src=args.dst)
|
||
if dst_msgs.parsing_errors:
|
||
print("Dest po is BROKEN, aborting.")
|
||
return 1
|
||
if args.stats:
|
||
print("Dest po, before merging:")
|
||
dst_msgs.print_stats(prefix="\t")
|
||
# If we don’t want to replace existing valid translations, pre-populate done_msgkeys and done_fuzzy_msgkeys.
|
||
if not args.replace:
|
||
done_msgkeys = dst_msgs.trans_msgs.copy()
|
||
done_fuzzy_msgkeys = dst_msgs.fuzzy_msgs.copy()
|
||
for po in args.src:
|
||
msgs = utils.I18nMessages(kind='PO', src=po)
|
||
if msgs.parsing_errors:
|
||
print("\tSrc po {} is BROKEN, skipping.".format(po))
|
||
ret = 1
|
||
continue
|
||
print("\tMerging {}...".format(po))
|
||
if args.stats:
|
||
print("\t\tMerged po stats:")
|
||
msgs.print_stats(prefix="\t\t\t")
|
||
for msgkey, msg in msgs.msgs.items():
|
||
msgctxt, msgid = msgkey
|
||
# This msgkey has already been completely merged, or is a commented one,
|
||
# or the new message is commented, skip it.
|
||
if msgkey in (done_msgkeys | dst_msgs.comm_msgs | msgs.comm_msgs):
|
||
continue
|
||
is_ttip = msg.is_tooltip
|
||
# New messages does not yet exists in dest.
|
||
if msgkey not in dst_msgs.msgs:
|
||
dst_msgs[msgkey] = msgs.msgs[msgkey]
|
||
if msgkey in msgs.fuzzy_msgs:
|
||
done_fuzzy_msgkeys.add(msgkey)
|
||
dst_msgs.fuzzy_msgs.add(msgkey)
|
||
elif msgkey in msgs.trans_msgs:
|
||
done_msgkeys.add(msgkey)
|
||
dst_msgs.trans_msgs.add(msgkey)
|
||
nbr_added += 1
|
||
# From now on, the new messages is already in dst.
|
||
# New message is neither translated nor fuzzy, skip it.
|
||
elif msgkey not in (msgs.trans_msgs | msgs.fuzzy_msgs):
|
||
continue
|
||
# From now on, the new message is either translated or fuzzy!
|
||
# The new message is translated.
|
||
elif msgkey in msgs.trans_msgs:
|
||
dst_msgs.msgs[msgkey].msgstr = msg.msgstr
|
||
done_msgkeys.add(msgkey)
|
||
done_fuzzy_msgkeys.discard(msgkey)
|
||
if msgkey in dst_msgs.fuzzy_msgs:
|
||
dst_msgs.fuzzy_msgs.remove(msgkey)
|
||
nbr_unfuzzied += 1
|
||
if msgkey not in dst_msgs.trans_msgs:
|
||
dst_msgs.trans_msgs.add(msgkey)
|
||
else:
|
||
nbr_replaced += 1
|
||
nbr_merged += 1
|
||
# The new message is fuzzy, org one is fuzzy too, and this msgkey has not yet been merged.
|
||
elif msgkey not in (dst_msgs.trans_msgs | done_fuzzy_msgkeys):
|
||
dst_msgs[msgkey].msgstr = msg.msgstr
|
||
done_fuzzy_msgkeys.add(msgkey)
|
||
dst_msgs.fuzzy_msgs.add(msgkey)
|
||
nbr_merged += 1
|
||
nbr_replaced += 1
|
||
|
||
dst_msgs.write(kind='PO', dest=args.dst)
|
||
|
||
print("Merged completed. {} messages were merged (among which {} were replaced), {} were added, "
|
||
"{} were \"un-fuzzied\".".format(nbr_merged, nbr_replaced, nbr_added, nbr_unfuzzied))
|
||
if args.stats:
|
||
dst_msgs.update_info()
|
||
print("Final merged po stats:")
|
||
dst_msgs.print_stats(prefix="\t")
|
||
return ret
|
||
|
||
|
||
if __name__ == "__main__":
|
||
print("\n\n *** Running {} *** \n".format(__file__))
|
||
sys.exit(main())
|