GitLab

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.

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

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

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

@@ -191,10 +191,6 @@ input_files:
      name: translation-base-browser
      pkg_type: base-browser
      enable: '[% c("var/has_l10n") %]'
 -  - project: translation
 -    name: translation-base-browser-fluent
 -    pkg_type: base-browser-fluent
 -    enable: '[% c("var/has_l10n") %]'
    - project: translation
      name: translation-tor-browser
      pkg_type: tor-browser

@@ -16,12 +16,6 @@ steps:
      targets:
        nightly:
          git_hash: 'base-browser'
 -  base-browser-fluent:
 -    base-browser-fluent: '[% INCLUDE build %]'
 -    git_hash: 72c0d47f55994b6d68e0239d9edd02d7ae7708ab
 -    targets:
 -      nightly:
 -        git_hash: 'basebrowser-newidentityftl'
    tor-browser:
      tor-browser: '[% INCLUDE build %]'
      git_hash: 2b885b2a6dfeaa046678133755639d6e26485754
@@ -46,7 +40,7 @@ steps:
    list_updates:
      list_updates: |
        [%
 -        FOREACH component = [ 'base-browser', 'base-browser-fluent', 'tor-browser', 'mullvad-browser', 'fenix' ];
 +        FOREACH component = [ 'base-browser', 'tor-browser', 'mullvad-browser', 'fenix' ];
            branch = pc(project, 'git_hash', { step => component, target => [ 'nightly' ] });
            commit_hash = exec('git rev-parse ' _ branch, { git_hash => branch });
            IF commit_hash == pc(project, "git_hash", { step => component });

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

Commits:

5 changed files:

Changes: