[tor-commits] [tor-browser-build/master] Bug 26073: Migrate general.useragent.locale to intl.locale.requested

[gk at torproject.org]

commit 473342eefe9e19dde3a7548b16b29fcfc1f13855
Author: Igor Oliveira <igt0 at torproject.org>
Date:   Wed May 23 12:12:01 2018 -0300

    Bug 26073: Migrate general.useragent.locale to intl.locale.requested
    
    intl.locale.requested is the new way that Gecko handles locales.
---
 projects/tor-browser/build | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/projects/tor-browser/build b/projects/tor-browser/build
index c542818..4d1be00 100644
--- a/projects/tor-browser/build
+++ b/projects/tor-browser/build
@@ -194,7 +194,7 @@ cp defaults/preferences/000-tor-browser.js $rootdir
   rm -rf chrome
 [% END %]
 # Set the locale of the bundle.
-echo "pref(\"general.useragent.locale\", \"en-US\");" >> defaults/preferences/000-tor-browser.js
+echo "pref(\"intl.locale.requested\", \"en-US\");" >> defaults/preferences/000-tor-browser.js
 [% c("var/touch") %] defaults/preferences/000-tor-browser.js
 zip -Xm omni.ja defaults/preferences/000-tor-browser.js
 rm -rf defaults
@@ -325,7 +325,7 @@ cp $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zip "$OUTDIR"/
       mkdir -p defaults/preferences
       cp $rootdir/000-tor-browser.js defaults/preferences/
       # Set the locale of the bundle.
-      echo "pref(\"general.useragent.locale\", \"[% lang %]\");" >> defaults/preferences/000-tor-browser.js
+      echo "pref(\"intl.locale.requested\", \"[% lang %]\");" >> defaults/preferences/000-tor-browser.js
       [% c("var/touch") %] defaults/preferences/000-tor-browser.js
       zip -Xm omni.ja defaults/preferences/000-tor-browser.js
       rm -rf defaults