From patchwork Thu Jan 11 09:40:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mike FABIAN X-Patchwork-Id: 83868 X-Patchwork-Delegate: mfabian@redhat.com Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 93C22385803E for ; Thu, 11 Jan 2024 09:44:55 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id 1445C3857809 for ; Thu, 11 Jan 2024 09:40:52 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 1445C3857809 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 1445C3857809 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1704966058; cv=none; b=AurTR7bSQRwdWdZIBVhuDJ3rtu7i/xfu277M3sgE/18WmYmGId7UlFAKQ5ATs45YSEpeVz2iFegCPlauH9qdyAAVOWp5uHYoe9b8ERUYuH0hu6Bh1g1FcD6SFYzWvGjmk9uGpmVsx1/vzRTDVsIqZNCFtxouZv5xZDhnmlwHMFU= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1704966058; c=relaxed/simple; bh=mp0HNIaIgY7ho+bYXXLj1X4N93K0USKaEzxnn9JpASA=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=tLAlvJ1L52ZjTcX3qd+jNi43HXtTSSPPBxi34pcEUZb5jjPpboGLtJJxnb+49Iz4XSbB4h3+e6V46KwcNydPVaza7rmyYse3yovpzh8+Vx/4Yfn/n1kXsMd7evg9DyyzAcsuU2EoDqlif3KvSLWvVujrVVAk6U/h2kiym1W1Leg= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1704966051; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=FTWj8zwnjahFuxv3aoJkZWx3rw4kAcCCk0AP2Oe5zAA=; b=S7nuAreFwdCStSe4A2UMeJCd33SpmSuKDyW7Uv6vj9Lf3fblSNGRQAfO8UqQ5kOe8P0ISN uAvo7/CxkGuzTM810yg124C42EUY6wVvAF8ebr2czaYOBCKUTfsax2u+dELZVUDvcvrMId zJp38WAqrGp3OreJOLOMe4PCj3os940= Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-581--aGIzDCmNPWsXncx1FvERw-1; Thu, 11 Jan 2024 04:40:50 -0500 X-MC-Unique: -aGIzDCmNPWsXncx1FvERw-1 Received: by mail-ed1-f72.google.com with SMTP id 4fb4d7f45d1cf-553b6a33a58so6411873a12.1 for ; Thu, 11 Jan 2024 01:40:50 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704966048; x=1705570848; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=FTWj8zwnjahFuxv3aoJkZWx3rw4kAcCCk0AP2Oe5zAA=; b=ae7a56TXqG5uUcrmfF2/1ZeGg+6eYJdmxrF8pNFwK/O5xq/Zn0hyCU/EgiEozdKz74 OYfj7zzgEyybHBY/NiQ5s6FFiGETbwNo3bxVRxzwEjdKDkrhVFXZIrG4p5NvET5Yi/VW M7lSNt8jYDxFRmDPE3hU2r+kFEV3LYZ7mm/41Xw1oqM5pF/9iEQKJSVe68jSuTN2zpQc KqjDNqhIlmVv1INyxLMDpE79uoSSAzSyaPLdhC/AewND5cNgbUk58+Thj9anybojApPQ uJ9aQ8IX0WVhaexZbbswSs2WOSqo5632349MCuM/xCtkEGJH46+qnYFcnKagJdQWSNVX qtlQ== X-Gm-Message-State: AOJu0YyGNvNw9ZRB0wJil3TUeW8eI0u0a3EqYDer2lXPlE4fBJ1UhuNd TVNoJH+MYCzW3OeCokMKERFn/oA72IOmJIyqFZS4y9RObm9jjHDMY5Wk6cj2EZ0OimlSzBbwUU1 cROCGgCcLaTDztHaPqcAWLfVgMbLzw6Xue/4= X-Received: by 2002:aa7:c889:0:b0:557:7037:1a41 with SMTP id p9-20020aa7c889000000b0055770371a41mr492773eds.25.1704966048317; Thu, 11 Jan 2024 01:40:48 -0800 (PST) X-Google-Smtp-Source: AGHT+IGNwQD2ldZ8o2vAUjLluRDXOoLx3u/6nvH8I8NZMfP0b9Iui7YF0K5k/9vUL7vqMlmdkejMcA== X-Received: by 2002:aa7:c889:0:b0:557:7037:1a41 with SMTP id p9-20020aa7c889000000b0055770371a41mr492764eds.25.1704966047916; Thu, 11 Jan 2024 01:40:47 -0800 (PST) Received: from hathi.site (p200300efa70fc1004d26878fe8803456.dip0.t-ipconnect.de. [2003:ef:a70f:c100:4d26:878f:e880:3456]) by smtp.gmail.com with ESMTPSA id k17-20020aa7c051000000b005574ffc25a0sm406470edo.31.2024.01.11.01.40.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Jan 2024 01:40:46 -0800 (PST) Received: by hathi.site (Postfix, from userid 10030) id B4E48848CF; Thu, 11 Jan 2024 10:40:45 +0100 (CET) From: Mike FABIAN To: libc-alpha@sourceware.org Cc: Mike FABIAN Subject: [PATCH 3/4] localedata: resolve cyclic dependencies Date: Thu, 11 Jan 2024 10:40:41 +0100 Message-ID: <20240111094043.2260515-3-mfabian@redhat.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240111094043.2260515-1-mfabian@redhat.com> References: <20240111094043.2260515-1-mfabian@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-14.3 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org 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