commit 4dc992312bdf098d5a8adbec9d05165269eaf670 Author: Sukhbir Singh sukhbir@torproject.org Date: Thu Jul 21 16:01:12 2016 -0400

Add patch for disabling Tor Launcher locale prompt --- projects/tor-launcher/build | 1 + projects/tor-launcher/config | 1 + projects/tor-launcher/locale-disable.patch | 12 ++++++++++++ 3 files changed, 14 insertions(+)

diff --git a/projects/tor-launcher/build b/projects/tor-launcher/build index 8735d33..5b11d89 100644 --- a/projects/tor-launcher/build +++ b/projects/tor-launcher/build @@ -13,5 +13,6 @@ cp ../messenger.png src/chrome/skin/tbb-logo.png cp ../default48.png src/chrome/skin/default48.png [% END -%] patch -p1 < ../logo.patch +patch -p1 < ../locale-disable.patch make package mv pkg/*.xpi [% dest_dir _ '/' _ c('filename') %] diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config index 5b108b7..fac0888 100644 --- a/projects/tor-launcher/config +++ b/projects/tor-launcher/config @@ -10,6 +10,7 @@ input_files: - filename: messenger.png - filename: default48.png - filename: logo.patch + - filename: locale-disable.patch - filename: controlport.patch content: '[% INCLUDE controlport.patch.tmpl -%]' refresh_input: 1 diff --git a/projects/tor-launcher/locale-disable.patch b/projects/tor-launcher/locale-disable.patch new file mode 100644 index 0000000..c076262 --- /dev/null +++ b/projects/tor-launcher/locale-disable.patch @@ -0,0 +1,12 @@ +diff --git a/src/defaults/preferences/prefs.js b/src/defaults/preferences/prefs.js +index 2c0a95e..0a0c299 100644 +--- a/src/defaults/preferences/prefs.js ++++ b/src/defaults/preferences/prefs.js +@@ -1,6 +1,6 @@ + // When presenting the setup wizard, first prompt for locale. + pref("intl.locale.matchOS", true); +-pref("extensions.torlauncher.prompt_for_locale", true); ++pref("extensions.torlauncher.prompt_for_locale", false); + + pref("extensions.torlauncher.loglevel", 4); // 1=verbose, 2=debug, 3=info, 4=note, 5=warn + pref("extensions.torlauncher.logmethod", 1); // 0=stdout, 1=errorconsole, 2=debuglog