From c4e126b1a84d6487f30c10a8f1ab496a01bd990e Mon Sep 17 00:00:00 2001 From: Mike FABIAN Date: Wed, 19 Feb 2014 11:46:45 +0100 Subject: [PATCH 1/2] fix spelling mistakes in ks_IN and sd_IN devanagari locales The codeset must be *before* the modifier. See also: http://pubs.opengroup.org/onlinepubs/7908799/xbd/envvar.html opengroup> The syntax for these environment variables is thus defined as: opengroup> opengroup> [language[_territory][.codeset][@modifier]] --- nls/compose.dir.pre | 4 ++-- nls/locale.alias.pre | 10 +++++----- nls/locale.dir.pre | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/nls/compose.dir.pre b/nls/compose.dir.pre index 455070f..c09f415 100644 --- a/nls/compose.dir.pre +++ b/nls/compose.dir.pre @@ -390,7 +390,7 @@ km_KH.UTF-8/Compose: km_KH.UTF-8 en_US.UTF-8/Compose: kn_IN.UTF-8 ko_KR.UTF-8/Compose: ko_KR.UTF-8 en_US.UTF-8/Compose: ks_IN.UTF-8 -en_US.UTF-8/Compose: ks_IN@devanagari.UTF-8 +en_US.UTF-8/Compose: ks_IN.UTF-8@devanagari en_US.UTF-8/Compose: ku_TR.UTF-8 en_US.UTF-8/Compose: kw_GB.UTF-8 en_US.UTF-8/Compose: ky_KG.UTF-8 @@ -430,7 +430,7 @@ en_US.UTF-8/Compose: ru_UA.UTF-8 en_US.UTF-8/Compose: rw_RW.UTF-8 en_US.UTF-8/Compose: sa_IN.UTF-8 en_US.UTF-8/Compose: sd_IN.UTF-8 -en_US.UTF-8/Compose: sd_IN@devanagari.UTF-8 +en_US.UTF-8/Compose: sd_IN.UTF-8@devanagari en_US.UTF-8/Compose: se_NO.UTF-8 en_US.UTF-8/Compose: sh_BA.UTF-8 en_US.UTF-8/Compose: sh_YU.UTF-8 diff --git a/nls/locale.alias.pre b/nls/locale.alias.pre index 1319492..63d2246 100644 --- a/nls/locale.alias.pre +++ b/nls/locale.alias.pre @@ -750,8 +750,8 @@ KO_KR.UTF-8: ko_KR.UTF-8 ks: ks_IN.UTF-8 ks_IN: ks_IN.UTF-8 ks_IN.utf8: ks_IN.UTF-8 -ks_IN@devanagari: ks_IN@devanagari.UTF-8 -ks_IN@devanagari.utf8: ks_IN@devanagari.UTF-8 +ks_IN@devanagari: ks_IN.UTF-8@devanagari +ks_IN.utf8@devanagari: ks_IN.UTF-8@devanagari kw: kw_GB.ISO8859-1 kw_GB: kw_GB.ISO8859-1 kw_GB.iso88591: kw_GB.ISO8859-1 @@ -982,9 +982,9 @@ rw_RW.ISO-8859-1: rw_RW.ISO8859-1 rw_RW.utf8: rw_RW.UTF-8 sd: sd_IN.UTF-8 sd_IN.utf8: sd_IN.UTF-8 -sd@devanagari: sd_IN@devanagari.UTF-8 -sd_IN@devanagari: sd_IN@devanagari.UTF-8 -sd_IN@devanagari.utf8: sd_IN@devanagari.UTF-8 +sd@devanagari: sd_INUTF-8@devanagari +sd_IN@devanagari: sd_INUTF-8@devanagari +sd_IN.utf8@devanagari: sd_INUTF-8@devanagari se_NO: se_NO.UTF-8 se_NO.utf8: se_NO.UTF-8 XCOMM sh was the old ISO code for Serbo-Croatian (now individual sr and hr). diff --git a/nls/locale.dir.pre b/nls/locale.dir.pre index ab1bace..be6f3ba 100644 --- a/nls/locale.dir.pre +++ b/nls/locale.dir.pre @@ -389,7 +389,7 @@ en_US.UTF-8/XLC_LOCALE: kl_GL.UTF-8 en_US.UTF-8/XLC_LOCALE: km_KH.UTF-8 en_US.UTF-8/XLC_LOCALE: kn_IN.UTF-8 en_US.UTF-8/XLC_LOCALE: ks_IN.UTF-8 -en_US.UTF-8/XLC_LOCALE: ks_IN@devanagari.UTF-8 +en_US.UTF-8/XLC_LOCALE: ks_IN.UTF-8@devanagari ko_KR.UTF-8/XLC_LOCALE: ko_KR.UTF-8 en_US.UTF-8/XLC_LOCALE: ku_TR.UTF-8 en_US.UTF-8/XLC_LOCALE: kw_GB.UTF-8 @@ -429,7 +429,7 @@ en_US.UTF-8/XLC_LOCALE: ru_UA.UTF-8 en_US.UTF-8/XLC_LOCALE: rw_RW.UTF-8 en_US.UTF-8/XLC_LOCALE: sa_IN.UTF-8 en_US.UTF-8/XLC_LOCALE: sd_IN.UTF-8 -en_US.UTF-8/XLC_LOCALE: sd_IN@devanagari.UTF-8 +en_US.UTF-8/XLC_LOCALE: sd_IN.UTF-8@devanagari en_US.UTF-8/XLC_LOCALE: se_NO.UTF-8 en_US.UTF-8/XLC_LOCALE: sh_BA.UTF-8 en_US.UTF-8/XLC_LOCALE: sh_YU.UTF-8 -- 1.8.5.3