Feature #16045

Clean-up: remove obsolete Thunderbird check

Added by CyrilBrulebois 2018-10-12 10:46:19 . Updated 2019-03-20 14:29:18 .

Status:
Resolved
Priority:
Normal
Assignee:
CyrilBrulebois
Category:
Target version:
Start date:
2018-10-12
Due date:
% Done:

100%

Feature Branch:
bugfix-16422-thunderbird-60.5.1
Type of work:
Code
Blueprint:

Starter:
Affected tool:
Email Client
Deliverable for:

Description

During the preparations of Thunderbird 60, we noticed that the language packs had a strange firefox.mozilla.org suffix, which could turn into the more normal-looking thunderbird.mozilla.org one. We added a check because we had some local code to try and enable localization again:

commit ad91a77ee8cc84ca4ac212da7f0a77b606224863
Author: Cyril Brulebois <cyril@debamax.com>
Date:   Wed Aug 15 11:18:53 2018 +0200

    Thunderbird: check the lang packs are suffixed @firefox.mozilla.org (refs: <del><a class='issue tracker-2 status-3 priority-4 priority-default closed child' href='/code/issues/15091' title='Upgrade to Thunderbird 60'>Feature #15091</a></del>).

    It was slightly surprising to spot @firefox.mozilla.org as a suffix
    instead of the traditional @thunderbird.mozilla.org one. This was
    reported to Debian#906176 (https://bugs.debian.org/906176).

    Let's check how many language packages are found with the suffix
    used in tails-shell-library/thunderbird.sh, to make sure l10n has
    a chance to work.

but we don’t need this anymore since:

commit 25c302e2449c20970bc93c11cadbafc09c04fe68
Author: anonym <anonym@riseup.net>
Date:   Tue Oct 2 17:55:19 2018 +0200

    Thunderbird: get locale from environment via intl.locale.requested.

    It has replaced intl.locale.matchOS.

    Fix-committed: <del><a class='issue tracker-1 status-3 priority-4 priority-default closed child' href='/code/issues/15942' title='Thunderbird is displayed in English despite different system language'>Bug #15942</a></del>

and:

commit 0c2bfb6ee80b91d6306944ca3c1dcd123cb9772c
Author: Cyril Brulebois <cyril@debamax.com>
Date:   Mon Oct 1 16:55:16 2018 +0200

    Revert "Thunderbird: Import locale selection handling from Tor Browser (refs: <del><a class='issue tracker-2 status-3 priority-4 priority-default closed child' href='/code/issues/15091' title='Upgrade to Thunderbird 60'>Feature #15091</a></del>)." (refs: <del><a class='issue tracker-1 status-3 priority-5 priority-default closed child' href='/code/issues/15959' title='Rebase Thunderbird on top of 1:60.0-3~deb9u1'>Bug #15959</a></del>).

    This reverts commit 01df272943269352358aa1974cb6d90ddb36e926.

    By merging thunderbird 1:60.0-3 from Debian, we should get a proper
    setting for intl.locale.requested, which is an empty string. This
    replaces the old “intl.locale.matchOs = true” behaviour.

    This also makes our efforts to set this parameter based on the locale
    settings moot, so let's revert it all and let the built-in code do its
    job instead.

so I guess we should just remove this check entirely?

The attached patch does that, tested on top of the feature/buster branch (itself based on devel).


Files


Subtasks


Related issues

Blocked by Tails - Bug #16422: Upgrade Thunderbird to 60.5.1 Resolved 2019-02-05

History

#1 Updated by intrigeri 2019-03-08 15:16:34

  • Affected tool set to Email Client

#2 Updated by intrigeri 2019-03-08 15:17:35

  • Assignee set to CyrilBrulebois
  • QA Check set to Ready for QA

@CyrilBrulebois perhaps you can fold this patch into your upcoming branch that updates Thunderbird for 3.13, so we save some overhead?

#3 Updated by CyrilBrulebois 2019-03-08 18:15:03

  • Target version set to Tails_3.13

Thanks for the heads-up. Will consider it for 3.13, setting target version accordingly.

#4 Updated by CyrilBrulebois 2019-03-18 04:39:45

  • Assignee changed from CyrilBrulebois to intrigeri
  • Feature Branch set to bugfix-16422-thunderbird-60.5.1

Folded in the bugfix-16422-thunderbird-60.5.1 branch, I’d be happy to have a second pair of eyes but that might be easy enough not to warrant a full-blown review…

#5 Updated by intrigeri 2019-03-18 06:34:41

  • blocked by Bug #16422: Upgrade Thunderbird to 60.5.1 added

#6 Updated by intrigeri 2019-03-18 06:36:04

  • % Done changed from 0 to 90
  • QA Check changed from Ready for QA to Pass

LGTM!

#7 Updated by intrigeri 2019-03-18 09:07:05

  • Assignee changed from intrigeri to CyrilBrulebois

@CyrilBrulebois, please mark as “Fix committed” once the branch for Bug #16422, that has this fix, is merged.

#8 Updated by CyrilBrulebois 2019-03-18 14:26:49

  • Status changed from In Progress to Fix committed
  • % Done changed from 90 to 100

Applied in changeset commit:tails|857fbb06987facafc571d65dfcba634c4660eedf.

#9 Updated by CyrilBrulebois 2019-03-20 14:29:18

  • Status changed from Fix committed to Resolved