XFree86-locale.alias.patch

   1 Hi!
   2
   3 Since end of October glibc does not canonicalize locale names returned by
   4 setlocale and as X looks up its locale alias without doing some obvious
   5 transformations like:
   6 s/\.iso8859\([0-9]*\)$/.ISO8859-\1/
   7 s/\.ISO-8859-\([0-9]*\)$/.ISO8859-\1/
   8 some X programs are either not localized any longer, or worse if not doing
   9 any error checking crash (such as rxvt).
  10 I think it would be good if X did these transformations (the size of its
  11 locale.alias could decrease quite a bit then), but I wonder if in the mean
  12 time a patch like this could not be used (these are just locales mentioned
  13 in glibc's locale.alias):
  14
  15 --- xc/nls/locale.alias.jj      Wed Dec  6 23:00:42 2000
  16 +++ xc/nls/locale.alias Wed Dec 13 17:43:26 2000
  17 @@ -559,12 +559,14 @@ br_FR.iso885915:                          br_FR.ISO8859-15
  18  ca:                                            ca_ES.ISO8859-1
  19  ca_ES:                                         ca_ES.ISO8859-1
  20  ca_ES.iso88591:                                        ca_ES.ISO8859-1
  21 +ca_ES.ISO-8859-1:                              ca_ES.ISO8859-1
  22  ca_ES.iso885915:                               ca_ES.ISO8859-15
  23  cs:                                            cs_CZ.ISO8859-2
  24  cs_CS:                                         cs_CZ.ISO8859-2
  25  cs_CS.ISO8859-2:                               cs_CZ.ISO8859-2
  26  cs_CZ:                                         cs_CZ.ISO8859-2
  27  cs_CZ.iso88592:                                        cs_CZ.ISO8859-2
  28 +cs_CZ.ISO-8859-2:                              cs_CZ.ISO8859-2
  29  cs_CZ.ISO_8859-2:                              cs_CZ.ISO8859-2
  30  XCOMM cz is old name for cs, should be deleted in the future:
  31  cz:                                            cs_CZ.ISO8859-2
  32 @@ -579,8 +581,9 @@ da_DK:                                              da_DK.ISO8859-1
  33  da_DK.88591:                                   da_DK.ISO8859-1
  34  da_DK.88591.en:                                        da_DK.ISO8859-1
  35  da_DK.iso88591:                                        da_DK.ISO8859-1
  36 -da_DK.ISO_8859-1:                              da_DK.ISO8859-1
  37  da_DK.iso885915:                               da_DK.ISO8859-15
  38 +da_DK.ISO-8859-1:                              da_DK.ISO8859-1
  39 +da_DK.ISO_8859-1:                              da_DK.ISO8859-1
  40  de:                                            de_DE.ISO8859-1
  41  de_AT:                                         de_AT.ISO8859-1
  42  de_AT.iso88591:                                        de_AT.ISO8859-1
  43 @@ -594,6 +597,7 @@ de_DE:                                              de_DE.ISO8859-1
  44  de_DE.88591:                                   de_DE.ISO8859-1
  45  de_DE.88591.en:                                        de_DE.ISO8859-1
  46  de_DE.iso88591:                                        de_DE.ISO8859-1
  47 +de_DE.ISO-8859-1:                              de_DE.ISO8859-1
  48  de_DE.ISO_8859-1:                              de_DE.ISO8859-1
  49  de_DE.iso885915:                               de_DE.ISO8859-15
  50  GER_DE.8859:                                   de_DE.ISO8859-1
  51 @@ -604,6 +608,7 @@ ee_EE.iso88594:                                     ee_EE.ISO8859-4
  52  el:                                            el_GR.ISO8859-7
  53  el_GR:                                         el_GR.ISO8859-7
  54  el_GR.iso88597:                                        el_GR.ISO8859-7
  55 +el_GR.ISO-8859-7:                              el_GR.ISO8859-7
  56  en:                                            en_US.ISO8859-1
  57  en_AU:                                         en_AU.ISO8859-1
  58  en_AU.iso88591:                                        en_AU.ISO8859-1
  59 @@ -651,6 +656,7 @@ es_ES:                                              es_ES.ISO8859-1
  60  es_ES.88591:                                   es_ES.ISO8859-1
  61  es_ES.88591.en:                                        es_ES.ISO8859-1
  62  es_ES.iso88591:                                        es_ES.ISO8859-1
  63 +es_ES.ISO-8859-1:                              es_ES.ISO8859-1
  64  es_ES.ISO_8859-1:                              es_ES.ISO8859-1
  65  es_GT:                                         es_GT.ISO8859-1
  66  es_GT.iso88591:                                        es_GT.ISO8859-1
  67 @@ -685,6 +691,7 @@ XCOMM charset. EVS8:2000 specifies ISO88
  68  et:                                            et_EE.ISO8859-15
  69  et_EE:                                         et_EE.ISO8859-15
  70  et_EE.iso88591:                                        et_EE.ISO8859-1
  71 +et_EE.ISO-8859-1:                              et_EE.ISO8859-1
  72  et_EE.iso88594:                                        et_EE.ISO8859-4
  73  et_EE.iso885913:                               et_EE.ISO8859-13
  74  et_EE.iso885915:                               et_EE.ISO8859-15
  75 @@ -700,6 +707,7 @@ fi_FI:                                              fi_FI.ISO8859-15
  76  fi_FI.88591:                                   fi_FI.ISO8859-1
  77  fi_FI.88591.en:                                        fi_FI.ISO8859-1
  78  fi_FI.iso88591:                                        fi_FI.ISO8859-1
  79 +fi_FI.ISO-8859-1:                              fi_FI.ISO8859-1
  80  fi_FI.ISO_8859-1:                              fi_FI.ISO8859-1
  81  fi_FI.iso885915:                               fi_FI.ISO8859-15
  82  fo:                                            fo_FO.ISO8859-1
  83 @@ -727,6 +735,7 @@ fr_FR:                                              fr_FR.ISO8859-1
  84  fr_FR.88591:                                   fr_FR.ISO8859-1
  85  fr_FR.88591.en:                                        fr_FR.ISO8859-1
  86  fr_FR.iso88591:                                        fr_FR.ISO8859-1
  87 +fr_FR.ISO-8859-1:                              fr_FR.ISO8859-1
  88  fr_FR.ISO_8859-1:                              fr_FR.ISO8859-1
  89  fr_FR.iso885915:                               fr_FR.ISO8859-15
  90  FRE_FR.8859:                                   fr_FR.ISO8859-1
  91 @@ -744,6 +753,7 @@ gd_GB.iso885915:                            gd_GB.ISO8859-15
  92  gl:                                            gl_ES.ISO8859-1
  93  gl_ES:                                         gl_ES.ISO8859-1
  94  gl_ES.iso88591:                                        gl_ES.ISO8859-1
  95 +gl_ES.ISO-8859-1:                              gl_ES.ISO8859-1
  96  gl_ES.iso885915:                               gl_ES.ISO8859-15
  97  he:                                            he_IL.ISO8859-8
  98  he_IL:                                         he_IL.ISO8859-8
  99 @@ -758,10 +768,12 @@ hi_IN.isciidev:                                   hi_IN.ISCII-DEV
 100  hr:                                            hr_HR.ISO8859-2
 101  hr_HR:                                         hr_HR.ISO8859-2
 102  hr_HR.iso88592:                                        hr_HR.ISO8859-2
 103 +hr_HR.ISO-8859-2:                              hr_HR.ISO8859-2
 104  hr_HR.ISO_8859-2:                              hr_HR.ISO8859-2
 105  hu:                                            hu_HU.ISO8859-2
 106  hu_HU:                                         hu_HU.ISO8859-2
 107  hu_HU.iso88592:                                        hu_HU.ISO8859-2
 108 +hu_HU.ISO-8859-2:                              hu_HU.ISO8859-2
 109  hy:                                            hy_AM.ARMSCII-8
 110  hy_AM:                                         hy_AM.ARMSCII-8
 111  hy_AM.armscii8:                                        hy_AM.ARMSCII-8
 112 @@ -775,6 +787,7 @@ in_ID:                                              id_ID.ISO8859-1
 113  is:                                            is_IS.ISO8859-1
 114  is_IS:                                         is_IS.ISO8859-1
 115  is_IS.iso88591:                                        is_IS.ISO8859-1
 116 +is_IS.ISO-8859-1:                              is_IS.ISO8859-1
 117  is_IS.ISO_8859-1:                              is_IS.ISO8859-1
 118  is_IS.iso885915:                               is_IS.ISO8859-15
 119  it:                                            it_IT.ISO8859-1
 120 @@ -786,6 +799,7 @@ it_IT:                                              it_IT.ISO8859-1
 121  it_IT.88591:                                   it_IT.ISO8859-1
 122  it_IT.88591.en:                                        it_IT.ISO8859-1
 123  it_IT.iso88591:                                        it_IT.ISO8859-1
 124 +it_IT.ISO-8859-1:                              it_IT.ISO8859-1
 125  it_IT.ISO_8859-1:                              it_IT.ISO8859-1
 126  it_IT.iso885915:                               it_IT.ISO8859-15
 127  iu:                                            iu_CA.NUNACOM-8
 128 @@ -796,6 +810,7 @@ XCOMM those lines should be deleted in a
 129  iw:                                            he_IL.ISO8859-8
 130  iw_IL:                                         he_IL.ISO8859-8
 131  iw_IL.iso88598:                                        he_IL.ISO8859-8
 132 +iw_IL.ISO-8859-8:                              iw_IL.ISO8859-8
 133  #ifndef __uxp__
 134  ja_JP:                                         ja_JP.eucJP
 135  #else /* __uxp__ */
 136 @@ -850,6 +865,7 @@ lt_LT:                                              lt_LT.ISO8859-13
 137  lt_LT.iso88594:                                        lt_LT.ISO8859-4
 138  lt_LT.ISO_8859-4:                              lt_LT.ISO8859-4
 139  lt_LT.iso885913:                               lt_LT.ISO8859-13
 140 +lt_LT.ISO-8859-13:                             lt_LT.ISO8859-13
 141  lt_LT.ISO_8859-13:                             lt_LT.ISO8859-13
 142  lv:                                            lv_LV.ISO8859-13
 143  lv_LV:                                         lv_LV.ISO8859-13
 144 @@ -880,6 +896,7 @@ nl_NL:                                              nl_NL.ISO8859-1
 145  nl_NL.88591:                                   nl_NL.ISO8859-1
 146  nl_NL.88591.en:                                        nl_NL.ISO8859-1
 147  nl_NL.iso88591:                                        nl_NL.ISO8859-1
 148 +nl_NL.ISO-8859-1:                              nl_NL.ISO8859-1
 149  nl_NL.ISO_8859-1:                              nl_NL.ISO8859-1
 150  nl_NL.iso885915:                               nl_NL.ISO8859-15
 151  no:                                            no_NO.ISO8859-1
 152 @@ -893,6 +910,8 @@ nb_NO.88591:                                        nb_NO.ISO8859-1
 153  ny_NO.88591:                                   ny_NO.ISO8859-1
 154  no_NO.88591.en:                                        no_NO.ISO8859-1
 155  no_NO.iso88591:                                        no_NO.ISO8859-1
 156 +no_NO.ISO-8859-1:                              no_NO.ISO8859-1
 157 +nb_NO.ISO-8859-1:                              nb_NO.ISO8859-1
 158  no_NO.ISO_8859-1:                              no_NO.ISO8859-1
 159  no_NO.iso885915:                               no_NO.ISO8859-15
 160  nb_NO.iso885915:                               nb_NO.ISO8859-15
 161 @@ -915,6 +934,7 @@ ph_PH.iso88591:                                     ph_PH.ISO8859-1
 162  pl:                                            pl_PL.ISO8859-2
 163  pl_PL:                                         pl_PL.ISO8859-2
 164  pl_PL.iso88592:                                        pl_PL.ISO8859-2
 165 +pl_PL.ISO-8859-2:                              pl_PL.ISO8859-2
 166  pp:                                            pp_AN.ISO8859-1
 167  pp_AN:                                         pp_AN.ISO8859-1
 168  pp_AN.iso88591:                                        pp_AN.ISO8859-1
 169 @@ -926,14 +946,17 @@ pt_PT:                                            pt_PT.ISO8859-1
 170  pt_PT.88591:                                   pt_PT.ISO8859-1
 171  pt_PT.88591.en:                                        pt_PT.ISO8859-1
 172  pt_PT.iso88591:                                        pt_PT.ISO8859-1
 173 +pt_PT.ISO-8859-1:                              pt_PT.ISO8859-1
 174  pt_PT.ISO_8859-1:                              pt_PT.ISO8859-1
 175  pt_PT.iso885915:                               pt_PT.ISO8859-1
 176  ro:                                            ro_RO.ISO8859-2
 177  ro_RO:                                         ro_RO.ISO8859-2
 178  ro_RO.iso88592:                                        ro_RO.ISO8859-2
 179 +ro_RO.ISO-8859-2:                              ro_RO.ISO8859-2
 180  ru:                                            ru_RU.KOI8-R
 181  ru_RU:                                         ru_RU.KOI8-R
 182  ru_RU.iso88595:                                        ru_RU.ISO8859-5
 183 +ru_RU.ISO-8859-5:                              ru_RU.ISO8859-5
 184  ru_RU.koi8r:                                   ru_RU.KOI8-R
 185  ru_RU.cp1251:                                  ru_RU.CP1251
 186  ru_RU.microsoftcp1251:                         ru_RU.CP1251
 187 @@ -958,10 +981,12 @@ sh_SP:                                            sh_YU.ISO8859-2
 188  sk:                                            sk_SK.ISO8859-2
 189  sk_SK:                                         sk_SK.ISO8859-2
 190  sk_SK.iso88592:                                        sk_SK.ISO8859-2
 191 +sk_SK.ISO-8859-2:                              sk_SK.ISO8859-2
 192  sl:                                            sl_SI.ISO8859-2
 193  sl_CS:                                         sl_CS.ISO8859-2
 194  sl_SI:                                         sl_SI.ISO8859-2
 195  sl_SI.iso88592:                                        sl_SI.ISO8859-2
 196 +sl_SI.ISO-8859-2:                              sl_SI.ISO8859-2
 197  sp:                                            sp_YU.ISO8859-5
 198  sp_YU:                                         sp_YU.ISO8859-5
 199  sq:                                            sq_AL.ISO8859-2
 200 @@ -980,6 +1005,7 @@ sv_SE:                                             sv_SE.ISO8859-1
 201  sv_SE.88591:                                   sv_SE.ISO8859-1
 202  sv_SE.88591.en:                                        sv_SE.ISO8859-1
 203  sv_SE.iso88591:                                        sv_SE.ISO8859-1
 204 +sv_SE.ISO-8859-1:                              sv_SE.ISO8859-1
 205  sv_SE.ISO_8859-1:                              sv_SE.ISO8859-1
 206  sv_SE.iso885915:                               sv_SE.ISO8859-15
 207  ta:                                            ta_IN.TSCII-0
 208 @@ -998,6 +1024,7 @@ tl_PH.iso88591:                                    tl_PH.ISO8859-1
 209  tr:                                            tr_TR.ISO8859-9
 210  tr_TR:                                         tr_TR.ISO8859-9
 211  tr_TR.iso88599:                                        tr_TR.ISO8859-9
 212 +tr_TR.ISO-8859-9:                              tr_TR.ISO8859-9
 213  tt:                                            tt_RU.TATAR-CYR
 214  tt_RU:                                         tt_RU.TATAR-CYR
 215  tt_RU.tatarcyr:                                        tt_RU.TATAR-CYR
 216 @@ -1055,22 +1082,42 @@ spanish_spain.8859:                             es_ES.ISO8859-1
 217  XCOMM The following locale names are used in HPUX 9.x
 218  american.iso88591:                             en_US.ISO8859-1
 219  arabic.iso88596:                               ar_AA.ISO8859-6
 220 +bokmal:                                                nb_NO.ISO8859-1
 221 +bokmål:                                                nb_NO.ISO8859-1
 222  bulgarian:                                     bg_BG.ISO8859-5
 223  c-french.iso88591:                             fr_CA.ISO8859-1
 224 +catalan:                                       ca_ES.ISO8859-1
 225  chinese-s:                                     zh_CN.eucCN
 226  chinese-t:                                     zh_TW.eucTW
 227  croatian:                                      hr_HR.ISO8859-2
 228  czech:                                         cs_CZ.ISO8859-2
 229 +danish:                                                da_DK.ISO8859-1
 230 +dansk:                                         da_DK.ISO8859-1
 231  danish.iso88591:                               da_DK.ISO8859-1
 232 +deutsch:                                       de_DE.ISO8859-1
 233 +dutch:                                         nl_NL.ISO8859-1
 234  dutch.iso88591:                                        nl_BE.ISO8859-1
 235 +eesti:                                         et_EE.ISO8859-1
 236  english.iso88591:                              en_EN.ISO8859-1
 237 +estonian:                                      et_EE.ISO8859-1
 238 +finnish:                                       fi_FI.ISO8859-1
 239  finnish.iso88591:                              fi_FI.ISO8859-1
 240 +français:                                      fr_FR.ISO8859-1
 241 +french:                                                fr_FR.ISO8859-1
 242  french.iso88591:                               fr_CH.ISO8859-1
 243 +galego:                                                gl_ES.ISO8859-1
 244 +galician:                                      gl_ES.ISO8859-1
 245 +german:                                                de_DE.ISO8859-1
 246  german.iso88591:                               de_CH.ISO8859-1
 247 +greek:                                         el_GR.ISO8859-7
 248  greek.iso88597:                                        el_GR.ISO8859-7
 249 +hebrew:                                                iw_IL.ISO8859-8
 250  hebrew.iso88598:                               iw_IL.ISO8859-8
 251 +hrvatski:                                      hr_HR.ISO8859-2
 252  hungarian:                                     hu_HU.ISO8859-2
 253  icelandic.iso88591:                            is_IS.ISO8859-1
 254 +icelandic:                                     is_IS.ISO8859-1
 255 +italian:                                       it_IT.ISO8859-1
 256  italian.iso88591:                              it_IT.ISO8859-1
 257  #if ! (defined(SVR4) && defined(sun))
 258  japanese:                                      ja_JP.SJIS
 259 @@ -1078,17 +1125,27 @@ japanese:                                       ja_JP.SJIS
 260  japanese:                                      ja_JP.eucJP
 261  #endif
 262  japanese.euc:                                  ja_JP.eucJP
 263 +japanese.sjis:                                 ja_JP.SJIS
 264  korean:                                                ko_KR.eucKR
 265 +korean.euc:                                    ko_KR.eucKR
 266 +lithuanian:                                    lt_LT.ISO8859-13
 267 +norwegian:                                     no_NO.ISO8859-1
 268  norwegian.iso88591:                            no_NO.ISO8859-1
 269 +portuguese:                                    pt_PT.ISO8859-1
 270  polish:                                                pl_PL.ISO8859-2
 271  portuguese.iso88591:                           pt_PT.ISO8859-1
 272 +romanian:                                      ro_RO.ISO8859-2
 273  rumanian:                                      ro_RO.ISO8859-2
 274  russian:                                       ru_RU.ISO8859-5
 275  serbocroatian:                                 sh_YU.ISO8859-2
 276  slovak:                                                sk_SK.ISO8859-2
 277  slovene:                                       sl_CS.ISO8859-2
 278 +slovenian:                                     sl_SI.ISO8859-2
 279 +spanish:                                       es_ES.ISO8859-1
 280  spanish.iso88591:                              es_ES.ISO8859-1
 281 +swedish:                                       sv_SE.ISO8859-1
 282  swedish.iso88591:                              sv_SE.ISO8859-1
 283 +turkish:                                       tr_TR.ISO8859-9
 284  turkish.iso88599:                              tr_TR.ISO8859-9
 285  univ.utf8:                                     en_US.UTF-8
 286  XCOMM Digital Unix utf
 287
 288
 289         Jakub