46 lines
1.7 KiB
Diff
46 lines
1.7 KiB
Diff
|
commit 333e1ba4e53456a603621274177ae9393b9d5385
|
|||
|
|
Author: Paul Eggert <eggert@cs.ucla.edu>
|
|||
|
|
Date: Fri May 22 14:57:11 2015 -0700
|
|||
|
|
|
|||
|
|
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.
|
|||
|
|
|
|||
|
|
diff --git a/intl/locale.alias b/intl/locale.alias
|
|||
|
|
index ab1cb7a..fe19e1b 100644
|
|||
|
|
--- a/intl/locale.alias
|
|||
|
|
+++ b/intl/locale.alias
|
|||
|
|
@@ -24,8 +24,18 @@
|
|||
|
|
# 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
|
|||
|
|
+
|
|||
|
|
bokmal nb_NO.ISO-8859-1
|
|||
|
|
-bokm<6B>l nb_NO.ISO-8859-1
|
|||
|
|
catalan ca_ES.ISO-8859-1
|
|||
|
|
croatian hr_HR.ISO-8859-2
|
|||
|
|
czech cs_CZ.ISO-8859-2
|
|||
|
|
@@ -36,7 +46,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<61>ais fr_FR.ISO-8859-1
|
|||
|
|
french fr_FR.ISO-8859-1
|
|||
|
|
galego gl_ES.ISO-8859-1
|
|||
|
|
galician gl_ES.ISO-8859-1
|