From: Ian Stakenvicius <axs@gentoo.org>
Date: Wed, 15 Aug 2018 17:07:08 +0000 (-0400)
Subject: mail-client/thunderbird-60: fix pref to ensure OS locale is honoured
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=afc6b6485ad663d136add5398dd533b9fa35c83d;p=gentoo.git

mail-client/thunderbird-60: fix pref to ensure OS locale is honoured

Package-Manager: Portage-2.3.40, Repoman-2.3.9
---

diff --git a/mail-client/thunderbird/files/thunderbird-gentoo-default-prefs.js-2 b/mail-client/thunderbird/files/thunderbird-gentoo-default-prefs.js-2
new file mode 100644
index 000000000000..9770a1aca5ab
--- /dev/null
+++ b/mail-client/thunderbird/files/thunderbird-gentoo-default-prefs.js-2
@@ -0,0 +1,10 @@
+pref("app.update.enabled", false);
+pref("app.update.autoInstallEnabled", false);
+pref("browser.display.use_system_colors",   true);
+pref("intl.locale.matchOS", true);
+pref("intl.locale.requested", "");
+pref("general.useragent.locale", "chrome://global/locale/intl.properties");
+pref("mail.shell.checkDefaultClient", false);
+# Do not switch to Smart Folders after upgrade to 3.0b4
+pref("mail.folder.views.version", "1");
+pref("extensions.autoDisableScopes", 0);
diff --git a/mail-client/thunderbird/thunderbird-60.0.ebuild b/mail-client/thunderbird/thunderbird-60.0-r1.ebuild
similarity index 99%
rename from mail-client/thunderbird/thunderbird-60.0.ebuild
rename to mail-client/thunderbird/thunderbird-60.0-r1.ebuild
index 23d639f020e4..6b286589d14e 100644
--- a/mail-client/thunderbird/thunderbird-60.0.ebuild
+++ b/mail-client/thunderbird/thunderbird-60.0-r1.ebuild
@@ -243,7 +243,7 @@ src_install() {
 	pax-mark m "${BUILD_OBJ_DIR}"/dist/bin/xpcshell
 
 	# Copy our preference before omnijar is created.
-	cp "${FILESDIR}"/thunderbird-gentoo-default-prefs-1.js-1 \
+	cp "${FILESDIR}"/thunderbird-gentoo-default-prefs.js-2 \
 		"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
 		|| die