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

Bug 1140720 - Port Bug 756022: Unify pref font choices for various Latin script-using languages. r=mkmelin 

--HG--
extra : amend_source : c7c3451ff6742d59903cf83cefba720763c6acbe
This commit is contained in:
aleth 2015-03-18 01:29:56 +01:00
Родитель 989b2199b3
Коммит aa210afd91
6 изменённых файлов: 71 добавлений и 96 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

3
im/app/profile/all-instantbird.js
Просмотреть файл

@ -81,17 +81,14 @@ pref("messenger.options.playSounds.logout", true);
pref("font.default.x-western", "sans-serif");
pref("font.default.x-unicode", "sans-serif");
pref("font.default.x-central-euro", "sans-serif");
pref("font.default.x-cyrillic", "sans-serif");
#ifdef XP_MACOSX
pref("font.name.sans-serif.x-unicode", "Lucida Grande");
pref("font.name.sans-serif.x-western", "Lucida Grande");
pref("font.name.sans-serif.x-central-euro", "Lucida Grande");
pref("font.name.sans-serif.x-cyrillic", "Lucida Grande");
#endif
pref("font.size.variable.x-western", 13);
pref("font.size.variable.x-unicode", 13);
pref("font.size.variable.x-central-euro", 13);
pref("font.size.variable.x-cyrillic", 13);
pref("messenger.proxies", "");

36
mail/app/profile/all-thunderbird.js
Просмотреть файл

@ -562,11 +562,8 @@ pref("mailnews.migration.header_addons_url","http://live.mozillamessaging.com/%A
pref("font.default", "sans-serif");
pref("font.default.x-unicode", "sans-serif");
pref("font.default.x-western", "sans-serif");
pref("font.default.x-central-euro", "sans-serif");
pref("font.default.x-cyrillic", "sans-serif");
pref("font.default.x-baltic", "sans-serif");
pref("font.default.el", "sans-serif");
pref("font.default.tr", "sans-serif");
#ifdef XP_MACOSX
pref("font.name.sans-serif.x-unicode", "Lucida Grande");
@ -583,13 +580,6 @@ pref("font.name-list.monospace.x-western", "Menlo, Monaco");
pref("font.size.variable.x-western", 15);
pref("font.size.fixed.x-western", 12);
pref("font.name.sans-serif.x-central-euro", "Lucida Grande");
pref("font.name.monospace.x-central-euro", "Menlo");
pref("font.name-list.sans-serif.x-central-euro", "Lucida Grande");
pref("font.name-list.monospace.x-central-euro", "Menlo, Monaco");
pref("font.size.variable.x-central-euro", 15);
pref("font.size.fixed.x-central-euro", 12);
pref("font.name.sans-serif.x-cyrillic", "Lucida Grande");
pref("font.name.monospace.x-cyrillic", "Menlo");
pref("font.name-list.sans-serif.x-cyrillic", "Lucida Grande");
@ -597,26 +587,12 @@ pref("font.name-list.monospace.x-cyrillic", "Menlo, Monaco");
pref("font.size.variable.x-cyrillic", 15);
pref("font.size.fixed.x-cyrillic", 12);
pref("font.name.sans-serif.x-baltic", "Lucida Grande");
pref("font.name.monospace.x-baltic", "Menlo");
pref("font.name-list.sans-serif.x-baltic", "Lucida Grande");
pref("font.name-list.monospace.x-baltic", "Menlo, Monaco");
pref("font.size.variable.x-baltic", 15);
pref("font.size.fixed.x-baltic", 12);
pref("font.name.sans-serif.el", "Lucida Grande");
pref("font.name.monospace.el", "Menlo");
pref("font.name-list.sans-serif.el", "Lucida Grande");
pref("font.name-list.monospace.el", "Menlo, Monaco");
pref("font.size.variable.el", 15);
pref("font.size.fixed.el", 12);
pref("font.name.sans-serif.tr", "Lucida Grande");
pref("font.name.monospace.tr", "Menlo");
pref("font.name-list.sans-serif.tr", "Lucida Grande");
pref("font.name-list.monospace.tr", "Menlo, Monaco");
pref("font.size.variable.tr", 15);
pref("font.size.fixed.tr", 12);
#endif
// Since different versions of Windows need different settings, we'll handle
@ -635,25 +611,13 @@ pref("font.name-list.serif.x-western", "serif");
pref("font.name-list.sans-serif.x-western", "sans-serif");
pref("font.name-list.monospace.x-western", "monospace");
pref("font.name-list.serif.x-central-euro", "serif");
pref("font.name-list.sans-serif.x-central-euro", "sans-serif");
pref("font.name-list.monospace.x-central-euro", "monospace");
pref("font.name-list.serif.x-cyrillic", "serif");
pref("font.name-list.sans-serif.x-cyrillic", "sans-serif");
pref("font.name-list.monospace.x-cyrillic", "monospace");
pref("font.name-list.serif.x-baltic", "serif");
pref("font.name-list.sans-serif.x-baltic", "sans-serif");
pref("font.name-list.monospace.x-baltic", "monospace");
pref("font.name-list.serif.el", "serif");
pref("font.name-list.sans-serif.el", "sans-serif");
pref("font.name-list.monospace.el", "monospace");
pref("font.name-list.serif.tr", "serif");
pref("font.name-list.sans-serif.tr", "sans-serif");
pref("font.name-list.monospace.tr", "monospace");
#endif
pref("mail.font.windows.version", 0);

2
mail/base/modules/mailMigrator.js
Просмотреть файл

@ -81,7 +81,7 @@ var MailMigrator = {
if (fontPrefVersion < 1)
encodings.push("x-unicode", "x-western");
// (Thunderbird 3.2)
encodings.push("x-central-euro", "x-cyrillic", "x-baltic", "el", "tr");
encodings.push("x-cyrillic", "el");
this._switchDefaultFonts(fonts, encodings);

72
mail/components/preferences/fonts.xul
Просмотреть файл

@ -31,7 +31,6 @@
<preference id="browser.display.use_document_fonts"
name="browser.display.use_document_fonts"
type="int"/>
<preference id="intl.charset.default" name="intl.charset.default" type="wstring"/>
<preference id="mailnews.send_default_charset" name="mailnews.send_default_charset" type="wstring"/>
<preference id="mailnews.view_default_charset" name="mailnews.view_default_charset" type="wstring"/>
<preference id="mailnews.reply_in_default_charset" name="mailnews.reply_in_default_charset" type="bool"/>
@ -50,33 +49,34 @@
<menulist id="selectLangs" onsyncfrompreference="return gFontsDialog.readFontLanguageGroup();"
preference="font.language.group">
<menupopup>
<menuitem value="x-unicode" label="&font.langGroup.unicode1;"/>
<menuitem value="x-western" label="&font.langGroup.latin1;"/>
<menuitem value="x-central-euro" label="&font.langGroup.latin2;"/>
<menuitem value="ja" label="&font.langGroup.japanese;"/>
<menuitem value="zh-TW" label="&font.langGroup.trad-chinese;"/>
<menuitem value="zh-CN" label="&font.langGroup.simpl-chinese;"/>
<menuitem value="zh-HK" label="&font.langGroup.trad-chinese-hk;"/>
<menuitem value="ko" label="&font.langGroup.korean;"/>
<menuitem value="x-cyrillic" label="&font.langGroup.cyrillic;"/>
<menuitem value="x-baltic" label="&font.langGroup.baltic;"/>
<menuitem value="el" label="&font.langGroup.el;"/>
<menuitem value="tr" label="&font.langGroup.turkish;"/>
<menuitem value="th" label="&font.langGroup.thai;"/>
<menuitem value="he" label="&font.langGroup.hebrew;"/>
<menuitem value="ar" label="&font.langGroup.arabic;"/>
<menuitem value="x-devanagari" label="&font.langGroup.devanagari;"/>
<menuitem value="x-tamil" label="&font.langGroup.tamil;"/>
<menuitem value="x-armn" label="&font.langGroup.armenian;"/>
<menuitem value="x-beng" label="&font.langGroup.bengali;"/>
<menuitem value="x-ethi" label="&font.langGroup.ethiopic;"/>
<menuitem value="x-geor" label="&font.langGroup.georgian;"/>
<menuitem value="x-gujr" label="&font.langGroup.gujarati;"/>
<menuitem value="x-guru" label="&font.langGroup.gurmukhi;"/>
<menuitem value="x-khmr" label="&font.langGroup.khmer;"/>
<menuitem value="x-mlym" label="&font.langGroup.malayalam;"/>
<menuitem value="x-cans" label="&font.langGroup.canadian;"/>
<menuitem value="x-user-def" label="&font.langGroup.user-def;"/>
<menuitem value="ar" label="&font.langGroup.arabic;"/>
<menuitem value="x-armn" label="&font.langGroup.armenian;"/>
<menuitem value="x-beng" label="&font.langGroup.bengali;"/>
<menuitem value="zh-CN" label="&font.langGroup.simpl-chinese;"/>
<menuitem value="zh-HK" label="&font.langGroup.trad-chinese-hk;"/>
<menuitem value="zh-TW" label="&font.langGroup.trad-chinese;"/>
<menuitem value="x-cyrillic" label="&font.langGroup.cyrillic;"/>
<menuitem value="x-devanagari" label="&font.langGroup.devanagari;"/>
<menuitem value="x-ethi" label="&font.langGroup.ethiopic;"/>
<menuitem value="x-geor" label="&font.langGroup.georgian;"/>
<menuitem value="el" label="&font.langGroup.el;"/>
<menuitem value="x-gujr" label="&font.langGroup.gujarati;"/>
<menuitem value="x-guru" label="&font.langGroup.gurmukhi;"/>
<menuitem value="he" label="&font.langGroup.hebrew;"/>
<menuitem value="ja" label="&font.langGroup.japanese;"/>
<menuitem value="x-knda" label="&font.langGroup.kannada;"/>
<menuitem value="x-khmr" label="&font.langGroup.khmer;"/>
<menuitem value="ko" label="&font.langGroup.korean;"/>
<menuitem value="x-western" label="&font.langGroup.latin;"/>
<menuitem value="x-mlym" label="&font.langGroup.malayalam;"/>
<menuitem value="x-orya" label="&font.langGroup.oriya;"/>
<menuitem value="x-sinh" label="&font.langGroup.sinhala;"/>
<menuitem value="x-tamil" label="&font.langGroup.tamil;"/>
<menuitem value="x-telu" label="&font.langGroup.telugu;"/>
<menuitem value="th" label="&font.langGroup.thai;"/>
<menuitem value="x-tibt" label="&font.langGroup.tibetan;"/>
<menuitem value="x-cans" label="&font.langGroup.canadian;"/>
<menuitem value="x-unicode" label="&font.langGroup.other;"/>
</menupopup>
</menulist>
</caption>
@ -112,7 +112,7 @@
<hbox align="center" pack="end">
<label value="&size.label;"
accesskey="&proportionalSize.accesskey;"
accesskey="&sizeProportional.accesskey;"
control="sizeVar"/>
</hbox>
@ -172,7 +172,7 @@
<menulist id="monospace" flex="1" style="width: 0px;" crop="right"
onsyncfrompreference="return gFontsDialog.readFontSelection(document.getElementById('monospace'));"/>
<hbox align="center" pack="end">
<label accesskey="&sizeMono.accesskey;"
<label accesskey="&sizeMonospace.accesskey;"
control="sizeMono">&size.label;</label>
</hbox>
<menulist id="sizeMono" class="small-margin">
@ -231,6 +231,18 @@
<menuitem value="20" label="20"/>
<menuitem value="22" label="22"/>
<menuitem value="24" label="24"/>
<menuitem value="26" label="26"/>
<menuitem value="28" label="28"/>
<menuitem value="30" label="30"/>
<menuitem value="32" label="32"/>
<menuitem value="34" label="34"/>
<menuitem value="36" label="36"/>
<menuitem value="40" label="40"/>
<menuitem value="44" label="44"/>
<menuitem value="48" label="48"/>
<menuitem value="56" label="56"/>
<menuitem value="64" label="64"/>
<menuitem value="72" label="72"/>
</menupopup>
</menulist>
</hbox>

24
mail/locales/en-US/chrome/messenger/preferences/fonts.dtd
Просмотреть файл

@ -8,32 +8,30 @@
<!ENTITY language.accesskey "t">
<!ENTITY size.label "Size:">
<!ENTITY proportionalSize.accesskey "e">
<!ENTITY sizeMono.accesskey "i">
<!ENTITY sizeProportional.accesskey "e">
<!ENTITY sizeMonospace.accesskey "i">
<!ENTITY proportional.label "Proportional:">
<!ENTITY proportional.accesskey "P">
<!ENTITY serif.label "Serif:">
<!ENTITY serif.accesskey "s">
<!ENTITY serif.accesskey "S">
<!ENTITY sans-serif.label "Sans-serif:">
<!ENTITY sans-serif.accesskey "n">
<!ENTITY monospace.label "Monospace:">
<!ENTITY monospace.accesskey "m">
<!ENTITY monospace.accesskey "M">
<!ENTITY font.langGroup.latin1 "Western">
<!ENTITY font.langGroup.latin2 "Central European">
<!-- LOCALIZATION NOTE (font.langGroup.latin) :
Translate "Latin" as the name of Latin (Roman) script, not as the name of the Latin language. -->
<!ENTITY font.langGroup.latin "Latin">
<!ENTITY font.langGroup.japanese "Japanese">
<!ENTITY font.langGroup.trad-chinese "Traditional Chinese (Taiwan)">
<!ENTITY font.langGroup.simpl-chinese "Simplified Chinese">
<!ENTITY font.langGroup.trad-chinese-hk "Traditional Chinese (Hong Kong)">
<!ENTITY font.langGroup.korean "Korean">
<!ENTITY font.langGroup.cyrillic "Cyrillic">
<!ENTITY font.langGroup.baltic "Baltic">
<!ENTITY font.langGroup.el "Greek">
<!ENTITY font.langGroup.turkish "Turkish">
<!ENTITY font.langGroup.unicode1 "Unicode">
<!ENTITY font.langGroup.user-def "User Defined">
<!ENTITY font.langGroup.other "Other Writing Systems">
<!ENTITY font.langGroup.thai "Thai">
<!ENTITY font.langGroup.hebrew "Hebrew">
<!ENTITY font.langGroup.arabic "Arabic">
@ -48,7 +46,11 @@
<!ENTITY font.langGroup.gurmukhi "Gurmukhi">
<!ENTITY font.langGroup.khmer "Khmer">
<!ENTITY font.langGroup.malayalam "Malayalam">
<!ENTITY font.langGroup.oriya "Oriya">
<!ENTITY font.langGroup.telugu "Telugu">
<!ENTITY font.langGroup.kannada "Kannada">
<!ENTITY font.langGroup.sinhala "Sinhala">
<!ENTITY font.langGroup.tibetan "Tibetan">
<!-- Minimum font size -->
<!ENTITY minSize.label "Minimum font size:">
<!ENTITY minSize.accesskey "z">

30
mailnews/intl/charsetData.properties
Просмотреть файл

@ -26,16 +26,16 @@ replacement.isInternal = true
# these should primarily specify script (and sometimes region),
# but NOT language.
# See also https://bugzilla.mozilla.org/show_bug.cgi?id=756022
# e.g. x-western -> *-Latn-155 (Western Europe)
# x-central-euro -> *-Latn-151 (Eastern Europe)
# x-baltic -> *-Latn-154 (Northern Europe)
# e.g. x-western -> *-Latn-155 (Western Europe),
# *-Latn-151 (Eastern Europe),
# *-Latn-154 (Northern Europe),
# *-Latn-TR
# x-cyrillic -> *-Cyrl
# zh-TW -> *-Hant-TW
# zh-HK -> *-Hant-HK
# zh-CN -> *-Hans
# ja -> *-Jpan
# ko -> *-Hang
# tr -> *-Latn-TR
# he -> *-Hebr
# ar -> *-Arab
# etc
@ -59,11 +59,11 @@ iso-8859-1.LangGroup = x-western
iso-8859-10.LangGroup = x-western
iso-8859-14.LangGroup = x-western
iso-8859-15.LangGroup = x-western
iso-8859-2.LangGroup = x-central-euro
iso-8859-16.LangGroup = x-central-euro
iso-8859-2.LangGroup = x-western
iso-8859-16.LangGroup = x-western
iso-8859-3.LangGroup = x-western
iso-8859-4.LangGroup = x-baltic
iso-8859-13.LangGroup = x-baltic
iso-8859-4.LangGroup = x-western
iso-8859-13.LangGroup = x-western
iso-8859-5.LangGroup = x-cyrillic
iso-8859-6.LangGroup = ar
iso-8859-7.LangGroup = el
@ -81,19 +81,19 @@ utf-16le.LangGroup = x-unicode
utf-7.LangGroup = x-unicode
x-imap4-modified-utf7.LangGroup = x-unicode
replacement.LangGroup = x-unicode
windows-1250.LangGroup = x-central-euro
windows-1250.LangGroup = x-western
windows-1251.LangGroup = x-cyrillic
windows-1252.LangGroup = x-western
windows-1253.LangGroup = el
windows-1254.LangGroup = tr
windows-1254.LangGroup = x-western
windows-1255.LangGroup = he
windows-1256.LangGroup = ar
windows-1257.LangGroup = x-baltic
windows-1257.LangGroup = x-western
windows-1258.LangGroup = x-western
gbk.LangGroup = zh-CN
gb_2312-80.LangGroup = zh-CN
x-mac-ce.LangGroup = x-central-euro
x-mac-croatian.LangGroup = x-central-euro
x-mac-ce.LangGroup = x-western
x-mac-croatian.LangGroup = x-western
x-mac-cyrillic.LangGroup = x-cyrillic
x-mac-devanagari.LangGroup = x-devanagari
x-mac-farsi.LangGroup = ar
@ -102,9 +102,9 @@ x-mac-gujarati.LangGroup = x-gujr
x-mac-gurmukhi.LangGroup = x-guru
x-mac-icelandic.LangGroup = x-western
macintosh.LangGroup = x-western
x-mac-turkish.LangGroup = tr
x-mac-turkish.LangGroup = x-western
x-mac-ukrainian.LangGroup = x-cyrillic
x-mac-romanian.LangGroup = x-central-euro
x-mac-romanian.LangGroup = x-western
x-user-defined.LangGroup = x-unicode
ks_c_5601-1987.LangGroup = ko
x-mac-hebrew.LangGroup = he