[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[tor-commits] [Git][tpo/applications/tor-browser-build][main] Bug 40922: Use base-browser.ftl instead of languageNotification.ftl.

Title: GitLab

richard pushed to branch main at The Tor Project / Applications / tor-browser-build

Commits:

  • be45d31e
    by Pier Angelo Vendrame at 2023-08-17T19:39:26+00:00 
    Bug 40922: Use base-browser.ftl instead of languageNotification.ftl.

We have finally renamed the file for Base Browser strings, and moved it
to the same branch as other Base Browser string files.
So, we needed to change the references to the Fluent file (we have one
in Firefox's build file), and then we could drop the references to the
basebrowser-newidentity branch, since it is not used anymore.

5 changed files:

Changes:

  • .gitlab/issue_templates/Release Prep - Mullvad Browser Alpha.md
    ... ... @@ -46,7 +46,6 @@ Mullvad Browser Alpha (and Nightly) are on the `main` branch
    46 46 
       - [ ] Update `projects/translation/config`:
    47 47 
         - [ ] run `make list_translation_updates-alpha` to get updated hashes
    48 48 
         - [ ] `steps/base-browser/git_hash` : update with `HEAD` commit of project's `base-browser` branch
    49 
    -    - [ ] `steps/base-browser-fluent/git_hash` : update with `HEAD` commit of project's `basebrowser-newidentityftl` branch
    50 49 
         - [ ] `steps/mullvad-browser/git_hash` : update with `HEAD` commit of project's `mullvad-browser` branch
    51 50 
     - [ ] Update common build configs
    52 51 
       - [ ] Check for NoScript updates here : https://addons.mozilla.org/en-US/firefox/addon/noscript

  • .gitlab/issue_templates/Release Prep - Tor Browser Alpha.md
    ... ... @@ -46,7 +46,6 @@ Tor Browser Alpha (and Nightly) are on the `main` branch
    46 46 
       - [ ] Update `projects/translation/config`:
    47 47 
         - [ ] run `make list_translation_updates-alpha` to get updated hashes
    48 48 
         - [ ] `steps/base-browser/git_hash` : update with `HEAD` commit of project's `base-browser` branch
    49 
    -    - [ ] `steps/base-browser-fluent/git_hash` : update with `HEAD` commit of project's `basebrowser-newidentityftl` branch
    50 49 
         - [ ] `steps/tor-browser/git_hash` : update with `HEAD` commit of project's `tor-browser` branch
    51 50 
         - [ ] `steps/fenix/git_hash` : update with `HEAD` commit of project's `fenix-torbrowserstringsxml` branch
    52 51 
     - [ ] Update Android-specific build configs

  • projects/firefox/build
    ... ... @@ -116,24 +116,13 @@ mkdir "$HOME/.mozbuild"
    116 116 
       pushd "$rootdir/translation-base-browser"
    117 117 
       ln -s ja ja-JP-mac
    118 118 
       for lang in $supported_locales; do
    119 
    -    # Please notice that Fluent and DTDs use different directories in
    120 
    -    # l10n-central! This is something we have to keep in mind when we will join
    121 
    -    # the two branches!
    119 
    +    # Fluent
    120 
    +    mv $lang/base-browser.ftl "$l10ncentral/$lang/browser/browser/"
    121 
    +    # Properties (they use a different directory)
    122 122 
         mv $lang/* "$l10ncentral/$lang/browser/chrome/browser/"
    123 123 
       done
    124 124 
       popd
    125 125
    126 
    -  tar -C "$rootdir" -xf "$rootdir/[% c('input_files_by_name/translation-base-browser-fluent') %]"
    127 
    -  pushd "$rootdir/translation-base-browser-fluent"
    128 
    -  ln -s ja ja-JP-mac
    129 
    -  # TODO: These two sources will be unified eventually; at that point, this link
    130 
    -  # will go away, too.
    131 
    -  ln -s es es-ES
    132 
    -  for lang in $supported_locales; do
    133 
    -    mv $lang/languageNotification.ftl "$l10ncentral/$lang/browser/browser/"
    134 
    -  done
    135 
    -  popd
    136 
    -
    137 126 
       [% IF c("var/tor-browser") -%]
    138 127 
         # We will have to keep the torbutton.jar until we stop using dtds, because
    139 128 
         # if we move them to the browser locale directory, browser.xhtml is not

  • projects/firefox/config
    ... ... @@ -191,10 +191,6 @@ input_files:
    191 191 
         name: translation-base-browser
    192 192 
         pkg_type: base-browser
    193 193 
         enable: '[% c("var/has_l10n") %]'
    194 
    -  - project: translation
    195 
    -    name: translation-base-browser-fluent
    196 
    -    pkg_type: base-browser-fluent
    197 
    -    enable: '[% c("var/has_l10n") %]'
    198 194 
       - project: translation
    199 195 
         name: translation-tor-browser
    200 196 
         pkg_type: tor-browser

  • projects/translation/config
    ... ... @@ -16,12 +16,6 @@ steps:
    16 16 
         targets:
    17 17 
           nightly:
    18 18 
             git_hash: 'base-browser'
    19 
    -  base-browser-fluent:
    20 
    -    base-browser-fluent: '[% INCLUDE build %]'
    21 
    -    git_hash: 72c0d47f55994b6d68e0239d9edd02d7ae7708ab
    22 
    -    targets:
    23 
    -      nightly:
    24 
    -        git_hash: 'basebrowser-newidentityftl'
    25 19 
       tor-browser:
    26 20 
         tor-browser: '[% INCLUDE build %]'
    27 21 
         git_hash: 2b885b2a6dfeaa046678133755639d6e26485754
    ... ... @@ -46,7 +40,7 @@ steps:
    46 40 
       list_updates:
    47 41 
         list_updates: |
    48 42 
           [%
    49 
    -        FOREACH component = [ 'base-browser', 'base-browser-fluent', 'tor-browser', 'mullvad-browser', 'fenix' ];
    43 
    +        FOREACH component = [ 'base-browser', 'tor-browser', 'mullvad-browser', 'fenix' ];
    50 44 
               branch = pc(project, 'git_hash', { step => component, target => [ 'nightly' ] });
    51 45 
               commit_hash = exec('git rev-parse ' _ branch, { git_hash => branch });
    52 46 
               IF commit_hash == pc(project, "git_hash", { step => component });

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications · Help 

    _______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits