commit afb9893b7626ce819d7b2b571a847d44277971f6 Author: Georg Koppen gk@torproject.org Date: Wed Apr 12 10:23:38 2017 +0000

Bug 21920: Don't show locale selection dialog

The locale selection dialog was one of the features we included in the hardened series. It is not needed on the alpha or stable channel. We therefore disable it, keeping the code as we might be able to resue it for #17400 later on. --- src/modules/tl-util.jsm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/modules/tl-util.jsm b/src/modules/tl-util.jsm index 2f8d14e..0d33267 100644 --- a/src/modules/tl-util.jsm +++ b/src/modules/tl-util.jsm @@ -290,7 +290,10 @@ let TorLauncherUtil = // Public

get shouldPromptForLocale() { - const kPrefPromptForLocale = "extensions.torlauncher.prompt_for_locale"; + // We are not supporting locale selection on the alpha/stable channel + // right now. Thus, no prompt for the user. + return false; + /* const kPrefPromptForLocale = "extensions.torlauncher.prompt_for_locale"; try { const kEnvSkipLocalePrompt = "TOR_SKIP_LOCALE_PROMPT"; @@ -301,7 +304,7 @@ let TorLauncherUtil = // Public return ("1" != env.get(kEnvSkipLocalePrompt)); } catch(e) {}

- return this.getBoolPref(kPrefPromptForLocale, true); + return this.getBoolPref(kPrefPromptForLocale, true); */ },

get shouldShowNetworkSettings()