From cb8e8b2e218c4d8c1e33b3ab212b0bc15245f48c Mon Sep 17 00:00:00 2001 From: Mike FABIAN Date: Wed, 10 Jan 2024 18:00:26 +0100 Subject: localedata: resolve cyclic dependencies Resolves: BZ # 24006 --- localedata/locales/am_ET | 45 ++- localedata/locales/ber_DZ | 99 +----- localedata/locales/en_GB | 6 +- localedata/locales/en_PH | 6 +- localedata/locales/en_US | 6 +- localedata/locales/fil_PH | 8 +- localedata/locales/kab_DZ | 85 ++++- localedata/locales/om_ET | 85 +---- localedata/locales/om_KE | 84 ++++- localedata/locales/ti_ET | 850 +--------------------------------------------- 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 -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol - -reorder-after - -reorder-after - -reorder-after - -reorder-after - -reorder-after - -reorder-after - -reorder-after - -reorder-after - -reorder-after - -reorder-after - - - ;;;IGNORE % ɛ - ;;;IGNORE % Ɛ - ;;;IGNORE % č - ;;;IGNORE % Č - ;"";"";IGNORE % ḍ - ;"";"";IGNORE % Ḍ - ;"";"";IGNORE % ğ - ;"";"";IGNORE % Ğ - ;"";"";IGNORE % ḥ - ;"";"";IGNORE % Ḥ - ;;;IGNORE % ɣ - ;;;IGNORE % Ɣ - ;"";"";IGNORE % ṛ - ;"";"";IGNORE % Ṛ - ;"";"";IGNORE % ṣ - ;"";"";IGNORE % Ṣ - ;"";"";IGNORE % ṭ - ;"";"";IGNORE % Ṭ - ;"";"";IGNORE % ẓ - ;"";"";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 ): 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 +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol + +reorder-after + +reorder-after + +reorder-after + +reorder-after + +reorder-after + +reorder-after + +reorder-after + +reorder-after + +reorder-after + +reorder-after + + + ;;;IGNORE % ɛ + ;;;IGNORE % Ɛ + ;;;IGNORE % č + ;;;IGNORE % Č + ;"";"";IGNORE % ḍ + ;"";"";IGNORE % Ḍ + ;"";"";IGNORE % ğ + ;"";"";IGNORE % Ğ + ;"";"";IGNORE % ḥ + ;"";"";IGNORE % Ḥ + ;;;IGNORE % ɣ + ;;;IGNORE % Ɣ + ;"";"";IGNORE % ṛ + ;"";"";IGNORE % Ṛ + ;"";"";IGNORE % ṣ + ;"";"";IGNORE % Ṣ + ;"";"";IGNORE % ṭ + ;"";"";IGNORE % Ṭ + ;"";"";IGNORE % ẓ + ;"";"";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 -translit_start -% hoy-sadis followed by a vowel - - - - - - - - -% lawi-sadis followed by a vowel - - - - - - - - -% hawt-sadis followed by a vowel - - - - - - - - -% may-sadis followed by a vowel - - - - - - - - -% sewt-sadis followed by a vowel - - - - - - - - -% ris-sadis followed by a vowel - - - - - - - - -% sat-sadis followed by a vowel - - - - - - - - -% sha-sat-sadis followed by a vowel - - - - - - - - -% qaf-sadis followed by a vowel - - - - - - - - - - - - - - - - -% qha-qaf-sadis followed by a vowel - - - - - - - - - - - - - - - - -% bet-sadis followed by a vowel - - - - - - - - -% ve-bet-sadis followed by a vowel - - - - - - - - -% taw-sadis followed by a vowel - - - - - - - - -% cha-taw-sadis followed by a vowel - - - - - - - - -% harm-sadis followed by a vowel - - - - - - - - - - - - - - - - -% nehas-sadis followed by a vowel - - - - - - - - -% nye-nehas-sadis followed by a vowel - - - - - - - - -% kaf-sadis followed by a vowel - - - - - - - - - - - - - - - - -% kha-kaf-sadis followed by a vowel - - - - - - - - - - - - - - - - -% wewe-sadis followed by a vowel - - - - - - - - -% zey-sadis follozed by a vowel - - - - - - - - -% zhe-zey-sadis followed by a vowel - - - - - - - - -% yemen-sadis folloyed by a vowel - - - - - - - - -% dint-sadis followed by a vowel - - - - - - - - -% dhi-dint-sadis followed by a vowel - - - - - - - - -% ji-dint-sadis followed by a vowel - - - - - - - - -% gemel-sadis followed by a vowel - - - - - - - - - - - - - - - - -% nge-gemel-sadis followed by a vowel - - - - - - - - -% teyt-sadis followed by a vowel - - - - - - - - -% che-teyt-sadis followed by a vowel - - - - - - - - -% peyt-sadis followed by a vowel - - - - - - - - -% sedey-sadis followed by a vowel - - - - - - - - -% sepa-sadis followed by a vowel - - - - - - - - -% af-sadis followed by a vowel - - - - - - - - -% psa-sadis pollowed by a vowel - - - - - - - - -% hoy - - - - - - - - -% lawi - - - - - - - - - -% hawt - - - - - - - - - -% may - - - - - - - - - -% sewt - - - - - - - - - -% ris - - - - - - - - - -% sat - - - - - - - - - -% sha-sat - - - - - - - - - -% qaf - - - - - - - - - - - - - - -% qha-qaf - - - - - - - - - - - - - - -% bet - - - - - - - - - -% ve-bet - - - - - - - - - -% taw - - - - - - - - - -% cha-taw - - - - - - - - - -% harm - - - - - - - - - - - - - - -% nehas - - - - - - - - - -% nye-nehas - - - - - - - - - -% alef - - - - - - - - - -% kaf - - - - - - - - - - - - - - -% kha-kaf - - - - - - - - - - - - - - -% wewe - - - - - - - - - -% ayin - - - - - - - - -% zey - - - - - - - - - -% zhe-zey - - - - - - - - - -% yemen - - - - - - - - -% dint - - - - - - - - - -% dhi-dint - - - - - - - - - -% ji-dint - - - - - - - - - -% gemel - - - - - - - - - - - - - - -% nge-gemel - - - - - - - - - -% teyt - - - - - - - - - -% che-teyt - - - - - - - - - -% peyt - - - - - - - - - -% sedey - - - - - - - - - -% sepa - - - - - - - - - -% af - - - - - - - - - -% psa - - - - - - - - - -% Ligatures - - - - -% Punctuation - - - - - - - - - -% Numerals - - - - - - - - - - - - - - - - - - - - - -include "translit_combining";"" -translit_end -% +copy "am_ET" END LC_CTYPE - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % Ethiopia Specific and Shared Data: @@ -871,59 +67,25 @@ END LC_CTYPE %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% LC_MEASUREMENT -copy "i18n" +copy "am_ET" END LC_MEASUREMENT - LC_MONETARY -% -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 -% +copy "am_ET" END LC_MONETARY - LC_NUMERIC -% -% This is the POSIX Locale definition for the LC_NUMERIC category. -% -decimal_point "." -thousands_sep "," -grouping 3;3 -% +copy "am_ET" END LC_NUMERIC - LC_PAPER -copy "i18n" +copy "am_ET" END LC_PAPER - LC_TELEPHONE -% -% 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" -% +copy "am_ET" END LC_TELEPHONE - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % Tigrigna/ET Specific Data: diff --git a/localedata/locales/tl_PH b/localedata/locales/tl_PH index f67072f042..434290f5a5 100644 --- a/localedata/locales/tl_PH +++ b/localedata/locales/tl_PH @@ -45,7 +45,7 @@ category "i18n:2012";LC_MONETARY END LC_IDENTIFICATION LC_CTYPE -copy "en_DK" +copy "en_US" END LC_CTYPE LC_COLLATE -- cgit v1.2.3