Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 11:25:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bug 55300: add 'Unicode' submenu to the 'Character Encoding' menu. The new submenu has UTF-8, UTF-16*, UTF-32* and UTF-7. UTF-8 was also added to the static list. (r=neil, sr=blizzard, moa for ff = pch)

Browse Source
This commit is contained in:
jshin%mailaps.org 2004-03-06 06:11:48 +00:00
parent b621053e6f
commit b0f597c31a
14 changed files with 99 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
browser/app/profile/firefox.js
View File

@ -144,6 +144,7 @@ pref("intl.charsetmenu.browser.more2", "chrome://global/locale/intl.properties"
pref("intl.charsetmenu.browser.more3", "chrome://global/locale/intl.properties");
pref("intl.charsetmenu.browser.more4", "chrome://global/locale/intl.properties");
pref("intl.charsetmenu.browser.more5", "chrome://global/locale/intl.properties");
pref("intl.charsetmenu.browser.unicode", "chrome://global/locale/intl.properties");
pref("intl.charset.detector", "chrome://global/locale/intl.properties");
pref("intl.charset.default", "chrome://global-platform/locale/intl.properties");
pref("font.language.group", "chrome://global/locale/intl.properties");

11
browser/base/content/browser-menubar.inc
View File

@ -232,6 +232,17 @@
<menupopup>
</menupopup>
</menu>
<menu label="&charsetMenuUnicode.label;" accesskey="&charsetMenuUnicode.accesskey;" datasources="rdf:charset-menu" ref="NC:BrowserUnicodeCharsetMenuRoot">
<template>
<rule>
<menupopup>
<menuitem uri="..." label="rdf:http://home.netscape.com/NC-rdf#Name"/>
</menupopup>
</rule>
</template>
<menupopup>
</menupopup>
</menu>
<menuseparator />
</menupopup>
</menu>

1
calendar/sunbird/app/profile/all.js
View File

@ -475,6 +475,7 @@ pref("intl.charsetmenu.browser.more2", "chrome://global/locale/intl.properties"
pref("intl.charsetmenu.browser.more3", "chrome://global/locale/intl.properties");
pref("intl.charsetmenu.browser.more4", "chrome://global/locale/intl.properties");
pref("intl.charsetmenu.browser.more5", "chrome://global/locale/intl.properties");
pref("intl.charsetmenu.browser.unicode", "chrome://global/locale/intl.properties");
pref("intl.charsetmenu.browser.cache.size", 5);
pref("intl.charset.detector", "chrome://global/locale/intl.properties");
pref("intl.charset.default", "chrome://global-platform/locale/intl.properties");

12
intl/uconv/src/charsetData.properties
View File

@ -17,6 +17,7 @@
## Rights Reserved.
##
## Contributor(s):
## Jungshik Shin <jshin@mailaps.org>
## Rule of this file:
## 1. key should always be in lower case ascii so we can do case insensitive
@ -38,10 +39,6 @@
## charset_name.isMultibyte = multi byte charsets
t.61-8bit.notForBrowser = true
utf-32le.notForBrowser = true
utf-32be.notForBrowser = true
utf-16le.notForBrowser = true
utf-16be.notForBrowser = true
x-imap4-modified-utf7.notForBrowser = true
x-u-escaped.notForBrowser = true
windows-936.notForBrowser = true
@ -55,10 +52,7 @@ ibm864i.notForBrowser = true
iso-8859-8-e.notForBrowser = true
t.61-8bit.notForOutgoing = true
utf-32le.notForOutgoing = true
utf-32be.notForOutgoing = true
utf-16le.notForOutgoing = true
utf-16be.notForOutgoing = true
utf-7.notForOutgoing = true
x-imap4-modified-utf7.notForOutgoing = true
x-u-escaped.notForOutgoing = true
windows-936.notForOutgoing = true
@ -126,12 +120,12 @@ windows-874.LangGroup = th
iso-8859-11.LangGroup = th
x-thaittf-0.LangGroup = th
us-ascii.LangGroup = x-western
utf-8.LangGroup = x-unicode
utf-16be.LangGroup = x-unicode
utf-16le.LangGroup = x-unicode
utf-32be.LangGroup = x-unicode
utf-32le.LangGroup = x-unicode
utf-7.LangGroup = x-unicode
utf-8.LangGroup = x-unicode
windows-1250.LangGroup = x-central-euro
windows-1251.LangGroup = x-cyrillic
windows-1252.LangGroup = x-western

4
intl/uconv/src/charsetTitles.properties
View File

@ -63,6 +63,10 @@ x-windows-949.title = Korean (UHC)
iso-2022-kr.title = Korean (ISO-2022-KR)
utf-7.title = Unicode (UTF-7)
utf-8.title = Unicode (UTF-8)
utf-16le.title = Unicode (UTF-16 Little Endian)
utf-16be.title = Unicode (UTF-16 Big Endian)
utf-32le.title = Unicode (UTF-32 Little Endian)
utf-32be.title = Unicode (UTF-32 Big Endian)
iso-8859-5.title = Cyrillic (ISO-8859-5)
iso-ir-111.title = Cyrillic (ISO-IR-111)
windows-1251.title = Cyrillic (Windows-1251)

1
modules/libpref/src/init/all.js
View File

@ -607,6 +607,7 @@ pref("intl.charsetmenu.browser.more2", "chrome://navigator/locale/navigator
pref("intl.charsetmenu.browser.more3", "chrome://navigator/locale/navigator.properties");
pref("intl.charsetmenu.browser.more4", "chrome://navigator/locale/navigator.properties");
pref("intl.charsetmenu.browser.more5", "chrome://navigator/locale/navigator.properties");
pref("intl.charsetmenu.browser.unicode", "chrome://navigator/locale/navigator.properties");
pref("intl.charsetmenu.mailedit", "chrome://navigator/locale/navigator.properties");
pref("intl.charsetmenu.browser.cache", "");
pref("intl.charsetmenu.mailview.cache", "");

24
toolkit/content/charsetOverlay.xul
View File

@ -99,6 +99,17 @@
<menupopup>
</menupopup>
</menu>
<menu label="&charsetMenuUnicode.label;" accesskey="&charsetMenuUnicode.accesskey;" datasources="rdf:charset-menu" ref="NC:BrowserUnicodeCharsetMenuRoot">
<template>
<rule>
<menupopup>
<menuitem uri="..." label="rdf:http://home.netscape.com/NC-rdf#Name"/>
</menupopup>
</rule>
</template>
<menupopup>
</menupopup>
</menu>
<menuseparator />
</menupopup>
</menu>
@ -133,7 +144,7 @@
<menupopup>
</menupopup>
</menu>
<menu label="&charsetMenuMore.label;" datasources="rdf:charset-menu" ref="NC:BrowserMoreCharsetMenuRoot">
<menu label="&charsetMenuMore.label;" accesskey="&charsetMenuMore.accesskey;" datasources="rdf:charset-menu" ref="NC:BrowserMoreCharsetMenuRoot">
<template>
<rule>
<menupopup>
@ -311,6 +322,17 @@
<menupopup>
</menupopup>
</menu>
<menu label="&charsetMenuUnicode.label;" accesskey="&charsetMenuUnicode.accesskey;" datasources="rdf:charset-menu" ref="NC:BrowserUnicodeCharsetMenuRoot">
<template>
<rule>
<menupopup>
<menuitem uri="..." label="rdf:http://home.netscape.com/NC-rdf#Name"/>
</menupopup>
</rule>
</template>
<menupopup>
</menupopup>
</menu>
<menuseparator />
</menupopup>
</menu>

4
toolkit/locale/charsetOverlay.dtd
View File

@ -14,6 +14,8 @@
<!ENTITY charsetMenuMore4.label "SE &amp; SW Asian">
<!ENTITY charsetMenuMore4.accesskey "S">
<!ENTITY charsetMenuMore5.label "Middle Eastern">
<!ENTITY charsetMenuMore5.accesskey "m">
<!ENTITY charsetMenuMore5.accesskey "M">
<!ENTITY charsetMenuUnicode.label "Unicode">
<!ENTITY charsetMenuUnicode.accesskey "U">
<!ENTITY charsetCustomize.label "Customize...">
<!ENTITY charsetCustomize.accesskey "c">

5
toolkit/locale/intl.properties
View File

@ -4,15 +4,18 @@
# adding charsets to your localized version, please refer to
# intl/uconv/src/charsetalias.properties file for the list of canonical
# charset names and use canonical names exactly as listed there.
# Also note that "UTF-8" should always be included in intl.charsetmenu.browser.static
general.useragent.locale=en-US
font.language.group=x-western
intl.accept_languages=en-us, en
intl.charsetmenu.browser.static=ISO-8859-1
intl.charsetmenu.browser.static=ISO-8859-1, UTF-8
intl.charsetmenu.browser.more1=ISO-8859-1, ISO-8859-15, IBM850, x-mac-roman, windows-1252, ISO-8859-14, ISO-8859-7, x-mac-greek, windows-1253, x-mac-icelandic, ISO-8859-10, ISO-8859-3
intl.charsetmenu.browser.more2=ISO-8859-4, ISO-8859-13, windows-1257, IBM852, ISO-8859-2, x-mac-ce, windows-1250, x-mac-croatian, IBM855, ISO-8859-5, ISO-IR-111, KOI8-R, x-mac-cyrillic, windows-1251, IBM866, KOI8-U, x-mac-ukrainian, ISO-8859-16, x-mac-romanian
intl.charsetmenu.browser.more3=GB2312, x-gbk, gb18030, HZ-GB-2312, ISO-2022-CN, Big5, Big5-HKSCS, x-euc-tw, EUC-JP, ISO-2022-JP, Shift_JIS, EUC-KR, x-windows-949, x-johab, ISO-2022-KR
intl.charsetmenu.browser.more4=armscii-8, GEOSTD8, TIS-620, ISO-8859-11, windows-874, IBM857, ISO-8859-9, x-mac-turkish, windows-1254, x-viet-tcvn5712, VISCII, x-viet-vps, windows-1258, x-mac-devanagari, x-mac-gujarati, x-mac-gurmukhi
intl.charsetmenu.browser.more5=ISO-8859-6, windows-1256, IBM864, x-mac-arabic, x-mac-farsi, ISO-8859-8-I, windows-1255, ISO-8859-8, IBM862, x-mac-hebrew
# Localization Note: Never change the following entry.
intl.charsetmenu.browser.unicode=UTF-8, UTF-16LE, UTF-16BE, UTF-32LE, UTF-32BE, UTF-7
intl.charset.default=ISO-8859-1
intl.charset.detector=
intl.charsetmenu.mailedit=ISO-8859-1, ISO-8859-15, ISO-8859-6, armscii-8, geostd8, ISO-8859-13, ISO-8859-14, ISO-8859-2, GB2312, GB18030, Big5, KOI8-R, windows-1251, KOI8-U, ISO-8859-7, ISO-8859-8-I, ISO-2022-JP, EUC-KR, ISO-8859-10, ISO-8859-3, TIS-620, ISO-8859-9, UTF-8, VISCII

4
toolkit/obsolete/locale/charset.dtd
View File

@ -13,6 +13,8 @@
<!ENTITY charsetMenuMore4.label "SE &amp; SW Asian">
<!ENTITY charsetMenuMore4.accesskey "S">
<!ENTITY charsetMenuMore5.label "Middle Eastern">
<!ENTITY charsetMenuMore5.accesskey "m">
<!ENTITY charsetMenuMore5.accesskey "M">
<!ENTITY charsetMenuUnicode.label "Unicode">
<!ENTITY charsetMenuUnicode.accesskey "U">
<!ENTITY charsetCustomize.label "Customize...">
<!ENTITY charsetCustomize.accesskey "c">

5
xpfe/browser/resources/locale/en-US/navigator.properties
View File

@ -20,15 +20,18 @@ jserror=An error has occurred on this page. Double click here for details.
# adding charsets to your localized version, please refer to
# intl/uconv/src/charsetalias.properties file for the list of canonical
# charset names and use canonical names exactly as listed there.
# Also, note that UTF-8 MUST be listed in intl.charsetmenu.browser.static.
general.useragent.locale=en-US
font.language.group=x-western
intl.accept_languages=en-us, en
intl.charsetmenu.browser.static=ISO-8859-1
intl.charsetmenu.browser.static=ISO-8859-1, UTF-8
intl.charsetmenu.browser.more1=ISO-8859-1, ISO-8859-15, IBM850, x-mac-roman, windows-1252, ISO-8859-14, ISO-8859-7, x-mac-greek, windows-1253, x-mac-icelandic, ISO-8859-10, ISO-8859-3
intl.charsetmenu.browser.more2=ISO-8859-4, ISO-8859-13, windows-1257, IBM852, ISO-8859-2, x-mac-ce, windows-1250, x-mac-croatian, IBM855, ISO-8859-5, ISO-IR-111, KOI8-R, x-mac-cyrillic, windows-1251, IBM866, KOI8-U, x-mac-ukrainian, ISO-8859-16, x-mac-romanian
intl.charsetmenu.browser.more3=GB2312, x-gbk, gb18030, HZ-GB-2312, ISO-2022-CN, Big5, Big5-HKSCS, x-euc-tw, EUC-JP, ISO-2022-JP, Shift_JIS, EUC-KR, x-windows-949, x-johab, ISO-2022-KR
intl.charsetmenu.browser.more4=armscii-8, GEOSTD8, TIS-620, ISO-8859-11, windows-874, IBM857, ISO-8859-9, x-mac-turkish, windows-1254, x-viet-tcvn5712, VISCII, x-viet-vps, windows-1258, x-mac-devanagari, x-mac-gujarati, x-mac-gurmukhi
intl.charsetmenu.browser.more5=ISO-8859-6, windows-1256, IBM864, x-mac-arabic, x-mac-farsi, ISO-8859-8-I, windows-1255, ISO-8859-8, IBM862, x-mac-hebrew
# Localization Note: Do NOT change this entry.
intl.charsetmenu.browser.unicode=UTF-8, UTF-16LE, UTF-16BE, UTF-32LE, UTF-32BE, UTF-7
intl.charset.default=ISO-8859-1
intl.charset.detector=
intl.charsetmenu.mailedit=ISO-8859-1, ISO-8859-15, ISO-8859-6, armscii-8, geostd8, ISO-8859-13, ISO-8859-14, ISO-8859-2, GB2312, GB18030, Big5, KOI8-R, windows-1251, KOI8-U, ISO-8859-7, ISO-8859-8-I, ISO-2022-JP, EUC-KR, ISO-8859-10, ISO-8859-3, TIS-620, ISO-8859-9, UTF-8, VISCII

15
xpfe/components/intl/nsCharsetMenu.cpp
View File

@ -85,6 +85,7 @@ static const char kURINC_BrowserMore2CharsetMenuRoot[] = "NC:BrowserMore2Charset
static const char kURINC_BrowserMore3CharsetMenuRoot[] = "NC:BrowserMore3CharsetMenuRoot";
static const char kURINC_BrowserMore4CharsetMenuRoot[] = "NC:BrowserMore4CharsetMenuRoot";
static const char kURINC_BrowserMore5CharsetMenuRoot[] = "NC:BrowserMore5CharsetMenuRoot";
static const char kURINC_BrowserUnicodeCharsetMenuRoot[] = "NC:BrowserUnicodeCharsetMenuRoot";
static const char kURINC_MaileditCharsetMenuRoot[] = "NC:MaileditCharsetMenuRoot";
static const char kURINC_MailviewCharsetMenuRoot[] = "NC:MailviewCharsetMenuRoot";
static const char kURINC_ComposerCharsetMenuRoot[] = "NC:ComposerCharsetMenuRoot";
@ -168,6 +169,7 @@ private:
static nsIRDFResource * kNC_BrowserMore3CharsetMenuRoot;
static nsIRDFResource * kNC_BrowserMore4CharsetMenuRoot;
static nsIRDFResource * kNC_BrowserMore5CharsetMenuRoot;
static nsIRDFResource * kNC_BrowserUnicodeCharsetMenuRoot;
static nsIRDFResource * kNC_MaileditCharsetMenuRoot;
static nsIRDFResource * kNC_MailviewCharsetMenuRoot;
static nsIRDFResource * kNC_ComposerCharsetMenuRoot;
@ -479,6 +481,7 @@ nsIRDFResource * nsCharsetMenu::kNC_BrowserMore2CharsetMenuRoot = NULL;
nsIRDFResource * nsCharsetMenu::kNC_BrowserMore3CharsetMenuRoot = NULL;
nsIRDFResource * nsCharsetMenu::kNC_BrowserMore4CharsetMenuRoot = NULL;
nsIRDFResource * nsCharsetMenu::kNC_BrowserMore5CharsetMenuRoot = NULL;
nsIRDFResource * nsCharsetMenu::kNC_BrowserUnicodeCharsetMenuRoot = NULL;
nsIRDFResource * nsCharsetMenu::kNC_MaileditCharsetMenuRoot = NULL;
nsIRDFResource * nsCharsetMenu::kNC_MailviewCharsetMenuRoot = NULL;
nsIRDFResource * nsCharsetMenu::kNC_ComposerCharsetMenuRoot = NULL;
@ -721,6 +724,8 @@ nsresult nsCharsetMenu::Init()
&kNC_BrowserMore4CharsetMenuRoot);
mRDFService->GetResource(NS_LITERAL_CSTRING(kURINC_BrowserMore5CharsetMenuRoot),
&kNC_BrowserMore5CharsetMenuRoot);
mRDFService->GetResource(NS_LITERAL_CSTRING(kURINC_BrowserUnicodeCharsetMenuRoot),
&kNC_BrowserUnicodeCharsetMenuRoot);
mRDFService->GetResource(NS_LITERAL_CSTRING(kURINC_MaileditCharsetMenuRoot),
&kNC_MaileditCharsetMenuRoot);
mRDFService->GetResource(NS_LITERAL_CSTRING(kURINC_MailviewCharsetMenuRoot),
@ -762,6 +767,8 @@ nsresult nsCharsetMenu::Init()
if (NS_FAILED(res)) goto done;
res = rdfUtil->MakeSeq(mInner, kNC_BrowserMore5CharsetMenuRoot, NULL);
if (NS_FAILED(res)) goto done;
res = rdfUtil->MakeSeq(mInner, kNC_BrowserUnicodeCharsetMenuRoot, NULL);
if (NS_FAILED(res)) goto done;
res = rdfUtil->MakeSeq(mInner, kNC_MaileditCharsetMenuRoot, NULL);
if (NS_FAILED(res)) goto done;
res = rdfUtil->MakeSeq(mInner, kNC_MailviewCharsetMenuRoot, NULL);
@ -794,6 +801,7 @@ nsresult nsCharsetMenu::Done()
NS_IF_RELEASE(kNC_BrowserMore3CharsetMenuRoot);
NS_IF_RELEASE(kNC_BrowserMore4CharsetMenuRoot);
NS_IF_RELEASE(kNC_BrowserMore5CharsetMenuRoot);
NS_IF_RELEASE(kNC_BrowserUnicodeCharsetMenuRoot);
NS_IF_RELEASE(kNC_MaileditCharsetMenuRoot);
NS_IF_RELEASE(kNC_MailviewCharsetMenuRoot);
NS_IF_RELEASE(kNC_ComposerCharsetMenuRoot);
@ -1236,11 +1244,13 @@ nsresult nsCharsetMenu::InitMoreSubmenus(nsCStringArray& aDecs)
nsCOMPtr<nsIRDFContainer> container3;
nsCOMPtr<nsIRDFContainer> container4;
nsCOMPtr<nsIRDFContainer> container5;
nsCOMPtr<nsIRDFContainer> containerU;
const char key1[] = "intl.charsetmenu.browser.more1";
const char key2[] = "intl.charsetmenu.browser.more2";
const char key3[] = "intl.charsetmenu.browser.more3";
const char key4[] = "intl.charsetmenu.browser.more4";
const char key5[] = "intl.charsetmenu.browser.more5";
const char keyU[] = "intl.charsetmenu.browser.unicode";
res = NewRDFContainer(mInner, kNC_BrowserMore1CharsetMenuRoot,
getter_AddRefs(container1));
@ -1267,6 +1277,11 @@ nsresult nsCharsetMenu::InitMoreSubmenus(nsCStringArray& aDecs)
if (NS_FAILED(res)) return res;
AddFromPrefsToMenu(NULL, container5, key5, aDecs, NULL);
res = NewRDFContainer(mInner, kNC_BrowserUnicodeCharsetMenuRoot,
getter_AddRefs(containerU));
if (NS_FAILED(res)) return res;
AddFromPrefsToMenu(NULL, containerU, keyU, aDecs, NULL);
NS_TIMELINE_STOP_TIMER("nsCharsetMenu::InitMoreSubmenus");
NS_TIMELINE_MARK_TIMER("nsCharsetMenu::InitMoreSubmenus");

24
xpfe/global/resources/content/charsetOverlay.xul
View File

@ -99,6 +99,17 @@
<menupopup>
</menupopup>
</menu>
<menu label="&charsetMenuUnicode.label;" accesskey="&charsetMenuUnicode.accesskey;" datasources="rdf:charset-menu" ref="NC:BrowserUnicodeCharsetMenuRoot">
<template>
<rule>
<menupopup>
<menuitem uri="..." label="rdf:http://home.netscape.com/NC-rdf#Name"/>
</menupopup>
</rule>
</template>
<menupopup>
</menupopup>
</menu>
<menuseparator />
</menupopup>
</menu>
@ -134,7 +145,7 @@
<menupopup>
</menupopup>
</menu>
<menu label="&charsetMenuMore.label;" datasources="rdf:charset-menu" ref="NC:BrowserMoreCharsetMenuRoot">
<menu label="&charsetMenuMore.label;" accesskey="&charsetMenuMore.accesskey;" datasources="rdf:charset-menu" ref="NC:BrowserMoreCharsetMenuRoot">
<template>
<rule>
<menupopup>
@ -314,6 +325,17 @@
<menupopup>
</menupopup>
</menu>
<menu label="&charsetMenuUnicode.label;" accesskey="&charsetMenuUnicode.accesskey;" datasources="rdf:charset-menu" ref="NC:BrowserUnicodeCharsetMenuRoot">
<template>
<rule>
<menupopup>
<menuitem uri="..." label="rdf:http://home.netscape.com/NC-rdf#Name"/>
</menupopup>
</rule>
</template>
<menupopup>
</menupopup>
</menu>
<menuseparator />
</menupopup>
</menu>

4
xpfe/global/resources/locale/en-US/charsetOverlay.dtd
View File

@ -14,6 +14,8 @@
<!ENTITY charsetMenuMore4.label "SE &amp; SW Asian">
<!ENTITY charsetMenuMore4.accesskey "S">
<!ENTITY charsetMenuMore5.label "Middle Eastern">
<!ENTITY charsetMenuMore5.accesskey "m">
<!ENTITY charsetMenuMore5.accesskey "M">
<!ENTITY charsetMenuUnicode.label "Unicode">
<!ENTITY charsetMenuUnicode.accesskey "U">
<!ENTITY charsetCustomize.label "Customize...">
<!ENTITY charsetCustomize.accesskey "c">