From 333e1ba4e53456a603621274177ae9393b9d5385 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Fri, 22 May 2015 14:57:11 -0700 Subject: Remove obsolete aliases that broke 'locale -a' MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [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. --- intl/locale.alias | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'intl') diff --git a/intl/locale.alias b/intl/locale.alias index ab1cb7a99f..fe19e1b863 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å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çais fr_FR.ISO-8859-1 french fr_FR.ISO-8859-1 galego gl_ES.ISO-8859-1 galician gl_ES.ISO-8859-1 -- cgit v1.2.1