locale polishing: lt_LT, et_EE, and en_IE changes
authorJohn Marino <draco@marino.st>
Mon, 10 Aug 2015 11:55:39 +0000 (13:55 +0200)
committerJohn Marino <draco@marino.st>
Mon, 10 Aug 2015 15:51:04 +0000 (17:51 +0200)
lt_LT: Remove ISO8859-4.  If an ISO encoding is needed, -13 would be
       used instead.
et_EE: Estonia could use ISO8859-4 (not present), the newer ISO8859-13
       (not present) or ISO8859-15 (present).  To be uniform with other
       European countries that use -15, change the default from UTF-8
       to ISO8859-15.  Do not bring in -4 or -13.
en_IE: Ireland only had UTF-8.  To be uniform with the UK and Western
       Europe, bring in ISO8859-15 and set that as the alias for the
       shortname.  Do not bring in -1.

15 files changed:
Makefile_upgrade.inc
etc/mtree/BSD.local.dist
etc/mtree/BSD.usr.dist
share/colldef/Makefile
share/ctypedef/Makefile
share/ctypedef/lt_LT.ISO8859-4.src [deleted symlink]
share/locale-links/Makefile
share/monetdef/Makefile
share/monetdef/en_IE.ISO8859-15.src [new file with mode: 0644]
share/msgdef/Makefile
share/numericdef/Makefile
share/timedef/Makefile
share/timedef/en_IE.ISO8859-15.src [moved from share/timedef/en_IE.UTF-8.src with 100% similarity]
share/timedef/lt_LT.ISO8859-4.src [deleted file]
tools/tools/locale/etc/charmaps.xml

index 33de0ec..80c64ae 100644 (file)
@@ -2165,6 +2165,7 @@ TO_REMOVE+=/boot/kernel/pst.ko
 TO_REMOVE+=/usr/share/tmac/mdoc/ru.KOI8-R
 TO_REMOVE+=/usr/bin/colldef
 TO_REMOVE+=/usr/share/locale/*.ISO-8859-15@euro
+TO_REMOVE+=/usr/share/locale/lt_LT.ISO8859-4
 
 .if ${MACHINE_ARCH} == "x86_64"
 TO_REMOVE+=/usr/sbin/kgzip
index a0afd12..8e3edc8 100644 (file)
             ..
             en_HK.UTF-8
             ..
+            en_IE.ISO8859-15
+            ..
             en_IE.UTF-8
             ..
             en_NZ.ISO8859-1
             ..
             lt_LT.ISO8859-13
             ..
-            lt_LT.ISO8859-4
-            ..
             lt_LT.UTF-8
             ..
             nb_NO.ISO8859-1
index ea41737..1eba132 100644 (file)
             ..
             en_HK.UTF-8
             ..
+            en_IE.ISO8859-15
+            ..
             en_IE.UTF-8
             ..
             en_NZ.ISO8859-1
             ..
             lt_LT.ISO8859-13
             ..
-            lt_LT.ISO8859-4
-            ..
             lt_LT.UTF-8
             ..
             lv_LV.ISO8859-13
index 838d935..1b8dae5 100644 (file)
@@ -127,6 +127,7 @@ SAME+=              en_US.UTF-8:en_NZ.US-ASCII
 SAME+=         en_US.UTF-8:en_NZ.ISO8859-15
 SAME+=         en_US.UTF-8:en_NZ.ISO8859-1
 SAME+=         en_US.UTF-8:en_IE.UTF-8
+SAME+=         en_US.UTF-8:en_IE.ISO8859-15
 SAME+=         en_US.UTF-8:en_HK.UTF-8
 SAME+=         en_US.UTF-8:en_HK.ISO8859-1
 SAME+=         en_US.UTF-8:en_GB.UTF-8
@@ -171,7 +172,6 @@ SAME+=              is_IS.UTF-8:is_IS.ISO8859-1
 SAME+=         ja_JP.UTF-8:ja_JP.SJIS
 SAME+=         ja_JP.UTF-8:ja_JP.eucJP
 SAME+=         ko_KR.UTF-8:ko_KR.eucKR
-SAME+=         lt_LT.UTF-8:lt_LT.ISO8859-4
 SAME+=         lt_LT.UTF-8:lt_LT.ISO8859-13
 SAME+=         lv_LV.UTF-8:lv_LV.ISO8859-13
 SAME+=         nb_NO.UTF-8:nb_NO.ISO8859-15
index ba29019..103b954 100644 (file)
@@ -32,7 +32,6 @@ LOCALES+=     ja_JP.UTF-8
 LOCALES+=      ja_JP.eucJP
 LOCALES+=      ko_KR.UTF-8
 LOCALES+=      ko_KR.eucKR
-LOCALES+=      lt_LT.ISO8859-4
 LOCALES+=      lv_LV.ISO8859-13
 LOCALES+=      ru_RU.CP1251
 LOCALES+=      ru_RU.CP866
@@ -158,6 +157,7 @@ SAME+=              en_US.ISO8859-15:et_EE.ISO8859-15
 SAME+=         en_US.ISO8859-15:es_ES.ISO8859-15
 SAME+=         en_US.ISO8859-15:en_ZA.ISO8859-15
 SAME+=         en_US.ISO8859-15:en_NZ.ISO8859-15
+SAME+=         en_US.ISO8859-15:en_IE.ISO8859-15
 SAME+=         en_US.ISO8859-15:en_GB.ISO8859-15
 SAME+=         en_US.ISO8859-15:en_CA.ISO8859-15
 SAME+=         en_US.ISO8859-15:en_AU.ISO8859-15
diff --git a/share/ctypedef/lt_LT.ISO8859-4.src b/share/ctypedef/lt_LT.ISO8859-4.src
deleted file mode 120000 (symlink)
index 8a34638..0000000
+++ /dev/null
@@ -1 +0,0 @@
-en_US.UTF-8.src
\ No newline at end of file
index ad67b92..856dcca 100644 (file)
@@ -28,14 +28,15 @@ STD1=       af_ZA en_AU en_CA en_HK en_NZ en_SG en_US en_ZA \
 STD2=  cs_CZ hr_HR hu_HU pl_PL ro_RO sk_SK sl_SI sr_Latn_RS
 STD5=  be_BY ru_RU uk_UA sr_Cyrl_RS
 STD15= ca_AD ca_ES ca_FR ca_IT da_DK de_AT de_CH de_DE \
-       en_GB es_ES eu_ES fi_FI fr_BE fr_CH fr_FR is_IS \
-       it_CH it_IT nb_NO nl_BE nl_NL nn_NO pt_PT sv_SE
+       en_GB en_IE es_ES et_EE eu_ES fi_FI fr_BE fr_CH \
+       fr_FR is_IS it_CH it_IT nb_NO nl_BE nl_NL nn_NO \
+       pt_PT sv_SE
 
 MANUAL=        lt_LT el_GR tr_TR lv_LV
 
 LOCALEDIR=     /usr/share/locale
 
-SYMLINKS=      lt_LT.ISO8859- ${LOCALEDIR}/lt_LT \
+SYMLINKS=      lt_LT.ISO8859-13 ${LOCALEDIR}/lt_LT \
                el_GR.ISO8859-7  ${LOCALEDIR}/el_GR \
                tr_TR.ISO8859-9  ${LOCALEDIR}/tr_TR \
                lv_LV.ISO8859-13 ${LOCALEDIR}/lv_LV \
index fcf03b5..5b3d30f 100644 (file)
@@ -33,6 +33,7 @@ LOCALES+=     en_GB.ISO8859-1
 LOCALES+=      en_GB.US-ASCII
 LOCALES+=      en_GB.UTF-8
 LOCALES+=      en_HK.ISO8859-1
+LOCALES+=      en_IE.ISO8859-15
 LOCALES+=      en_IE.UTF-8
 LOCALES+=      en_NZ.ISO8859-1
 LOCALES+=      en_PH.ISO8859-1
@@ -172,7 +173,6 @@ SAME+=              et_EE.UTF-8:pt_PT.UTF-8
 SAME+=         et_EE.UTF-8:sk_SK.UTF-8
 SAME+=         fi_FI.ISO8859-1:fr_FR.ISO8859-1
 SAME+=         fi_FI.ISO8859-1:lt_LT.ISO8859-13
-SAME+=         fi_FI.ISO8859-1:lt_LT.ISO8859-4
 SAME+=         fi_FI.ISO8859-1:pt_PT.ISO8859-1
 SAME+=         fi_FI.ISO8859-1:sk_SK.ISO8859-2
 SAME+=         fi_FI.ISO8859-1:sv_FI.ISO8859-1
diff --git a/share/monetdef/en_IE.ISO8859-15.src b/share/monetdef/en_IE.ISO8859-15.src
new file mode 100644 (file)
index 0000000..81d1443
--- /dev/null
@@ -0,0 +1,50 @@
+# Warning: Do not edit. This file is automatically generated from the
+# tools in /usr/src/tools/tools/locale. The data is obtained from the
+# CLDR project, obtained from http://cldr.unicode.org/
+# -----------------------------------------------------------------------------
+#
+# int_curr_symbol (last character always SPACE)
+EUR 
+#
+# currency_symbol
+#
+# mon_decimal_point
+.
+#
+# mon_thousands_sep
+,
+#
+# mon_grouping
+3
+#
+# positive_sign
+
+#
+# negative_sign
+-
+#
+# int_frac_digits
+2
+#
+# frac_digits
+2
+#
+# p_cs_precedes
+1
+#
+# p_sep_by_space
+0
+#
+# n_cs_precedes
+1
+#
+# n_sep_by_space
+0
+#
+# p_sign_posn
+1
+#
+# n_sign_posn
+1
+# EOF
index 01cccb6..9604fd3 100644 (file)
@@ -138,6 +138,7 @@ SAME+=              en_AU.ISO8859-1:en_GB.US-ASCII
 SAME+=         en_AU.ISO8859-1:en_GB.UTF-8
 SAME+=         en_AU.ISO8859-1:en_HK.ISO8859-1
 SAME+=         en_AU.ISO8859-1:en_HK.UTF-8
+SAME+=         en_AU.ISO8859-1:en_IE.ISO8859-15
 SAME+=         en_AU.ISO8859-1:en_IE.UTF-8
 SAME+=         en_AU.ISO8859-1:en_NZ.ISO8859-1
 SAME+=         en_AU.ISO8859-1:en_NZ.ISO8859-15
@@ -179,7 +180,6 @@ SAME+=              it_CH.ISO8859-1:it_CH.ISO8859-15
 SAME+=         it_CH.ISO8859-1:it_IT.ISO8859-1
 SAME+=         it_CH.ISO8859-1:it_IT.ISO8859-15
 SAME+=         it_CH.UTF-8:it_IT.UTF-8
-SAME+=         lt_LT.ISO8859-13:lt_LT.ISO8859-4
 SAME+=         lt_LT.ISO8859-13:lt_LT.UTF-8
 SAME+=         nb_NO.ISO8859-1:nb_NO.ISO8859-15
 SAME+=         nb_NO.ISO8859-1:nb_NO.UTF-8
index e511dfb..20f2bf8 100644 (file)
@@ -41,7 +41,6 @@ SAME+=                af_ZA.ISO8859-1:fr_FR.ISO8859-1
 SAME+=         af_ZA.ISO8859-1:fr_FR.ISO8859-15
 SAME+=         af_ZA.ISO8859-1:hu_HU.ISO8859-2
 SAME+=         af_ZA.ISO8859-1:lt_LT.ISO8859-13
-SAME+=         af_ZA.ISO8859-1:lt_LT.ISO8859-4
 SAME+=         af_ZA.ISO8859-1:lv_LV.ISO8859-13
 SAME+=         af_ZA.ISO8859-1:nb_NO.ISO8859-1
 SAME+=         af_ZA.ISO8859-1:nb_NO.ISO8859-15
@@ -96,6 +95,7 @@ SAME+=                am_ET.UTF-8:en_GB.US-ASCII
 SAME+=         am_ET.UTF-8:en_GB.UTF-8
 SAME+=         am_ET.UTF-8:en_HK.ISO8859-1
 SAME+=         am_ET.UTF-8:en_HK.UTF-8
+SAME+=         am_ET.UTF-8:en_IE.ISO8859-15
 SAME+=         am_ET.UTF-8:en_IE.UTF-8
 SAME+=         am_ET.UTF-8:en_NZ.ISO8859-1
 SAME+=         am_ET.UTF-8:en_NZ.ISO8859-15
index 496e147..4559530 100644 (file)
@@ -31,7 +31,7 @@ LOCALES+=     el_GR.UTF-8
 LOCALES+=      en_AU.ISO8859-1
 LOCALES+=      en_CA.ISO8859-1
 LOCALES+=      en_GB.ISO8859-1
-LOCALES+=      en_IE.UTF-8
+LOCALES+=      en_IE.ISO8859-15
 LOCALES+=      en_NZ.ISO8859-1
 LOCALES+=      en_PH.ISO8859-1
 LOCALES+=      en_US.ISO8859-1
@@ -77,7 +77,6 @@ LOCALES+=     kk_Cyrl_KZ.UTF-8
 LOCALES+=      ko_KR.UTF-8
 LOCALES+=      ko_KR.eucKR
 LOCALES+=      lt_LT.ISO8859-13
-LOCALES+=      lt_LT.ISO8859-4
 LOCALES+=      lt_LT.UTF-8
 LOCALES+=      lv_LV.ISO8859-13
 LOCALES+=      lv_LV.UTF-8
@@ -158,6 +157,7 @@ SAME+=              en_CA.ISO8859-1:en_CA.UTF-8
 SAME+=         en_GB.ISO8859-1:en_GB.ISO8859-15
 SAME+=         en_GB.ISO8859-1:en_GB.US-ASCII
 SAME+=         en_GB.ISO8859-1:en_GB.UTF-8
+SAME+=         en_IE.ISO8859-15:en_IE.UTF-8
 SAME+=         en_NZ.ISO8859-1:en_NZ.ISO8859-15
 SAME+=         en_NZ.ISO8859-1:en_NZ.US-ASCII
 SAME+=         en_NZ.ISO8859-1:en_NZ.UTF-8
diff --git a/share/timedef/lt_LT.ISO8859-4.src b/share/timedef/lt_LT.ISO8859-4.src
deleted file mode 100644 (file)
index c1549dd..0000000
+++ /dev/null
@@ -1,87 +0,0 @@
-# Warning: Do not edit. This file is automatically generated from the
-# tools in /usr/src/tools/tools/locale. The data is obtained from the
-# CLDR project, obtained from http://cldr.unicode.org/
-# -----------------------------------------------------------------------------
-#
-# Short month names
-saus.
-vas.
-kov.
-bal.
-geg.
-bir¾.
-liep.
-rugp.
-rugs.
-spal.
-lapkr.
-gruod.
-#
-# Long month names (as in a date)
-sausio
-vasario
-kovo
-baland¾io
-gegu¾ìs
-bir¾elio
-liepos
-rugpjþèio
-rugsìjo
-spalio
-lapkrièio
-gruod¾io
-#
-# Short weekday names
-sk
-pr
-an
-tr
-kt
-pn
-¹t
-#
-# Long weekday names
-sekmadienis
-pirmadienis
-antradienis
-treèiadienis
-ketvirtadienis
-penktadienis
-¹e¹tadienis
-#
-# X_fmt
-%H:%M:%S
-#
-# x_fmt
-%Y-%m-%d
-#
-# c_fmt
-%Y m. %B %e d. %H:%M:%S
-#
-# AM/PM
-prie¹piet
-popiet
-#
-# date_fmt
-%Y m. %B %e d. %H:%M:%S %Z
-#
-# Long month names (without case ending)
-sausis
-vasaris
-kovas
-balandis
-gegu¾ì
-bir¾elis
-liepa
-rugpjþtis
-rugsìjis
-spalis
-lapkritis
-gruodis
-#
-# md_order
-md
-#
-# ampm_fmt
-%I:%M:%S %p
-# EOF
index 0265bf4..96d7627 100644 (file)
@@ -58,6 +58,7 @@
                encoding="ISO8859-1 ISO8859-15 US-ASCII"
                countries="AU CA GB NZ US ZA" />
        <language name="en"
+               encoding="ISO8859-15"
                countries="IE" />
        <language name="en"
                encoding="ISO8859-1"
                encoding_link="eucKR:CP949"
                countries="KR" />
        <language name="lt"
-               encoding="ISO8859-4 ISO8859-13"
+               encoding="ISO8859-13"
                countries="LT" />
        <language name="lv"
                encoding="ISO8859-13"