Bug 1069909 - React to the removal of ISO-8859-6-I and -E and ISO-8859-8-E as Gecko-canonical names. r=jcranmer, a=mkmelin
authorMagnus Melin <mkmelin+mozilla@iki.fi>
Sat, 13 Dec 2014 13:50:36 +0200
changeset 17205 7b473eaef53df94e0e376308b26795a36dac78ff
parent 17204 03a14c5d78a38738e33e1ce8f40f351384deabde
child 17206 2843a3e7968ba370c5e7b8723ccfff1fe7465fec
push id10639
push usermkmelin@iki.fi
push dateSat, 13 Dec 2014 12:05:33 +0000
treeherdercomm-central@dbab5a531594 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjcranmer, mkmelin
bugs1069909
Bug 1069909 - React to the removal of ISO-8859-6-I and -E and ISO-8859-8-E as Gecko-canonical names. r=jcranmer, a=mkmelin Make these mappings: * iso-8859-6-i -> ISO-8859-6 * iso-8859-6-e -> ISO-8859-6 * iso-8859-8-e -> ISO-8859-8
mail/locales/en-US/chrome/messenger/charsetTitles.properties
mailnews/intl/charsetData.properties
mailnews/intl/charsetalias.properties
suite/locales/en-US/chrome/mailnews/charsetTitles.properties
--- a/mail/locales/en-US/chrome/messenger/charsetTitles.properties
+++ b/mail/locales/en-US/chrome/messenger/charsetTitles.properties
@@ -56,21 +56,18 @@ windows-1253.title = Greek (Windows-1253
 x-mac-greek.title = Greek (MacGreek)
 windows-1258.title = Vietnamese (Windows-1258)
 x-viet-tcvn5712.title = Vietnamese (TCVN)
 viscii.title = Vietnamese (VISCII)
 x-viet-vps.title = Vietnamese (VPS)
 windows-874.title = Thai (Windows-874)
 armscii-8.title = Armenian (ARMSCII-8)
 iso-8859-6.title = Arabic (ISO-8859-6)
-iso-8859-6-i.title = Arabic (ISO-8859-6-I)
-iso-8859-6-e.title = Arabic (ISO-8859-6-E)
 iso-8859-8.title = Hebrew Visual (ISO-8859-8)
 iso-8859-8-i.title = Hebrew (ISO-8859-8-I)
-iso-8859-8-e.title = Hebrew (ISO-8859-8-E)
 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)
--- a/mailnews/intl/charsetData.properties
+++ b/mailnews/intl/charsetData.properties
@@ -25,21 +25,18 @@ x-mac-hebrew.isInternal                 
 x-imap4-modified-utf7.isInternal        = true
 t.61-8bit.isInternal                    = true
 replacement.isInternal                  = true
 
 t.61-8bit.notForOutgoing                = true
 utf-7.notForOutgoing                    = true
 x-imap4-modified-utf7.notForOutgoing    = true
 us-ascii.notForOutgoing                 = true
-iso-8859-6-e.notForOutgoing             = true
-iso-8859-6-i.notForOutgoing             = true
 ibm1125.notForOutgoing                  = true
 ibm1131.notForOutgoing                  = true
-iso-8859-8-e.notForOutgoing             = true
 iso-8859-8.notForOutgoing               = true
 x-johab.notForOutgoing                  = true
 replacement.notForOutgoing              = true
 
 # XXX : there are some entries only necessary for Gtk/Xlib builds
 # to map  XLFD registry-encoding pairs to langGroups. they can be
 # removed once bug 215537 is fixed.
 
@@ -83,21 +80,18 @@ iso-8859-14.LangGroup              = x-w
 iso-8859-15.LangGroup              = x-western
 iso-8859-2.LangGroup               = x-central-euro
 iso-8859-16.LangGroup              = x-central-euro
 iso-8859-3.LangGroup               = x-western
 iso-8859-4.LangGroup               = x-baltic
 iso-8859-13.LangGroup              = x-baltic
 iso-8859-5.LangGroup               = x-cyrillic
 iso-8859-6.LangGroup               = ar
-iso-8859-6-e.LangGroup             = ar
-iso-8859-6-i.LangGroup             = ar
 iso-8859-7.LangGroup               = el
 iso-8859-8.LangGroup               = he
-iso-8859-8-e.LangGroup             = he
 iso-8859-8-i.LangGroup             = he
 jis_0208-1983.LangGroup            = ja
 koi8-r.LangGroup                   = x-cyrillic
 koi8-u.LangGroup                   = x-cyrillic
 shift_jis.LangGroup                = ja
 windows-874.LangGroup              = th
 us-ascii.LangGroup                 = x-western
 t.61-8bit.LangGroup                = x-western
--- a/mailnews/intl/charsetalias.properties
+++ b/mailnews/intl/charsetalias.properties
@@ -13,19 +13,16 @@
 # labelsencodings.properties. Besides aliases it contains labels for charsets
 # that are not part of the HTML5 world, but still are supported for e-mail.
 
 ascii=us-ascii
 us-ascii=us-ascii
 ansi_x3.4-1968=us-ascii
 646=us-ascii
 iso-8859-1=ISO-8859-1
-iso-8859-6-i=ISO-8859-6-I
-iso-8859-6-e=ISO-8859-6-E
-iso-8859-8-e=ISO-8859-8-E
 utf-16=UTF-16
 utf-7=UTF-7
 gb2312=GB2312
 viscii=VISCII
 t.61-8bit=T.61-8bit
 hz-gb-2312=HZ-GB-2312
 
 # Netscape private ...
@@ -55,28 +52,19 @@ latin1=ISO-8859-1
 iso_8859-1=ISO-8859-1
 iso8859-1=ISO-8859-1
 iso_8859-1:1987=ISO-8859-1
 iso-ir-100=ISO-8859-1
 l1=ISO-8859-1
 cp819=ISO-8859-1
 csisolatin1=ISO-8859-1
 
-# Aliases for ISO-8859-6-I
-csiso88596i=ISO-8859-6-I
-
-# Aliases for ISO-8859-6-E
-csiso88596e=ISO-8859-6-E
-
 # Aliases for ISO-8859-8-I
 iso-8859-8i=ISO-8859-8-I
 
-# Aliases for ISO-8859-8-E
-csiso88598e=ISO-8859-8-E
-
 # Aliases for Shift_JIS
 cp932=Shift_JIS
 
 # Aliases for ISO-2022-JP
 # The following are really not aliases ISO-2022-JP, but sharing the same decoder
 iso-2022-jp-2=ISO-2022-JP
 csiso2022jp2=ISO-2022-JP
 
--- a/suite/locales/en-US/chrome/mailnews/charsetTitles.properties
+++ b/suite/locales/en-US/chrome/mailnews/charsetTitles.properties
@@ -56,21 +56,18 @@ windows-1253.title = Greek (Windows-1253
 x-mac-greek.title = Greek (MacGreek)
 windows-1258.title = Vietnamese (Windows-1258)
 x-viet-tcvn5712.title = Vietnamese (TCVN)
 viscii.title = Vietnamese (VISCII)
 x-viet-vps.title = Vietnamese (VPS)
 windows-874.title = Thai (Windows-874)
 armscii-8.title = Armenian (ARMSCII-8)
 iso-8859-6.title = Arabic (ISO-8859-6)
-iso-8859-6-i.title = Arabic (ISO-8859-6-I)
-iso-8859-6-e.title = Arabic (ISO-8859-6-E)
 iso-8859-8.title = Hebrew Visual (ISO-8859-8)
 iso-8859-8-i.title = Hebrew (ISO-8859-8-I)
-iso-8859-8-e.title = Hebrew (ISO-8859-8-E)
 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)