[PATCH libX11 2/5] i18n: Treat 'a3_AZ' as an alias for 'az_AZ'.

[Magnus Kessler]

On Wednesday 05 Dec 2012 09:38:22 Egbert Eich wrote:
> locale.alias contains a comment:
> XCOMM a3 is not an ISO 639 language code, but in Cyrillic, "Z" looks like
> "3". Thus lets treat 'a3' as an alias for 'az'.
> 
> Signed-off-by: Egbert Eich <eich at freedesktop.org>
> ---
>  nls/compose.dir.pre  |    4 ++--
>  nls/locale.alias.pre |    8 +++++---
>  nls/locale.dir.pre   |    1 -
>  3 files changed, 7 insertions(+), 6 deletions(-)
> 
> diff --git a/nls/compose.dir.pre b/nls/compose.dir.pre
> index 85de6cf..fec22cf 100644
> --- a/nls/compose.dir.pre
> +++ b/nls/compose.dir.pre
> @@ -22,7 +22,7 @@ iso8859-6/Compose:		ar_SA.ISO8859-6
>  iso8859-6/Compose:		ar_TN.ISO8859-6
>  iso8859-6/Compose:		ar_YE.ISO8859-6
>  iso8859-9e/Compose:		az_AZ.ISO8859-9E
> -koi8-c/Compose:			a3_AZ.KOI8-C
> +koi8-c/Compose:			az_AZ.KOI8-C
>  microsoft-cp1251/Compose:	be_BY.CP1251
>  iso8859-5/Compose:		bg_BG.ISO8859-5
>  microsoft-cp1251/Compose:	bg_BG.CP1251
> @@ -256,7 +256,7 @@ en_US.UTF-8/Compose:		ar_YE.UTF-8
>  en_US.UTF-8/Compose:		bo_IN.UTF-8
>  en_US.UTF-8/Compose:		bs_BA.UTF-8
>  en_US.UTF-8/Compose:		az_AZ.UTF-8
> -en_US.UTF-8/Compose:		a3_AZ.UTF-8
> +en_US.UTF-8/Compose:		az_AZ.UTF-8

Doesn't this just introduce a duplicate line?

With the duplicate line removed,

Reviewed-by: Magnus Kessler <Magnus.Kessler at gmx.net>

>  en_US.UTF-8/Compose:		be_BY.UTF-8
>  en_US.UTF-8/Compose:		bg_BG.UTF-8
>  en_US.UTF-8/Compose:		bn_IN.UTF-8
> diff --git a/nls/locale.alias.pre b/nls/locale.alias.pre
> index 254c2e0..26a2cba 100644
> --- a/nls/locale.alias.pre
> +++ b/nls/locale.alias.pre
> @@ -17,9 +17,11 @@ Cextend.en:					en_US.ISO8859-1
>  English_United-States.437:			C
>  C.UTF-8:					en_US.UTF-8
>  XCOMM a3 is not an ISO 639 language code, but in Cyrillic, "Z" looks like
> "3". -a3:						a3_AZ.KOI8-C
> -a3_AZ:						a3_AZ.KOI8-C
> -a3_AZ.koi8c:					a3_AZ.KOI8-C
> +a3:						az_AZ.KOI8-C
> +a3_AZ:						az_AZ.KOI8-C
> +a3_AZ.koi8c:					az_AZ.KOI8-C
> +a3_AZ.KOI-C:					az_AZ.KOI8-C
> +a3_AZ.UTF-8:					az_AZ.UTF-8
>  af:						af_ZA.ISO8859-1
>  af_ZA:						af_ZA.ISO8859-1
>  af_ZA.iso88591:					af_ZA.ISO8859-1
> diff --git a/nls/locale.dir.pre b/nls/locale.dir.pre
> index 40fe1a8..fa3c30f 100644
> --- a/nls/locale.dir.pre
> +++ b/nls/locale.dir.pre
> @@ -293,7 +293,6 @@ en_US.UTF-8/XLC_LOCALE:			ar_TN.UTF-8
>  en_US.UTF-8/XLC_LOCALE:			ar_YE.UTF-8
>  en_US.UTF-8/XLC_LOCALE:			as_IN.UTF-8
>  en_US.UTF-8/XLC_LOCALE:			az_AZ.UTF-8
> -en_US.UTF-8/XLC_LOCALE:			a3_AZ.UTF-8
>  en_US.UTF-8/XLC_LOCALE:			be_BY.UTF-8
>  en_US.UTF-8/XLC_LOCALE:			bg_BG.UTF-8
>  en_US.UTF-8/XLC_LOCALE:			bn_BD.UTF-8