Pier Angelo Vendrame pushed to branch tor-browser-128.5.0esr-14.5-1 at The Tor
Project / Applications / Tor Browser
Commits:
14a0cbe0 by Henry Wilkes at 2024-12-05T14:26:15+00:00
fixup! Add CI for Tor Browser
Bug 43345: Exclude android strings from the legacy branch.
- - - - -
e4b64479 by Henry Wilkes at 2024-12-05T14:26:54+00:00
fixup! Bug 42305: Add script to combine translation files across versions.
Bug 43345: Add an option to exclude contributions from the legacy branch
for some files.
- - - - -
2 changed files:
- .gitlab/ci/update-translations.yml
- tools/torbrowser/l10n/combine-translation-versions.py
Changes:
=====================================
.gitlab/ci/update-translations.yml
=====================================
@@ -41,7 +41,11 @@ combine-en-US-translations:
{ "name": "torConnect.properties", "branch": "tor-browser" },
{ "name": "torlauncher.properties", "branch": "tor-browser" },
{ "name": "base-browser.ftl", "branch": "base-browser" },
- { "name": "torbrowser_strings.xml", "branch":
"fenix-torbrowserstringsxml" }
+ {
+ "name": "torbrowser_strings.xml",
+ "branch": "fenix-torbrowserstringsxml",
+ "exclude-legacy": true
+ }
]'
TRANSLATION_INCLUDE_LEGACY: "true"
cache:
=====================================
tools/torbrowser/l10n/combine-translation-versions.py
=====================================
@@ -309,7 +309,7 @@ for file_dict in json.loads(args.files):
f"Will be unused in Tor Browser {current_branch.browser_version}!",
)
- if legacy_branch:
+ if legacy_branch and not file_dict.get("exclude-legacy", False):
legacy_file = legacy_branch.get_file(name, where_dirs)
if legacy_file is not None and current_file is None and stable_file is
None:
logger.warning(f"{name} still exists in the legacy branch")
@@ -332,6 +332,8 @@ for file_dict in json.loads(args.files):
legacy_file.content,
f"Unused in Tor Browser {stable_branch.browser_version}!",
)
+ elif legacy_branch:
+ logger.info(f"Excluding legacy branch for {name}")
files_list.append(
{
View it on GitLab:
https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/fe2071262555d4b82692ebd9f88e917ccfb32c86...e4b644798c1ff396a62cc44e7dabc213a6bdcde2
--
View it on GitLab:
https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/fe2071262555d4b82692ebd9f88e917ccfb32c86...e4b644798c1ff396a62cc44e7dabc213a6bdcde2
You're receiving this email because of your account on gitlab.torproject.org.
_______________________________________________
tbb-commits mailing list -- tbb-commits@lists.torproject.org
To unsubscribe send an email to tbb-commits-le...@lists.torproject.org
