From: Mike FABIAN Date: Wed, 26 Jul 2017 18:53:38 +0000 (+0200) Subject: Revert "Remove redundant data for LC_MONETARY for Indian locales" X-Git-Tag: glibc-2.26~22 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1086114ba13645c7d97b3387338f3d88865869ad;p=thirdparty%2Fglibc.git Revert "Remove redundant data for LC_MONETARY for Indian locales" This reverts commit 480af555f35201a646531cfd7c68a58905edba90. Revert: 2017-07-26 Akhilesh Kumar Remove redundant data for LC_MONETARY [BZ #21836] * locales/ar_IN (LC_MONETARY): copy "hi_IN" * locales/as_IN (LC_MONETARY): copy "hi_IN" * locales/bhb_IN (LC_MONETARY): copy "hi_IN" * locales/bn_IN (LC_MONETARY): copy "hi_IN" * locales/en_IN (LC_MONETARY): copy "hi_IN" * locales/gu_IN (LC_MONETARY): copy "hi_IN" * locales/kn_IN (LC_MONETARY): copy "hi_IN" * locales/kok_IN (LC_MONETARY): copy "hi_IN" * locales/ks_IN (LC_MONETARY): copy "hi_IN" * locales/ml_IN (LC_MONETARY): copy "hi_IN" * locales/mr_IN (LC_MONETARY): copy "hi_IN" * locales/or_IN (LC_MONETARY): copy "hi_IN" * locales/pa_IN (LC_MONETARY): copy "hi_IN" * locales/sa_IN (LC_MONETARY): copy "hi_IN" * locales/sd_IN (LC_MONETARY): copy "hi_IN" * locales/ta_IN (LC_MONETARY): copy "hi_IN" * locales/tcy_IN (LC_MONETARY): copy "hi_IN" * locales/te_IN (LC_MONETARY): copy "hi_IN" * locales/ur_IN (LC_MONETARY): copy "hi_IN" --- diff --git a/localedata/ChangeLog b/localedata/ChangeLog index 2ca81e304d1..84ca14fbbba 100644 --- a/localedata/ChangeLog +++ b/localedata/ChangeLog @@ -1,3 +1,31 @@ +2017-07-26 Mike FABIAN + + Revert: + 2017-07-26 Akhilesh Kumar + + Remove redundant data for LC_MONETARY + + [BZ #21836] + * locales/ar_IN (LC_MONETARY): copy "hi_IN" + * locales/as_IN (LC_MONETARY): copy "hi_IN" + * locales/bhb_IN (LC_MONETARY): copy "hi_IN" + * locales/bn_IN (LC_MONETARY): copy "hi_IN" + * locales/en_IN (LC_MONETARY): copy "hi_IN" + * locales/gu_IN (LC_MONETARY): copy "hi_IN" + * locales/kn_IN (LC_MONETARY): copy "hi_IN" + * locales/kok_IN (LC_MONETARY): copy "hi_IN" + * locales/ks_IN (LC_MONETARY): copy "hi_IN" + * locales/ml_IN (LC_MONETARY): copy "hi_IN" + * locales/mr_IN (LC_MONETARY): copy "hi_IN" + * locales/or_IN (LC_MONETARY): copy "hi_IN" + * locales/pa_IN (LC_MONETARY): copy "hi_IN" + * locales/sa_IN (LC_MONETARY): copy "hi_IN" + * locales/sd_IN (LC_MONETARY): copy "hi_IN" + * locales/ta_IN (LC_MONETARY): copy "hi_IN" + * locales/tcy_IN (LC_MONETARY): copy "hi_IN" + * locales/te_IN (LC_MONETARY): copy "hi_IN" + * locales/ur_IN (LC_MONETARY): copy "hi_IN" + 2017-07-26 Mike FABIAN * locales/hif_FJ (LC_TIME): Remove erroneous spaces from d_t_fmt. @@ -91,7 +119,7 @@ 2017-07-26 Akhilesh Kumar - Remove redundant data for LC_MONETARY + Remove redundant data for LC_MONETARY [BZ #21836] * locales/ar_IN (LC_MONETARY): copy "hi_IN" diff --git a/localedata/locales/ar_IN b/localedata/locales/ar_IN index 0f313c90bd3..791e63c519e 100644 --- a/localedata/locales/ar_IN +++ b/localedata/locales/ar_IN @@ -53,7 +53,27 @@ END LC_COLLATE LC_MONETARY -copy "hi_IN" +% This is the POSIX Locale definition the LC_MONETARY category +% generated by IBM Basic CountryPack Transformer. +% These are generated based on XML base Locale defintion file +% for IBM Class for Unicode. +% +int_curr_symbol "" +currency_symbol "" +mon_decimal_point "" +mon_thousands_sep "" +mon_grouping 3;2 +positive_sign "" +negative_sign "" +int_frac_digits 2 +frac_digits 2 +p_cs_precedes 1 +p_sep_by_space 1 +n_cs_precedes 1 +n_sep_by_space 1 +p_sign_posn 1 +n_sign_posn 1 +% END LC_MONETARY diff --git a/localedata/locales/as_IN b/localedata/locales/as_IN index c2ee88c36b9..b7c905a9962 100644 --- a/localedata/locales/as_IN +++ b/localedata/locales/as_IN @@ -58,7 +58,27 @@ END LC_NUMERIC %%%%%%%%%%%%% LC_MONETARY -copy "hi_IN" +int_curr_symbol "" +currency_symbol "" +mon_decimal_point "" +mon_thousands_sep "" +mon_grouping 3;2 +positive_sign "" +negative_sign "" +int_frac_digits 2 +frac_digits 2 +p_cs_precedes 1 +p_sep_by_space 1 +n_cs_precedes 1 +n_sep_by_space 1 +p_sign_posn 1 +n_sign_posn 1 +int_p_cs_precedes 1 +int_p_sep_by_space 1 +int_n_cs_precedes 1 +int_n_sep_by_space 1 +int_p_sign_posn 1 +int_n_sign_posn 1 END LC_MONETARY %%%%%%%%%%%%% diff --git a/localedata/locales/bhb_IN b/localedata/locales/bhb_IN index 3be0f8f5f6b..49b1cbe2a47 100644 --- a/localedata/locales/bhb_IN +++ b/localedata/locales/bhb_IN @@ -39,7 +39,7 @@ category "i18n:2012";LC_MEASUREMENT END LC_IDENTIFICATION LC_CTYPE -copy "hi_IN" +copy "ks_IN" END LC_CTYPE LC_COLLATE diff --git a/localedata/locales/bn_IN b/localedata/locales/bn_IN index f14e1b932a0..f81e1de2235 100644 --- a/localedata/locales/bn_IN +++ b/localedata/locales/bn_IN @@ -54,7 +54,27 @@ END LC_COLLATE LC_MONETARY -copy "hi_IN" +% This is the POSIX Locale definition the LC_MONETARY category +% generated by IBM Basic CountryPack Transformer. +% These are generated based on XML base Locale defintion file +% for IBM Class for Unicode. +% +int_curr_symbol "" +currency_symbol "" +mon_decimal_point "" +mon_thousands_sep "" +mon_grouping 2;3 +positive_sign "" +negative_sign "" +int_frac_digits 2 +frac_digits 2 +p_cs_precedes 1 +p_sep_by_space 1 +n_cs_precedes 1 +n_sep_by_space 1 +p_sign_posn 1 +n_sign_posn 1 +% END LC_MONETARY diff --git a/localedata/locales/en_IN b/localedata/locales/en_IN index 7a4a27e752a..933a41ccd09 100644 --- a/localedata/locales/en_IN +++ b/localedata/locales/en_IN @@ -53,7 +53,27 @@ END LC_COLLATE LC_MONETARY -copy "hi_IN" +% This is the POSIX Locale definition the LC_MONETARY category +% generated by IBM Basic CountryPack Transformer. +% These are generated based on XML base Locale defintion file +% for IBM Class for Unicode. +% +int_curr_symbol "" +currency_symbol "" +mon_decimal_point "" +mon_thousands_sep "" +mon_grouping 3;2 +positive_sign "" +negative_sign "" +int_frac_digits 2 +frac_digits 2 +p_cs_precedes 1 +p_sep_by_space 1 +n_cs_precedes 1 +n_sep_by_space 1 +p_sign_posn 1 +n_sign_posn 1 +% END LC_MONETARY diff --git a/localedata/locales/gu_IN b/localedata/locales/gu_IN index b883b35297d..30577e130b6 100644 --- a/localedata/locales/gu_IN +++ b/localedata/locales/gu_IN @@ -74,7 +74,26 @@ copy "iso14651_t1" END LC_COLLATE LC_MONETARY -copy "hi_IN" +% This is the POSIX Locale definition the LC_MONETARY category. +% These are generated based on XML base Locale definition file +% for IBM Class for Unicode/Java +% +int_curr_symbol "" +currency_symbol "" +mon_decimal_point "" +mon_thousands_sep "" +mon_grouping 3 +positive_sign "" +negative_sign "" +int_frac_digits 2 +frac_digits 2 +p_cs_precedes 1 +p_sep_by_space 1 +n_cs_precedes 1 +n_sep_by_space 1 +p_sign_posn 1 +n_sign_posn 1 +% END LC_MONETARY diff --git a/localedata/locales/kn_IN b/localedata/locales/kn_IN index c3cc36e94b1..3f89da00435 100644 --- a/localedata/locales/kn_IN +++ b/localedata/locales/kn_IN @@ -74,9 +74,29 @@ copy "iso14651_t1" END LC_COLLATE LC_MONETARY -copy "hi_IN" +% This is the POSIX Locale definition the LC_MONETARY category. +% These are generated based on XML base Locale definition file +% for IBM Class for Unicode/Java +% +int_curr_symbol "" +currency_symbol "" +mon_decimal_point "" +mon_thousands_sep "" +mon_grouping 3 +positive_sign "" +negative_sign "" +int_frac_digits 2 +frac_digits 2 +p_cs_precedes 1 +p_sep_by_space 1 +n_cs_precedes 1 +n_sep_by_space 1 +p_sign_posn 1 +n_sign_posn 1 +% END LC_MONETARY + LC_NUMERIC copy "hi_IN" END LC_NUMERIC diff --git a/localedata/locales/kok_IN b/localedata/locales/kok_IN index 9a97809ca9f..dbd486ea578 100644 --- a/localedata/locales/kok_IN +++ b/localedata/locales/kok_IN @@ -51,7 +51,27 @@ copy "iso14651_t1" END LC_COLLATE LC_MONETARY -copy "hi_IN" +% This is the POSIX Locale definition the LC_MONETARY category +% generated by IBM Basic CountryPack Transformer. +% These are generated based on XML base Locale defintion file +% for IBM Class for Unicode. +% +int_curr_symbol "" +currency_symbol "" +mon_decimal_point "" +mon_thousands_sep "" +mon_grouping 3 +positive_sign "" +negative_sign "" +int_frac_digits 2 +frac_digits 2 +p_cs_precedes 1 +p_sep_by_space 1 +n_cs_precedes 1 +n_sep_by_space 1 +p_sign_posn 1 +n_sign_posn 1 +% END LC_MONETARY diff --git a/localedata/locales/ks_IN b/localedata/locales/ks_IN index de66d4578a9..094f2cd29de 100644 --- a/localedata/locales/ks_IN +++ b/localedata/locales/ks_IN @@ -56,8 +56,29 @@ copy "iso14651_t1" END LC_COLLATE + LC_MONETARY -copy "hi_IN" +% This is the POSIX Locale definition the LC_MONETARY category +% generated by IBM Basic CountryPack Transformer. +% These are generated based on XML base Locale defintion file +% for IBM Class for Unicode. +% +int_curr_symbol "" +currency_symbol "" +mon_decimal_point "" +mon_thousands_sep "" +mon_grouping 3 +positive_sign "" +negative_sign "" +int_frac_digits 2 +frac_digits 2 +p_cs_precedes 1 +p_sep_by_space 1 +n_cs_precedes 1 +n_sep_by_space 1 +p_sign_posn 1 +n_sign_posn 1 +% END LC_MONETARY diff --git a/localedata/locales/ml_IN b/localedata/locales/ml_IN index b175d32ff85..0117a2db8cf 100644 --- a/localedata/locales/ml_IN +++ b/localedata/locales/ml_IN @@ -65,12 +65,33 @@ END LC_CTYPE % % LC_COLLATE + % Copy the template from ISO/IEC 14651 copy "iso14651_t1" + END LC_COLLATE -% LC_MONETARY -copy "hi_IN" +% This is the POSIX Locale definition the LC_MONETARY category +% generated by IBM Basic CountryPack Transformer. +% These are generated based on XML base Locale defintion file +% for IBM Class for Unicode. +% +int_curr_symbol "" +currency_symbol "" +mon_decimal_point "" +mon_thousands_sep "" +mon_grouping 3;2 +positive_sign "" +negative_sign "" +int_frac_digits 2 +frac_digits 2 +p_cs_precedes 1 +p_sep_by_space 1 +n_cs_precedes 1 +n_sep_by_space 1 +p_sign_posn 1 +n_sign_posn 1 +% END LC_MONETARY % LC_NUMERIC diff --git a/localedata/locales/mr_IN b/localedata/locales/mr_IN index 04b1b4dec5c..31378574a55 100644 --- a/localedata/locales/mr_IN +++ b/localedata/locales/mr_IN @@ -71,7 +71,27 @@ reorder-end END LC_COLLATE LC_MONETARY -copy "hi_IN" +% This is the POSIX Locale definition the LC_MONETARY category +% generated by IBM Basic CountryPack Transformer. +% These are generated based on XML base Locale defintion file +% for IBM Class for Unicode. +% +int_curr_symbol "" +currency_symbol "" +mon_decimal_point "" +mon_thousands_sep "" +mon_grouping 3 +positive_sign "" +negative_sign "" +int_frac_digits 2 +frac_digits 2 +p_cs_precedes 1 +p_sep_by_space 1 +n_cs_precedes 1 +n_sep_by_space 1 +p_sign_posn 1 +n_sign_posn 1 +% END LC_MONETARY diff --git a/localedata/locales/or_IN b/localedata/locales/or_IN index 2d9a3b3e205..6a7fe3cadfa 100644 --- a/localedata/locales/or_IN +++ b/localedata/locales/or_IN @@ -614,7 +614,27 @@ END LC_NUMERIC %%%%%%%%%%%%% LC_MONETARY -copy "hi_IN" +int_curr_symbol "" +currency_symbol "" +mon_decimal_point "" +mon_thousands_sep "" +mon_grouping 3;2 +positive_sign "" +negative_sign "" +int_frac_digits 2 +frac_digits 2 +p_cs_precedes 1 +p_sep_by_space 1 +n_cs_precedes 1 +n_sep_by_space 1 +p_sign_posn 1 +n_sign_posn 1 +int_p_cs_precedes 1 +int_p_sep_by_space 1 +int_n_cs_precedes 1 +int_n_sep_by_space 1 +int_p_sign_posn 1 +int_n_sign_posn 1 END LC_MONETARY %%%%%%%%%%%%% diff --git a/localedata/locales/pa_IN b/localedata/locales/pa_IN index b371ae4e7de..831c66bb4a5 100644 --- a/localedata/locales/pa_IN +++ b/localedata/locales/pa_IN @@ -72,7 +72,23 @@ copy "iso14651_t1" END LC_COLLATE LC_MONETARY -copy "hi_IN" +% This is the POSIX Locale definition the LC_MONETARY category. +int_curr_symbol "" +currency_symbol "" +mon_decimal_point "" +mon_thousands_sep "" +mon_grouping 3 +positive_sign "" +negative_sign "" +int_frac_digits 2 +frac_digits 2 +p_cs_precedes 1 +p_sep_by_space 1 +n_cs_precedes 1 +n_sep_by_space 1 +p_sign_posn 1 +n_sign_posn 1 +% END LC_MONETARY diff --git a/localedata/locales/sa_IN b/localedata/locales/sa_IN index 7ca03179890..c0ccdecb1b0 100644 --- a/localedata/locales/sa_IN +++ b/localedata/locales/sa_IN @@ -55,7 +55,26 @@ copy "iso14651_t1" END LC_COLLATE LC_MONETARY -copy "hi_IN" +% This is the POSIX Locale definition the LC_MONETARY category. +% These are generated based on XML base Locale definition file +% for IBM Class for Unicode/Java +% +int_curr_symbol "" +currency_symbol "" +mon_decimal_point "" +mon_thousands_sep "" +mon_grouping 3 +positive_sign "" +negative_sign "" +int_frac_digits 2 +frac_digits 2 +p_cs_precedes 1 +p_sep_by_space 1 +n_cs_precedes 1 +n_sep_by_space 1 +p_sign_posn 1 +n_sign_posn 1 +% END LC_MONETARY diff --git a/localedata/locales/sd_IN b/localedata/locales/sd_IN index f0c653e916d..bc9d681d764 100644 --- a/localedata/locales/sd_IN +++ b/localedata/locales/sd_IN @@ -58,7 +58,27 @@ END LC_COLLATE LC_MONETARY -copy "hi_IN" +% This is the POSIX Locale definition the LC_MONETARY category +% generated by IBM Basic CountryPack Transformer. +% These are generated based on XML base Locale defintion file +% for IBM Class for Unicode. +% +int_curr_symbol "" +currency_symbol "" +mon_decimal_point "" +mon_thousands_sep "" +mon_grouping 3 +positive_sign "" +negative_sign "" +int_frac_digits 2 +frac_digits 2 +p_cs_precedes 1 +p_sep_by_space 1 +n_cs_precedes 1 +n_sep_by_space 1 +p_sign_posn 1 +n_sign_posn 1 +% END LC_MONETARY diff --git a/localedata/locales/ta_IN b/localedata/locales/ta_IN index 5963a264b7b..3cda08a06e9 100644 --- a/localedata/locales/ta_IN +++ b/localedata/locales/ta_IN @@ -75,7 +75,27 @@ END LC_COLLATE LC_MONETARY -copy "hi_IN" +% This is the POSIX Locale definition the LC_MONETARY category +% generated by IBM Basic CountryPack Transformer. +% These are generated based on XML base Locale defintion file +% for IBM Class for Unicode. +% +int_curr_symbol "" +currency_symbol "" +mon_decimal_point "" +mon_thousands_sep "" +mon_grouping 3;2 +positive_sign "" +negative_sign "" +int_frac_digits 2 +frac_digits 2 +p_cs_precedes 1 +p_sep_by_space 1 +n_cs_precedes 1 +n_sep_by_space 1 +p_sign_posn 1 +n_sign_posn 1 +% END LC_MONETARY diff --git a/localedata/locales/tcy_IN b/localedata/locales/tcy_IN index 01d66fff10a..9f021c507c0 100644 --- a/localedata/locales/tcy_IN +++ b/localedata/locales/tcy_IN @@ -52,7 +52,7 @@ copy "iso14651_t1" END LC_COLLATE LC_MONETARY -copy "hi_IN" +copy "kn_IN" END LC_MONETARY diff --git a/localedata/locales/te_IN b/localedata/locales/te_IN index c9cccafde68..50335b0b1f2 100644 --- a/localedata/locales/te_IN +++ b/localedata/locales/te_IN @@ -75,7 +75,27 @@ END LC_COLLATE LC_MONETARY -copy "hi_IN" +% This is the POSIX Locale definition the LC_MONETARY category +% generated by IBM Basic CountryPack Transformer. +% These are generated based on XML base Locale defintion file +% for IBM Class for Unicode. +% +int_curr_symbol "" +currency_symbol "" +mon_decimal_point "" +mon_thousands_sep "" +mon_grouping 3;2 +positive_sign "" +negative_sign "" +int_frac_digits 2 +frac_digits 2 +p_cs_precedes 1 +p_sep_by_space 0 +n_cs_precedes 1 +n_sep_by_space 0 +p_sign_posn 1 +n_sign_posn 1 +% END LC_MONETARY diff --git a/localedata/locales/ur_IN b/localedata/locales/ur_IN index ae775d4ca34..1af10ed847a 100644 --- a/localedata/locales/ur_IN +++ b/localedata/locales/ur_IN @@ -58,7 +58,7 @@ END LC_COLLATE LC_MONETARY -copy "hi_IN" +copy "ar_IN" END LC_MONETARY