summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@gmail.com>2018-05-09 19:46:00 +0200
committerwolfbeast <mcwerewolf@gmail.com>2018-05-09 19:46:00 +0200
commitb98c4ed80b389400df2792a49147d191e5bb9921 (patch)
treeed68b0530982a630ee5fe3a139e0b23463eb36a9
parentfd2b227f19844978021811e9e1a60b8bcbd1ecad (diff)
parent21c5dd667220bf55dfb91b01bc37c2a239671f72 (diff)
downloadUXP-b98c4ed80b389400df2792a49147d191e5bb9921.tar
UXP-b98c4ed80b389400df2792a49147d191e5bb9921.tar.gz
UXP-b98c4ed80b389400df2792a49147d191e5bb9921.tar.lz
UXP-b98c4ed80b389400df2792a49147d191e5bb9921.tar.xz
UXP-b98c4ed80b389400df2792a49147d191e5bb9921.zip
Merge branch 'master' of https://github.com/MoonchildProductions/UXP
-rw-r--r--browser/components/preferences/fonts.xul3
-rw-r--r--browser/locales/en-US/chrome/browser/preferences/fonts.dtd1
-rw-r--r--dom/encoding/FallbackEncoding.cpp3
-rw-r--r--modules/libpref/init/all.js2
4 files changed, 5 insertions, 4 deletions
diff --git a/browser/components/preferences/fonts.xul b/browser/components/preferences/fonts.xul
index ed1d1ecc2..26b1c6547 100644
--- a/browser/components/preferences/fonts.xul
+++ b/browser/components/preferences/fonts.xul
@@ -255,7 +255,8 @@
control="DefaultCharsetList"/>
<menulist id="DefaultCharsetList" preference="intl.charset.fallback.override">
<menupopup>
- <menuitem label="&languages.customize.Fallback.auto;" value=""/>
+ <menuitem label="&languages.customize.Fallback.auto;" value="*"/>
+ <menuitem label="&languages.customize.Fallback.utf8;" value="UTF-8"/>
<menuitem label="&languages.customize.Fallback.arabic;" value="windows-1256"/>
<menuitem label="&languages.customize.Fallback.baltic;" value="windows-1257"/>
<menuitem label="&languages.customize.Fallback.ceiso;" value="ISO-8859-2"/>
diff --git a/browser/locales/en-US/chrome/browser/preferences/fonts.dtd b/browser/locales/en-US/chrome/browser/preferences/fonts.dtd
index 98d697d35..d55bcde8b 100644
--- a/browser/locales/en-US/chrome/browser/preferences/fonts.dtd
+++ b/browser/locales/en-US/chrome/browser/preferences/fonts.dtd
@@ -70,6 +70,7 @@
<!ENTITY languages.customize.Fallback2.desc "This text encoding is used for legacy content that fails to declare its encoding.">
<!ENTITY languages.customize.Fallback.auto "Default for Current Locale">
+<!ENTITY languages.customize.Fallback.utf8 "UTF-8">
<!-- LOCALIZATION NOTE (languages.customize.Fallback.arabic):
Translate "Arabic" as an adjective for an encoding, not as the name of the language. -->
<!ENTITY languages.customize.Fallback.arabic "Arabic">
diff --git a/dom/encoding/FallbackEncoding.cpp b/dom/encoding/FallbackEncoding.cpp
index 93fe0f8cb..29411412e 100644
--- a/dom/encoding/FallbackEncoding.cpp
+++ b/dom/encoding/FallbackEncoding.cpp
@@ -55,8 +55,7 @@ FallbackEncoding::Get(nsACString& aFallback)
// Don't let the user break things by setting the override to unreasonable
// values via about:config
if (!EncodingUtils::FindEncodingForLabel(override, mFallback) ||
- !EncodingUtils::IsAsciiCompatible(mFallback) ||
- mFallback.EqualsLiteral("UTF-8")) {
+ !EncodingUtils::IsAsciiCompatible(mFallback)) {
mFallback.Truncate();
}
diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
index 6506d4bce..b8039009d 100644
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -2046,7 +2046,7 @@ pref("intl.accept_languages", "chrome://global/locale/intl.propert
pref("intl.menuitems.alwaysappendaccesskeys","chrome://global/locale/intl.properties");
pref("intl.menuitems.insertseparatorbeforeaccesskeys","chrome://global/locale/intl.properties");
pref("intl.charset.detector", "chrome://global/locale/intl.properties");
-pref("intl.charset.fallback.override", "");
+pref("intl.charset.fallback.override", "*"); // '*' to make sure the UI selects the proper entry for 'auto'
pref("intl.charset.fallback.tld", true);
pref("intl.ellipsis", "chrome://global-platform/locale/intl.properties");
pref("intl.locale.matchOS", false);