diff options
| author | Daiki Ueno <ueno@gnu.org> | 2015-06-23 12:28:41 +0900 |
|---|---|---|
| committer | Daiki Ueno <ueno@gnu.org> | 2015-06-23 12:29:11 +0900 |
| commit | 03ed1fb83b3d60004194a4c3d6e1f4df41fc0550 (patch) | |
| tree | e331dea02aa1a4f34770f67c6da1d5c05cd1936b /gettext-runtime/intl | |
| parent | 4c0c9292f434a716175ca6bb9c22e1eabfca888b (diff) | |
| download | external_gettext-03ed1fb83b3d60004194a4c3d6e1f4df41fc0550.zip external_gettext-03ed1fb83b3d60004194a4c3d6e1f4df41fc0550.tar.gz external_gettext-03ed1fb83b3d60004194a4c3d6e1f4df41fc0550.tar.bz2 | |
intl: Update locale.alias
* locale.alias: Update from glibc:
2015-05-22 Paul Eggert <eggert@cs.ucla.edu>
Remove obsolete aliases that broke 'locale -a'
[BZ #18412]
* intl/locale.alias: Remove obsolete aliases "bokmål" and "français"
which caused 'locale -a' to output Latin-1 data in UTF-8 locales,
breaking some applications that use 'locale -a' output.
Change the encoding of this file from Latin-1 to ASCII to avoid
other potential problems with people grepping this file.
Diffstat (limited to 'gettext-runtime/intl')
| -rw-r--r-- | gettext-runtime/intl/ChangeLog | 12 | ||||
| -rw-r--r-- | gettext-runtime/intl/locale.alias | 13 |
2 files changed, 23 insertions, 2 deletions
diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog index 3acba6e..b7f66a2 100644 --- a/gettext-runtime/intl/ChangeLog +++ b/gettext-runtime/intl/ChangeLog @@ -1,3 +1,15 @@ +2015-06-23 Daiki Ueno <ueno@gnu.org> + + * locale.alias: Update from glibc: + 2015-05-22 Paul Eggert <eggert@cs.ucla.edu> + Remove obsolete aliases that broke 'locale -a' + [BZ #18412] + * intl/locale.alias: Remove obsolete aliases "bokmål" and "français" + which caused 'locale -a' to output Latin-1 data in UTF-8 locales, + breaking some applications that use 'locale -a' output. + Change the encoding of this file from Latin-1 to ASCII to avoid + other potential problems with people grepping this file. + 2015-03-12 Daiki Ueno <ueno@gnu.org> intl: Update from gnulib diff --git a/gettext-runtime/intl/locale.alias b/gettext-runtime/intl/locale.alias index 5d28934..f5da182 100644 --- a/gettext-runtime/intl/locale.alias +++ b/gettext-runtime/intl/locale.alias @@ -25,10 +25,20 @@ # backward compatibility. Nobody should rely on the names defined here. # Locales should always be specified by their full name. +# Note: This file used to contain the following lines: +# bokmaal nb_NO.ISO-8859-1 +# franc,ais fr_FR.ISO-8859-1 +# except that the "aa" was actually the byte '\0xE5' (the Latin-1 +# encoding for U+00E5 LATIN SMALL LETTER A WITH RING ABOVE) and the +# "c," was actually the byte '\xE7' (the Latin-1 encoding for U+00E7 +# LATIN SMALL LETTER C WITH CEDILLA). These lines were removed +# because they caused 'locale -a' to output text encoded in Latin-1, +# which broke applications in UTF-8 locales. See: +# https://sourceware.org/bugzilla/show_bug.cgi?id=18412 + # Packages using this file: bokmal nb_NO.ISO-8859-1 -bokm�l nb_NO.ISO-8859-1 catalan ca_ES.ISO-8859-1 croatian hr_HR.ISO-8859-2 czech cs_CZ.ISO-8859-2 @@ -39,7 +49,6 @@ dutch nl_NL.ISO-8859-1 eesti et_EE.ISO-8859-1 estonian et_EE.ISO-8859-1 finnish fi_FI.ISO-8859-1 -fran�ais fr_FR.ISO-8859-1 french fr_FR.ISO-8859-1 galego gl_ES.ISO-8859-1 galician gl_ES.ISO-8859-1 |