diff options
| author | Mike FABIAN <mfabian@redhat.com> | 2024-01-10 18:00:26 +0100 |
|---|---|---|
| committer | Mike FABIAN <mfabian@redhat.com> | 2024-01-11 13:36:08 +0100 |
| commit | cb8e8b2e218c4d8c1e33b3ab212b0bc15245f48c (patch) | |
| tree | d1af71535c916b228f01f0b54116d2cf2b062a36 | |
| parent | 449aa2698c4012c56025594eba51a47f788f8b76 (diff) | |
| download | glibc-cb8e8b2e218c4d8c1e33b3ab212b0bc15245f48c.tar.xz glibc-cb8e8b2e218c4d8c1e33b3ab212b0bc15245f48c.zip | |
localedata: resolve cyclic dependencies
Resolves: BZ # 24006
| -rw-r--r-- | localedata/locales/am_ET | 45 | ||||
| -rw-r--r-- | localedata/locales/ber_DZ | 99 | ||||
| -rw-r--r-- | localedata/locales/en_GB | 6 | ||||
| -rw-r--r-- | localedata/locales/en_PH | 6 | ||||
| -rw-r--r-- | localedata/locales/en_US | 6 | ||||
| -rw-r--r-- | localedata/locales/fil_PH | 8 | ||||
| -rw-r--r-- | localedata/locales/kab_DZ | 85 | ||||
| -rw-r--r-- | localedata/locales/om_ET | 85 | ||||
| -rw-r--r-- | localedata/locales/om_KE | 84 | ||||
| -rw-r--r-- | localedata/locales/ti_ET | 850 | ||||
| -rw-r--r-- | localedata/locales/tl_PH | 2 |
11 files changed, 226 insertions, 1050 deletions
diff --git a/localedata/locales/am_ET b/localedata/locales/am_ET index 76b9ae4e1b..5974ab24da 100644 --- a/localedata/locales/am_ET +++ b/localedata/locales/am_ET @@ -892,7 +892,6 @@ translit_end % END LC_CTYPE - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % Ethiopia Specifc and Shared Data: @@ -900,30 +899,54 @@ END LC_CTYPE %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% LC_MEASUREMENT -copy "ti_ET" +copy "i18n" END LC_MEASUREMENT - LC_MONETARY -copy "ti_ET" +% +int_curr_symbol "ETB " +currency_symbol "Br" +mon_decimal_point "." +mon_thousands_sep "," +mon_grouping 3;3 +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 - LC_NUMERIC -copy "ti_ET" +% +% This is the POSIX Locale definition for the LC_NUMERIC category. +% +decimal_point "." +thousands_sep "," +grouping 3;3 +% END LC_NUMERIC - LC_PAPER -copy "ti_ET" +copy "i18n" END LC_PAPER - LC_TELEPHONE -copy "ti_ET" +% +% This is the ISO_IEC TR14652 Locale definition for the LC_TELEPHONE category. +% +tel_dom_fmt "%a-%l" +tel_int_fmt "%c-%a-%l" +int_prefix "251" +int_select "00" +% END LC_TELEPHONE - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % Amharic Specifc Data: diff --git a/localedata/locales/ber_DZ b/localedata/locales/ber_DZ index ce18b5d171..f503eccfd6 100644 --- a/localedata/locales/ber_DZ +++ b/localedata/locales/ber_DZ @@ -45,92 +45,6 @@ category "i18n:2012";LC_MONETARY category "i18n:2012";LC_MESSAGES END LC_IDENTIFICATION -% -% TODO: fix LC_TIME, LC_MONETARY, LC_MESSAGES, LC_NAME, LC_ADDRESS - -LC_COLLATE -% The latin amazigh alphabet is: -% -% a ɛ b b* c č d ḍ e f g g* ğ h ḥ i j k k* l m n q q* gam gam* r ṛ s ṣ t ṭ u w x x* y z ẓ -% -% (What are the letters followed by a *???) -% -% CLDR does not yet have collation rules for this language. -% - -% Looking at the above alphabet and the previously existing collation -% rules in glibc for this language, I implement this in the following way: -% -% &A<ɛ<<<Ɛ -% &C<č<<<Č -% &D<ḍ<<<Ḍ -% &G<ğ<<<Ğ -% &H<ḥ<<<Ḥ -% &Q<ɣ<<<Ɣ -% &R<ṛ<<<Ṛ -% &S<ṣ<<<Ṣ -% &T<ṭ<<<Ṭ -% &Z<ẓ<<<Ẓ - -copy "iso14651_t1" - -collating-symbol <open-e> -collating-symbol <c-caron> -collating-symbol <d-dot-below> -collating-symbol <g-breve> -collating-symbol <h-dot-below> -collating-symbol <latin-gamma> -collating-symbol <r-dot-below> -collating-symbol <s-dot-below> -collating-symbol <t-dot-below> -collating-symbol <z-dot-below> - -reorder-after <AFTER-A> -<open-e> -reorder-after <AFTER-C> -<c-caron> -reorder-after <AFTER-D> -<d-dot-below> -reorder-after <AFTER-G> -<g-breve> -reorder-after <AFTER-H> -<h-dot-below> -reorder-after <AFTER-Q> -<latin-gamma> -reorder-after <AFTER-R> -<r-dot-below> -reorder-after <AFTER-S> -<s-dot-below> -reorder-after <AFTER-T> -<t-dot-below> -reorder-after <AFTER-Z> -<z-dot-below> - -<U025B> <open-e>;<BASE>;<MIN>;IGNORE % ɛ -<U0190> <open-e>;<BASE>;<CAP>;IGNORE % Ɛ -<U010D> <c-caron>;<BASE>;<MIN>;IGNORE % č -<U010C> <c-caron>;<BASE>;<CAP>;IGNORE % Č -<U1E0D> <d-dot-below>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ḍ -<U1E0C> <d-dot-below>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Ḍ -<U011F> <g-breve>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ğ -<U011E> <g-breve>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Ğ -<U1E25> <h-dot-below>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ḥ -<U1E24> <h-dot-below>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Ḥ -<U0263> <latin-gamma>;<BASE>;<MIN>;IGNORE % ɣ -<U0194> <latin-gamma>;<BASE>;<CAP>;IGNORE % Ɣ -<U1E5B> <r-dot-below>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ṛ -<U1E5A> <r-dot-below>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Ṛ -<U1E63> <s-dot-below>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ṣ -<U1E62> <s-dot-below>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Ṣ -<U1E6D> <t-dot-below>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ṭ -<U1E6C> <t-dot-below>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Ṭ -<U1E93> <z-dot-below>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ẓ -<U1E92> <z-dot-below>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Ẓ - -reorder-end - -END LC_COLLATE - LC_CTYPE copy "i18n" @@ -139,6 +53,13 @@ include "translit_combining";"" translit_end END LC_CTYPE +% +% TODO: fix LC_TIME, LC_MONETARY, LC_MESSAGES, LC_NAME, LC_ADDRESS + +LC_COLLATE +copy "kab_DZ" +END LC_COLLATE + LC_MESSAGES % Same as in kab_DZ (information from Belkacem Mohammed <belkacem77@gmail.com>): copy "kab_DZ" @@ -271,9 +192,5 @@ END LC_ADDRESS LC_TELEPHONE -% This is the ISO_IEC TR14652 Locale definition for the -% -tel_int_fmt "+%c ;%a ;%l" -int_prefix "213" -int_select "00" +copy "ar_DZ" END LC_TELEPHONE diff --git a/localedata/locales/en_GB b/localedata/locales/en_GB index 5b895574ac..c8b81338d0 100644 --- a/localedata/locales/en_GB +++ b/localedata/locales/en_GB @@ -50,11 +50,7 @@ category "i18n:2012";LC_MEASUREMENT END LC_IDENTIFICATION LC_CTYPE -copy "i18n" - -translit_start -include "translit_combining";"" -translit_end +copy "en_US" END LC_CTYPE LC_COLLATE diff --git a/localedata/locales/en_PH b/localedata/locales/en_PH index 365fb22849..eb46335911 100644 --- a/localedata/locales/en_PH +++ b/localedata/locales/en_PH @@ -42,7 +42,7 @@ END LC_IDENTIFICATION LC_CTYPE -copy "en_GB" +copy "en_US" END LC_CTYPE LC_COLLATE @@ -146,7 +146,7 @@ END LC_MESSAGES LC_PAPER -copy "tl_PH" +copy "en_US" END LC_PAPER @@ -191,5 +191,5 @@ END LC_TELEPHONE LC_MEASUREMENT -copy "tl_PH" +copy "i18n" END LC_MEASUREMENT diff --git a/localedata/locales/en_US b/localedata/locales/en_US index 5cc518dff2..8c34420dc0 100644 --- a/localedata/locales/en_US +++ b/localedata/locales/en_US @@ -38,7 +38,11 @@ category "i18n:2012";LC_MEASUREMENT END LC_IDENTIFICATION LC_CTYPE -copy "en_GB" +copy "i18n" + +translit_start +include "translit_combining";"" +translit_end END LC_CTYPE LC_COLLATE diff --git a/localedata/locales/fil_PH b/localedata/locales/fil_PH index b4f9e66485..ebc40f293a 100644 --- a/localedata/locales/fil_PH +++ b/localedata/locales/fil_PH @@ -45,7 +45,7 @@ category "i18n:2012";LC_MONETARY END LC_IDENTIFICATION LC_CTYPE -copy "tl_PH" +copy "en_US" END LC_CTYPE LC_COLLATE @@ -109,7 +109,7 @@ n_sign_posn 1 END LC_MONETARY LC_NUMERIC -copy "tl_PH" +copy "en_US" END LC_NUMERIC LC_TIME @@ -160,11 +160,11 @@ nostr "hindi" END LC_MESSAGES LC_PAPER -copy "tl_PH" +copy "en_US" END LC_PAPER LC_MEASUREMENT -copy "tl_PH" +copy "i18n" END LC_MEASUREMENT LC_NAME diff --git a/localedata/locales/kab_DZ b/localedata/locales/kab_DZ index f501f75781..2778afb337 100644 --- a/localedata/locales/kab_DZ +++ b/localedata/locales/kab_DZ @@ -43,7 +43,86 @@ translit_end END LC_CTYPE LC_COLLATE -copy "ber_DZ" +% The latin amazigh alphabet is: +% +% a ɛ b b* c č d ḍ e f g g* ğ h ḥ i j k k* l m n q q* gam gam* r ṛ s ṣ t ṭ u w x x* y z ẓ +% +% (What are the letters followed by a *???) +% +% CLDR does not yet have collation rules for this language. +% + +% Looking at the above alphabet and the previously existing collation +% rules in glibc for this language, I implement this in the following way: +% +% &A<ɛ<<<Ɛ +% &C<č<<<Č +% &D<ḍ<<<Ḍ +% &G<ğ<<<Ğ +% &H<ḥ<<<Ḥ +% &Q<ɣ<<<Ɣ +% &R<ṛ<<<Ṛ +% &S<ṣ<<<Ṣ +% &T<ṭ<<<Ṭ +% &Z<ẓ<<<Ẓ + +copy "iso14651_t1" + +collating-symbol <open-e> +collating-symbol <c-caron> +collating-symbol <d-dot-below> +collating-symbol <g-breve> +collating-symbol <h-dot-below> +collating-symbol <latin-gamma> +collating-symbol <r-dot-below> +collating-symbol <s-dot-below> +collating-symbol <t-dot-below> +collating-symbol <z-dot-below> + +reorder-after <AFTER-A> +<open-e> +reorder-after <AFTER-C> +<c-caron> +reorder-after <AFTER-D> +<d-dot-below> +reorder-after <AFTER-G> +<g-breve> +reorder-after <AFTER-H> +<h-dot-below> +reorder-after <AFTER-Q> +<latin-gamma> +reorder-after <AFTER-R> +<r-dot-below> +reorder-after <AFTER-S> +<s-dot-below> +reorder-after <AFTER-T> +<t-dot-below> +reorder-after <AFTER-Z> +<z-dot-below> + +<U025B> <open-e>;<BASE>;<MIN>;IGNORE % ɛ +<U0190> <open-e>;<BASE>;<CAP>;IGNORE % Ɛ +<U010D> <c-caron>;<BASE>;<MIN>;IGNORE % č +<U010C> <c-caron>;<BASE>;<CAP>;IGNORE % Č +<U1E0D> <d-dot-below>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ḍ +<U1E0C> <d-dot-below>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Ḍ +<U011F> <g-breve>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ğ +<U011E> <g-breve>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Ğ +<U1E25> <h-dot-below>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ḥ +<U1E24> <h-dot-below>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Ḥ +<U0263> <latin-gamma>;<BASE>;<MIN>;IGNORE % ɣ +<U0194> <latin-gamma>;<BASE>;<CAP>;IGNORE % Ɣ +<U1E5B> <r-dot-below>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ṛ +<U1E5A> <r-dot-below>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Ṛ +<U1E63> <s-dot-below>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ṣ +<U1E62> <s-dot-below>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Ṣ +<U1E6D> <t-dot-below>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ṭ +<U1E6C> <t-dot-below>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Ṭ +<U1E93> <z-dot-below>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ẓ +<U1E92> <z-dot-below>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Ẓ + +reorder-end + END LC_COLLATE LC_TIME @@ -131,11 +210,11 @@ n_sign_posn 1 END LC_MONETARY LC_PAPER -copy "ber_DZ" +copy "i18n" END LC_PAPER LC_MEASUREMENT -copy "ber_DZ" +copy "i18n" END LC_MEASUREMENT LC_MESSAGES diff --git a/localedata/locales/om_ET b/localedata/locales/om_ET index 881b43fb17..b09cf536ec 100644 --- a/localedata/locales/om_ET +++ b/localedata/locales/om_ET @@ -107,27 +107,13 @@ END LC_TELEPHONE %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% LC_MESSAGES -yesexpr "^[+1eEyY]" -noexpr "^[-0mMnN]" -yesstr "eeyyee" -nostr "miti" +copy "om_KE" END LC_MESSAGES - LC_NAME -% -% This is the ISO_IEC TR14652 Locale definition for the LC_NAME category. -% -name_fmt "%d%t%g%t%m%t%f" -name_gen "" -name_mr "Ob" -name_mrs "Ad" -name_miss "Du" -name_ms "" -% +copy "om_KE" END LC_NAME - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % Oromo/ET Specific Data: @@ -153,71 +139,6 @@ lang_lib "orm" % END LC_ADDRESS - LC_TIME -% -% Abbreviated weekday names (%a) -% -abday "Dil";"Wix";"Qib";"Rob";"Kam";"Jim";"San" -% -% Full weekday names (%A) -% -day "Dilbata";/ - "Wiixata";/ - "Qibxata";/ - "Roobii";/ - "Kamiisa";/ - "Jimaata";/ - "Sanbata" -% -% Abbreviated month names (%b) -% -abmon "Ama";/ - "Gur";/ - "Bit";/ - "Elb";/ - "Cam";/ - "Wax";/ - "Ado";/ - "Hag";/ - "Ful";/ - "Onk";/ - "Sad";/ - "Mud" -% -% Full month names (%B) -% -mon "Amajjii";/ - "Guraandhala";/ - "Bitooteessa";/ - "Elba";/ - "Caamsa";/ - "Waxabajjii";/ - "Adooleessa";/ - "Hagayya";/ - "Fuulbana";/ - "Onkololeessa";/ - "Sadaasa";/ - "Muddee" -% -% Equivalent of AM PM -% -am_pm "WD";"WB" -% -% Appropriate date representation (%x) -d_fmt "%d//%m//%Y" -% -% Appropriate time representation (%X) -t_fmt "%l:%M:%S %p" -% -% Appropriate AM/PM time representation (%r) -t_fmt_ampm "%l:%M:%S %p" -% -% Appropriate date and time representation (%c) -d_t_fmt "%A, %B %e, %Y %r %Z" -% -% Appropriate date representation (date(1)) -date_fmt "%A, %B %e, %r %Z %Y" -% -week 7;19971130;1 +copy "om_KE" END LC_TIME diff --git a/localedata/locales/om_KE b/localedata/locales/om_KE index 66cdcf5c45..49731530ac 100644 --- a/localedata/locales/om_KE +++ b/localedata/locales/om_KE @@ -227,14 +227,25 @@ END LC_TELEPHONE %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% LC_MESSAGES -copy "om_ET" +yesexpr "^[+1eEyY]" +noexpr "^[-0mMnN]" +yesstr "eeyyee" +nostr "miti" END LC_MESSAGES LC_NAME -copy "om_ET" +% +% This is the ISO_IEC TR14652 Locale definition for the LC_NAME category. +% +name_fmt "%d%t%g%t%m%t%f" +name_gen "" +name_mr "Ob" +name_mrs "Ad" +name_miss "Du" +name_ms "" +% END LC_NAME - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % Oromo/KE Specific Data: @@ -260,7 +271,70 @@ lang_lib "orm" % END LC_ADDRESS - LC_TIME -copy "om_ET" +% +% Abbreviated weekday names (%a) +% +abday "Dil";"Wix";"Qib";"Rob";"Kam";"Jim";"San" +% +% Full weekday names (%A) +% +day "Dilbata";/ + "Wiixata";/ + "Qibxata";/ + "Roobii";/ + "Kamiisa";/ + "Jimaata";/ + "Sanbata" +% +% Abbreviated month names (%b) +% +abmon "Ama";/ + "Gur";/ + "Bit";/ + "Elb";/ + "Cam";/ + "Wax";/ + "Ado";/ + "Hag";/ + "Ful";/ + "Onk";/ + "Sad";/ + "Mud" +% +% Full month names (%B) +% +mon "Amajjii";/ + "Guraandhala";/ + "Bitooteessa";/ + "Elba";/ + "Caamsa";/ + "Waxabajjii";/ + "Adooleessa";/ + "Hagayya";/ + "Fuulbana";/ + "Onkololeessa";/ + "Sadaasa";/ + "Muddee" +% +% Equivalent of AM PM +% +am_pm "WD";"WB" +% +% Appropriate date representation (%x) +d_fmt "%d//%m//%Y" +% +% Appropriate time representation (%X) +t_fmt "%l:%M:%S %p" +% +% Appropriate AM/PM time representation (%r) +t_fmt_ampm "%l:%M:%S %p" +% +% Appropriate date and time representation (%c) +d_t_fmt "%A, %B %e, %Y %r %Z" +% +% Appropriate date representation (date(1)) +date_fmt "%A, %B %e, %r %Z %Y" +% +week 7;19971130;1 END LC_TIME diff --git a/localedata/locales/ti_ET b/localedata/locales/ti_ET index fdf4bcd94b..50e8148342 100644 --- a/localedata/locales/ti_ET +++ b/localedata/locales/ti_ET @@ -57,813 +57,9 @@ copy "am_ET" END LC_COLLATE LC_CTYPE -% -copy "i18n" -space <U1361> -translit_start -% hoy-sadis followed by a vowel -<U1205><U12A0> <U0068><U0027><U0065> -<U1205><U12A1> <U0068><U0027><U0075> -<U1205><U12A2> <U0068><U0027><U0069> -<U1205><U12A0> <U0068><U0027><U0061> -<U1205><U12A4> <U0068><U0027><U0045> -<U1205><U12A6> <U0068><U0027><U006F> -<U1205><U12A7> <U0068><U0027><U0065><U0061> - -% lawi-sadis followed by a vowel -<U120D><U12A0> <U006C><U0027><U0065> -<U120D><U12A1> <U006C><U0027><U0075> -<U120D><U12A2> <U006C><U0027><U0069> -<U120D><U12A0> <U006C><U0027><U0061> -<U120D><U12A4> <U006C><U0027><U0045> -<U120D><U12A6> <U006C><U0027><U006F> -<U120D><U12A7> <U006C><U0027><U0065><U0061> - -% hawt-sadis followed by a vowel -<U1215><U12A0> <U0048><U0027><U0065> -<U1215><U12A1> <U0048><U0027><U0075> -<U1215><U12A2> <U0048><U0027><U0069> -<U1215><U12A0> <U0048><U0027><U0061> -<U1215><U12A4> <U0048><U0027><U0045> -<U1215><U12A6> <U0048><U0027><U006F> -<U1215><U12A7> <U0048><U0027><U0065><U0061> - -% may-sadis followed by a vowel -<U121D><U12A0> <U006D><U0027><U0065> -<U121D><U12A1> <U006D><U0027><U0075> -<U121D><U12A2> <U006D><U0027><U0069> -<U121D><U12A0> <U006D><U0027><U0061> -<U121D><U12A4> <U006D><U0027><U0045> -<U121D><U12A6> <U006D><U0027><U006F> -<U121D><U12A7> <U006D><U0027><U0065><U0061> - -% sewt-sadis followed by a vowel -<U1225><U12A0> <U0060><U0073><U0027><U0065> -<U1225><U12A1> <U0060><U0073><U0027><U0075> -<U1225><U12A2> <U0060><U0073><U0027><U0069> -<U1225><U12A0> <U0060><U0073><U0027><U0061> -<U1225><U12A4> <U0060><U0073><U0027><U0045> -<U1225><U12A6> <U0060><U0073><U0027><U006F> -<U1225><U12A7> <U0060><U0073><U0027><U0065><U0061> - -% ris-sadis followed by a vowel -<U122D><U12A0> <U0072><U0027><U0065> |
