Pier Angelo Vendrame pushed to branch tor-browser-128.5.0esr-14.5-1 at The Tor Project / Applications / Tor Browser

Commits:

2 changed files:

Changes:

  • .gitlab/ci/update-translations.yml
    ... ... @@ -41,7 +41,11 @@ combine-en-US-translations:
    41 41
           { "name": "torConnect.properties", "branch": "tor-browser" },
    
    42 42
           { "name": "torlauncher.properties", "branch": "tor-browser" },
    
    43 43
           { "name": "base-browser.ftl", "branch": "base-browser" },
    
    44
    -      { "name": "torbrowser_strings.xml", "branch": "fenix-torbrowserstringsxml" }
    
    44
    +      {
    
    45
    +        "name": "torbrowser_strings.xml",
    
    46
    +        "branch": "fenix-torbrowserstringsxml",
    
    47
    +        "exclude-legacy": true
    
    48
    +      }
    
    45 49
         ]'
    
    46 50
         TRANSLATION_INCLUDE_LEGACY: "true"
    
    47 51
       cache:
    

  • tools/torbrowser/l10n/combine-translation-versions.py
    ... ... @@ -309,7 +309,7 @@ for file_dict in json.loads(args.files):
    309 309
             f"Will be unused in Tor Browser {current_branch.browser_version}!",
    
    310 310
         )
    
    311 311
     
    
    312
    -    if legacy_branch:
    
    312
    +    if legacy_branch and not file_dict.get("exclude-legacy", False):
    
    313 313
             legacy_file = legacy_branch.get_file(name, where_dirs)
    
    314 314
             if legacy_file is not None and current_file is None and stable_file is None:
    
    315 315
                 logger.warning(f"{name} still exists in the legacy branch")
    
    ... ... @@ -332,6 +332,8 @@ for file_dict in json.loads(args.files):
    332 332
                 legacy_file.content,
    
    333 333
                 f"Unused in Tor Browser {stable_branch.browser_version}!",
    
    334 334
             )
    
    335
    +    elif legacy_branch:
    
    336
    +        logger.info(f"Excluding legacy branch for {name}")
    
    335 337
     
    
    336 338
         files_list.append(
    
    337 339
             {