mozilla
/
releases-comm-central
зеркало из https://github.com/mozilla/releases-comm-central.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 1177830 - consider removing Chinese Simplified (GBK) from outgoing mail encoding options. r=mkmelin, r=ewong

This commit is contained in:
alta88 2015-11-20 17:12:29 -07:00
Родитель 609f7471bf
Коммит 460e58454b
4 изменённых файлов: 7 добавлений и 12 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

5
mail/locales/en-US/chrome/messenger/charsetTitles.properties
Просмотреть файл

@ -32,10 +32,8 @@ x-mac-icelandic.title = Icelandic (MacIcelandic)
iso-2022-jp.title = Japanese (ISO-2022-JP)
shift_jis.title = Japanese (Shift_JIS)
euc-jp.title = Japanese (EUC-JP)
gb18030.title = Chinese Simplified (GB18030)
big5.title = Chinese Traditional (Big5)
big5-hkscs.title = Chinese Traditional (Big5-HKSCS)
gb2312.title = Chinese Simplified (GB2312)
gbk.title = Chinese Simplified (GBK)
euc-kr.title = Korean (EUC-KR)
utf-7.title = Unicode (UTF-7)
utf-8.title = Unicode (UTF-8)
@ -60,7 +58,6 @@ windows-1255.title = Hebrew (Windows-1255)
windows-1256.title = Arabic (Windows-1256)
x-user-defined.title = User Defined
ibm866.title = Cyrillic/Russian (CP-866)
gb18030.title = Chinese Simplified (GB18030)
x-mac-arabic.title = Arabic (MacArabic)
x-mac-farsi.title = Farsi (MacFarsi)
x-mac-hebrew.title = Hebrew (MacHebrew)

4
mailnews/base/content/charsetList.xml
Просмотреть файл

@ -17,12 +17,12 @@
let charsetValues = "";
if (this.getAttribute("subset") == "sending")
charsetValues = ["UTF-8", "EUC-KR", "gbk", "gb18030", "ISO-2022-JP",
charsetValues = ["UTF-8", "EUC-KR", "gb18030", "ISO-2022-JP",
"ISO-8859-1", "ISO-8859-7", "windows-1252"];
else if (!this.getAttribute("subset")
|| this.getAttribute("subset") == "viewing")
charsetValues = ["UTF-8", "Big5", "EUC-KR", "gbk", "ISO-2022-JP",
charsetValues = ["UTF-8", "Big5", "EUC-KR", "gb18030", "ISO-2022-JP",
"ISO-8859-1", "ISO-8859-2", "ISO-8859-7",
"windows-874", "windows-1250", "windows-1251",
"windows-1252", "windows-1255", "windows-1256",

5
mailnews/base/util/mailnewsMigrator.js
Просмотреть файл

@ -19,7 +19,7 @@ var Ci = Components.interfaces;
var kServerPrefVersion = 1;
var kSmtpPrefVersion = 1;
var kABRemoteContentPrefVersion = 1;
var kDefaultCharsetsPrefVersion = 1;
var kDefaultCharsetsPrefVersion = 2;
function migrateMailnews()
{
@ -172,7 +172,8 @@ function MigrateABRemoteContentSettings()
*/
function MigrateDefaultCharsets()
{
if (Services.prefs.prefHasUserValue("mail.default_charsets.migrated"))
if (Services.prefs.prefHasUserValue("mail.default_charsets.migrated") &&
Services.prefs.getIntPref("mail.default_charsets.migrated") == kDefaultCharsetsPrefVersion)
return;
let charsetConvertManager = Components.classes['@mozilla.org/charset-converter-manager;1']

5
suite/locales/en-US/chrome/mailnews/charsetTitles.properties
Просмотреть файл

@ -32,10 +32,8 @@ x-mac-icelandic.title = Icelandic (MacIcelandic)
iso-2022-jp.title = Japanese (ISO-2022-JP)
shift_jis.title = Japanese (Shift_JIS)
euc-jp.title = Japanese (EUC-JP)
gb18030.title = Chinese Simplified (GB18030)
big5.title = Chinese Traditional (Big5)
big5-hkscs.title = Chinese Traditional (Big5-HKSCS)
gb2312.title = Chinese Simplified (GB2312)
gbk.title = Chinese Simplified (GBK)
euc-kr.title = Korean (EUC-KR)
utf-7.title = Unicode (UTF-7)
utf-8.title = Unicode (UTF-8)
@ -60,7 +58,6 @@ windows-1255.title = Hebrew (Windows-1255)
windows-1256.title = Arabic (Windows-1256)
x-user-defined.title = User Defined
ibm866.title = Cyrillic/Russian (CP-866)
gb18030.title = Chinese Simplified (GB18030)
x-mac-arabic.title = Arabic (MacArabic)
x-mac-farsi.title = Farsi (MacFarsi)
x-mac-hebrew.title = Hebrew (MacHebrew)