From patchwork Mon Jan 8 09:53:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mike FABIAN X-Patchwork-Id: 83518 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 AA7B0385DC15 for ; Mon, 8 Jan 2024 09:54:39 +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 4F4C8385DC35 for ; Mon, 8 Jan 2024 09:54:01 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 4F4C8385DC35 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 4F4C8385DC35 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=1704707645; cv=none; b=e0P0HbfkAdmbn+KLAYdQZqNmwV6o6CXDWPoHL3nzYTWzLP5jFztez1SttH9ijYYL2C5CHbMaCQFOKrXR5VnAQ5kXNKB2GmKn7BesC3ykZPskykDUCNYjW7o4GxHZtRVpHU226sJnRn/gK99b+7+N63V+Ga6gfnpUcO12cDXHQWU= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1704707645; c=relaxed/simple; bh=tMCuTy6gJ5E5HTde7ET82b2sQkIEJL0xI8zkwvB6jaI=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=jffrB+6hSDc6JZOvkZxlpRMZFDYuijMuCWp/vyzo7pDw191CmW57wfJe56ICMI+EwMn80e/UGXvu9Ap+TRnrEZS26HUiFvVUw6NSbyemS1KXAm0hdAJTmWlA5kqpsBlXT42xwJVeh/3EjwLKxgyXO2lEsz3ChzhlMvZ4nGK3TFY= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1704707640; 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; bh=PP5hORkUrQus0hN6QumuwTtJcWWC2/J8uBWjfr3wAaA=; b=bCxmhItfnHcRdZSuzK2iyMVxuCspbeuzCozXB8IZD0FHvwvMFXqUaLrfhc4Awn4itWR9JX wCrWhFF40p94pbFyrHK3XU2RU98QMv+LJywtSVp/fF/Uwc5Ru8KjjJznNWi57ZipJLC3BD /fL/s+5USAETHJGUykwRbGum6sHFYEA= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-553-Ekae7IniPvi6-lWdK9MGGw-1; Mon, 08 Jan 2024 04:53:59 -0500 X-MC-Unique: Ekae7IniPvi6-lWdK9MGGw-1 Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-40d62d3ae0cso16114825e9.2 for ; Mon, 08 Jan 2024 01:53:59 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704707638; x=1705312438; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=PP5hORkUrQus0hN6QumuwTtJcWWC2/J8uBWjfr3wAaA=; b=PZaadIbIvnEOcthTI6nlLHw/PRX4D5Si7jjrAdf7M7xsP7eZPY2PjmUw25YnWb4Wl7 Lxs77MdySwM2xUjnb8c5RCPB58Ts5pg3mdHam49JQzKvxL9jVOfSZvOK2dae+khFBhxA UTw4o+UYN0LVQue17lgzhNbTyTlEgw5creZyprR2wMlxO+JX6mLAefKNax3exChi8p/9 E6fZyXhndnefWltueDBg/twOPrS4rP7YIvGBs21fqqIDHtUvhBNCxUZS50qLlY2wohHu h5IaY4bNOgOvt5scSwzq9LIFHmp6AI4Sx4wLmp3LgYXW3P02xgQSzxbUjhCaGDj2AYFE ys7w== X-Gm-Message-State: AOJu0YxHp8pr7W45J/6VAaHpMu9Hz6cJ+ps633tnkop1Pn6Ryjq5zdH3 0SyvgzJW4lBV6M1thNYyBjBAwD4aXugb4VETJuhwIm2vrqbBVD/6YFug+01eKf+YSyDKO1VRJSv /zy6OOtFcREUQizPtONV1MnnhJsSdNV8R5xg= X-Received: by 2002:a1c:4c08:0:b0:40e:4a58:2a85 with SMTP id z8-20020a1c4c08000000b0040e4a582a85mr140576wmf.99.1704707638027; Mon, 08 Jan 2024 01:53:58 -0800 (PST) X-Google-Smtp-Source: AGHT+IFSESnbETa5EVL4LILNfpa5Q+y6FycUnEcBpjMcTFfpgKDYEbJz7w25uKKGUtpfleVVCtnLIA== X-Received: by 2002:a1c:4c08:0:b0:40e:4a58:2a85 with SMTP id z8-20020a1c4c08000000b0040e4a582a85mr140568wmf.99.1704707637560; Mon, 08 Jan 2024 01:53:57 -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 f13-20020a05600c4e8d00b0040d887fda00sm10377707wmq.26.2024.01.08.01.53.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Jan 2024 01:53:57 -0800 (PST) Received: by hathi.site (Postfix, from userid 10030) id 5B1C0848D9; Mon, 8 Jan 2024 10:53:56 +0100 (CET) From: Mike FABIAN To: libc-alpha@sourceware.org Cc: Mike FABIAN Subject: [PATCH 1/2] localedata: convert the remaining *_RU locales to UTF-8 Date: Mon, 8 Jan 2024 10:53:52 +0100 Message-ID: <20240108095355.1200521-1-mfabian@redhat.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-11.2 required=5.0 tests=AC_HTML_NONSENSE_TAGS, BAYES_00, BODY_8BITS, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_NUMSUBJECT, 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 --- localedata/locales/ce_RU | 88 +++++++++++++++--------------- localedata/locales/cv_RU | 52 +++++++++--------- localedata/locales/mhr_RU | 86 ++++++++++++++--------------- localedata/locales/os_RU | 112 +++++++++++++++++++------------------- localedata/locales/sah_RU | 96 ++++++++++++++++---------------- localedata/locales/tt_RU | 94 ++++++++++++++++---------------- 6 files changed, 264 insertions(+), 264 deletions(-) diff --git a/localedata/locales/ce_RU b/localedata/locales/ce_RU index 271cbb0292..6a00088528 100644 --- a/localedata/locales/ce_RU +++ b/localedata/locales/ce_RU @@ -47,47 +47,47 @@ END LC_COLLATE LC_TIME % Январь, Февраль, Март, Апрель, Май, Июнь, Июль, Август, Сентябрь, Октябрь, Ноябрь, Декабрь -mon "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "" +mon "Январь";/ + "Февраль";/ + "Март";/ + "Апрель";/ + "Май";/ + "Июнь";/ + "Июль";/ + "Август";/ + "Сентябрь";/ + "Октябрь";/ + "Ноябрь";/ + "Декабрь" % янв, фев, мар, апр, май, июн, июл, авг, сен, окт, ноя, дек -abmon "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "" +abmon "янв";/ + "фев";/ + "мар";/ + "апр";/ + "май";/ + "июн";/ + "июл";/ + "авг";/ + "сен";/ + "окт";/ + "ноя";/ + "дек" % КӀиранан де, Оршотан де, Шинарин де, Кхаарин де, Еарин де, ПӀераскан де, Шот де -day " ";/ - " ";/ - " ";/ - " ";/ - " ";/ - " ";/ - " " +day "КӀиранан де";/ + "Оршотан де";/ + "Шинарин де";/ + "Кхаарин де";/ + "Еарин де";/ + "ПӀераскан де";/ + "Шот де" % КӀ, Ор, Ши, Кх, Еа, ПӀ, Шо -abday "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "" +abday "КӀ";/ + "Ор";/ + "Ши";/ + "Кх";/ + "Еа";/ + "ПӀ";/ + "Шо" d_t_fmt "%Y %d %b %a %T" date_fmt "%Y %d %b %a %T %Z" d_fmt "%Y.%d.%m" @@ -105,9 +105,9 @@ END LC_NUMERIC LC_MONETARY int_curr_symbol "RUB " -currency_symbol "" +currency_symbol "₽" mon_decimal_point "." -mon_thousands_sep "" +mon_thousands_sep " " mon_grouping 3;3 positive_sign "" negative_sign "-" @@ -130,8 +130,8 @@ copy "i18n" END LC_MEASUREMENT LC_MESSAGES -yesexpr "^[+1yY]" -noexpr "^[-0nN]" +yesexpr "^[+1yYДд]" +noexpr "^[-0nNМм]" END LC_MESSAGES LC_NAME @@ -140,13 +140,13 @@ END LC_NAME LC_ADDRESS postal_fmt "%f%N%a%N%d%N%b%N%s %h %e %r%N%z %T%N%c%N" -country_name "" +country_name "Росси" country_ab2 "RU" country_ab3 "RUS" country_num 643 country_car "RUS" % нохчийн мотт -lang_name "" +lang_name "нохчийн" lang_ab "ce" lang_term "che" END LC_ADDRESS diff --git a/localedata/locales/cv_RU b/localedata/locales/cv_RU index 09b86e877f..8e90fa32f2 100644 --- a/localedata/locales/cv_RU +++ b/localedata/locales/cv_RU @@ -115,10 +115,10 @@ LC_MONETARY int_curr_symbol "RUB " % "t." - short for tenke(, Chuvash name for rouble -currency_symbol "" +currency_symbol "₽" mon_decimal_point "." -mon_thousands_sep "" +mon_thousands_sep " " mon_grouping 3;3 positive_sign "" negative_sign "-" @@ -151,17 +151,17 @@ day "vyrsarnikun";/ "tuntikun";/ "ytlarikun";/ "junkun";/ - "knernikun";/ + "kĕşnernikun";/ "ernekun";/ - "matkun" + "šămatkun" abday "vr";/ "tn";/ "yt";/ "jn";/ - "k";/ + "kş";/ "er";/ - "m" + "šm" % Month names: % ka(rlac (January) - short KA(R @@ -177,30 +177,30 @@ abday "vr";/ % cu:k (November) CU:K % rasrlac";/ - "nars";/ - "pu";/ +mon "kărlac";/ + "narăs";/ + "puš";/ "aka";/ - "u";/ - "rtme";/ - "ut";/ - "urla";/ - "avn";/ + "şu";/ + "şĕrtme";/ + "ută";/ + "şurla";/ + "avăn";/ "jupa";/ - "ck";/ - "ratav" -abmon "KR";/ + "cük";/ + "raštav" +abmon "KĂR";/ "NAR";/ - "PU";/ + "PUŠ";/ "AKA";/ - "U";/ - "R";/ - "UT";/ - "UR";/ - "AV";/ + "ŞU";/ + "ŞĔR";/ + "UTĂ";/ + "ŞUR";/ + "AVĂ";/ "JUP";/ - "CK";/ - "RA" + "CÜK";/ + "RAŠ" d_t_fmt "%a %d %b %Y %T" date_fmt "%a %d %b %Y %T %Z" d_fmt "%d.%m.%Y" @@ -234,7 +234,7 @@ country_ab3 "RUS" country_num 643 country_car "RUS" % Чӑвашла -lang_name "" +lang_name "Чӑвашла" lang_ab "cv" lang_term "chv" lang_lib "chv" diff --git a/localedata/locales/mhr_RU b/localedata/locales/mhr_RU index 02bec3e9ae..6b1a47e574 100644 --- a/localedata/locales/mhr_RU +++ b/localedata/locales/mhr_RU @@ -62,15 +62,15 @@ translit_end END LC_CTYPE LC_MESSAGES -yesexpr "^[+1yY]" -noexpr "^[-0nN]" +yesexpr "^[+1yYТт]" +noexpr "^[-0nNУу]" END LC_MESSAGES LC_MONETARY int_curr_symbol "RUB " -currency_symbol "" +currency_symbol "₽" mon_decimal_point "." -mon_thousands_sep "" +mon_thousands_sep " " mon_grouping 3;3 positive_sign "" negative_sign "-" @@ -89,44 +89,44 @@ copy "ru_RU" END LC_NUMERIC LC_TIME -day "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "" -abday "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "" -mon "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "" -abmon "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "" +day "Рушарня";/ + "Шочмо";/ + "Кушкыжмо";/ + "Вӱргече";/ + "Изарня";/ + "Кугарня";/ + "Шуматкече" +abday "Ршр";/ + "Шчм";/ + "Кжм";/ + "Вгч";/ + "Изр";/ + "Кгр";/ + "Шмт" +mon "Шорыкйол";/ + "Пургыж";/ + "Ӱярня";/ + "Вӱдшор";/ + "Ага";/ + "Пеледыш";/ + "Сӱрем";/ + "Сорла";/ + "Идым";/ + "Шыжа";/ + "Кылме";/ + "Теле" +abmon "Шрк";/ + "Пгж";/ + "Ӱрн";/ + "Вшр";/ + "Ага";/ + "Пдш";/ + "Срм";/ + "Срл";/ + "Идм";/ + "Шыж";/ + "Клм";/ + "Тел" d_t_fmt "%A %Y %B %d %T" d_fmt "%Y.%m.%d" t_fmt "%T" @@ -160,7 +160,7 @@ country_ab3 "RUS" country_num 643 country_car "RUS" % марий йылме -lang_name " " +lang_name "марий йылме" lang_term "mhr" lang_lib "mhr" END LC_ADDRESS diff --git a/localedata/locales/os_RU b/localedata/locales/os_RU index 55a7e92944..b16e95db27 100644 --- a/localedata/locales/os_RU +++ b/localedata/locales/os_RU @@ -76,10 +76,10 @@ translit_end END LC_CTYPE LC_MESSAGES -yesexpr "^[+1yY]" -noexpr "^[-0nN]" -yesstr "" -nostr "" +yesexpr "^[+1yYуУ]" +noexpr "^[-0nNнН]" +yesstr "уойы" +nostr "нӕйы" END LC_MESSAGES LC_MONETARY @@ -91,56 +91,56 @@ copy "ru_RU" END LC_NUMERIC LC_TIME -abday "";"";/ - "";"";/ - "";"";/ - "" -day "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "" - -abmon "";/ -"";/ -"";/ -"";/ -"";/ -"";/ -"";/ -"";/ -"";/ -"";/ -"";/ -"" - -alt_mon "";/ -"";/ -"";/ -"";/ -"";/ -"";/ -"";/ -"";/ -"";/ -"";/ -"";/ -"" - -mon "";/ -"";/ -"";/ -"";/ -"";/ -"";/ -"";/ -"";/ -"";/ -"";/ -"";/ -"" +abday "Хцб";"Крс";/ + "Дцг";"Æрт";/ + "Цпр";"Мрб";/ + "Сбт" +day "Хуыцаубон";/ + "Къуырисæр";/ + "Дыццæг";/ + "Æртыццæг";/ + "Цыппæрæм";/ + "Майрæмбон";/ + "Сабат" + +abmon "Янв";/ +"Фев";/ +"Мар";/ +"Апр";/ +"Май";/ +"Июн";/ +"Июл";/ +"Авг";/ +"Сен";/ +"Окт";/ +"Ноя";/ +"Дек" + +alt_mon "Январь";/ +"Февраль";/ +"Мартъи";/ +"Апрель";/ +"Май";/ +"Июнь";/ +"Июль";/ +"Август";/ +"Сентябрь";/ +"Октябрь";/ +"Ноябрь";/ +"Декабрь" + +mon "январы";/ +"февралы";/ +"мартъийы";/ +"апрелы";/ +"майы";/ +"июны";/ +"июлы";/ +"августы";/ +"сентябры";/ +"октябры";/ +"ноябры";/ +"декабры" d_t_fmt "%a %d %b %Y %T" date_fmt "%a %d %b %Y %T %Z" d_fmt "%d.%m.%Y" @@ -169,12 +169,12 @@ END LC_NAME LC_ADDRESS postal_fmt "%f%N%a%N%d%N%b%N%s %h %e %r%N%z %T%N%c%N" -country_name "" +country_name "Уӕрӕсе" country_ab2 "RU" country_ab3 "RUS" country_num 643 country_car "RUS" -lang_name "" +lang_name "ирон" lang_ab "os" lang_term "oss" lang_lib "oss" diff --git a/localedata/locales/sah_RU b/localedata/locales/sah_RU index 2b5a4b7bd6..ab6e87e195 100644 --- a/localedata/locales/sah_RU +++ b/localedata/locales/sah_RU @@ -126,64 +126,64 @@ END LC_NUMERIC LC_TIME % abday - The abbreviations for the week days: % - бс, бн, оп, ср, чп, бт, сб -abday "";"";/ - "";"";/ - "";"";/ - "" +abday "бс";"бн";/ + "оп";"ср";/ + "чп";"бт";/ + "сб" % day - The full names of the week days: % - баскыһыанньа, бэнидиэнньик, оптуорунньук, % сэрэдэ, чэппиэр, бээтинсэ, субуота -day "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "" +day "баскыһыанньа";/ + "бэнидиэнньик";/ + "оптуорунньук";/ + "сэрэдэ";/ + "чэппиэр";/ + "бээтинсэ";/ + "субуота" % abmon - The abbreviations for the months % - тохс, олун, кул, муус, ыам, бэс, от, атыр, бал, алт, сэт, ахс -abmon "";"";/ - "";"";/ - "";"";/ - "";"";/ - "";"";/ - "";"" +abmon "тохс";"олун";/ + "кул";"муус";/ + "ыам";"бэс";/ + "от";"атыр";/ + "бал";"алт";/ + "сэт";"ахс" % mon - The full names of the months (genitive case) - % - тохсунньу, олунньу, кулун тутар, муус устар, ыам ыйын, % бэс ыйын, от ыйын, атырдьах ыйын, балаҕан ыйын, алтынньы, % сэтинньи, ахсынньы -mon "";/ - "";/ - " ";/ - " ";/ - " ";/ - " ";/ - " ";/ - " ";/ - " ";/ - "";/ - "";/ - "" +mon "тохсунньу";/ + "олунньу";/ + "кулун тутар";/ + "муус устар";/ + "ыам ыйын";/ + "бэс ыйын";/ + "от ыйын";/ + "атырдьах ыйын";/ + "балаҕан ыйын";/ + "алтынньы";/ + "сэтинньи";/ + "ахсынньы" % alt_mon - The full names of the months (nominative case) - % - тохсунньу, олунньу, кулун тутар, муус устар, ыам ыйа, % бэс ыйа, от ыйа, атырдьах ыйа, балаҕан ыйа, алтынньы, % сэтинньи, ахсынньы -alt_mon "";/ - "";/ - " ";/ - " ";/ - " ";/ - " ";/ - " ";/ - " ";/ - " ";/ - "";/ - "";/ - "" +alt_mon "тохсунньу";/ + "олунньу";/ + "кулун тутар";/ + "муус устар";/ + "ыам ыйа";/ + "бэс ыйа";/ + "от ыйа";/ + "атырдьах ыйа";/ + "балаҕан ыйа";/ + "алтынньы";/ + "сэтинньи";/ + "ахсынньы" % Abbreviated date and time representation to be referenced by the "%c" field % descriptor - @@ -222,7 +222,7 @@ t_fmt_ampm "" % %T - (24-hour clock time in format HH:MM:SS), % %Z - time-zone name, % "%a %Y с. %B %e к. %T (%Z)" -date_fmt "%a %Y . %B %e . %T (%Z)" +date_fmt "%a %Y с. %B %e к. %T (%Z)" week 7;19971130;1 first_weekday 2 @@ -232,17 +232,17 @@ END LC_TIME LC_MESSAGES % The affirmative response - % '^[+1yYдДэЭ]' -yesexpr "^[+1yY]" +yesexpr "^[+1yYдДэЭ]" % The negative response - % '^[-0nNнНсС]' -noexpr "^[-0nN]" +noexpr "^[-0nNнНсС]" % 'ээх' -yesstr "" +yesstr "ээх" % 'суох' -nostr "" +nostr "суох" END LC_MESSAGES LC_PAPER @@ -265,10 +265,10 @@ LC_ADDRESS postal_fmt "%f%N%a%N%d%N%b%N%s %h %e %r%N%z %T%N%c%N" % Арассыыйа -country_name "" +country_name "Арассыыйа" % саха тыла -lang_name "" +lang_name "саха тыла" % UN Geneve 1949:68 Distinguishing signs of vehicles in international traffic % RUS diff --git a/localedata/locales/tt_RU b/localedata/locales/tt_RU index 134861f106..47562f554b 100644 --- a/localedata/locales/tt_RU +++ b/localedata/locales/tt_RU @@ -22,7 +22,7 @@ escape_char / % % TODO: check LC_COLLATE % -% needed extra chars: , , , , +% needed extra chars: ә, ө, җ, һ, ң % % Note: Tatarstan adopted latin alphabet in 2000, it should gradually % replace cyrillic alphabet @@ -163,17 +163,17 @@ reorder-end END LC_COLLATE LC_MESSAGES -yesexpr "^[+1yY]" -noexpr "^[-0nN]" -yesstr "" -nostr "" +yesexpr "^[+1yYәӘ]" +noexpr "^[-0nNюЮ]" +yesstr "әйе" +nostr "юк" END LC_MESSAGES LC_MONETARY int_curr_symbol "RUB " -currency_symbol "" +currency_symbol "₽" mon_decimal_point "." -mon_thousands_sep "" +mon_thousands_sep " " mon_grouping 3;3 positive_sign "" negative_sign "-" @@ -192,44 +192,44 @@ copy "ru_RU" END LC_NUMERIC LC_TIME -day "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "" -abday "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "" -mon "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "" -abmon "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "" +day "якшәмбе";/ + "дүшәмбе";/ + "сишәмбе";/ + "чәршәмбе";/ + "пәнҗешәмбе";/ + "җомга";/ + "шимбә" +abday "якш";/ + "дүш";/ + "сиш";/ + "чәр";/ + "пәнҗ";/ + "җом";/ + "шим" +mon "гыйнвар";/ + "февраль";/ + "март";/ + "апрель";/ + "май";/ + "июнь";/ + "июль";/ + "август";/ + "сентябрь";/ + "октябрь";/ + "ноябрь";/ + "декабрь" +abmon "гыйн";/ + "фев";/ + "мар";/ + "апр";/ + "май";/ + "июнь";/ + "июль";/ + "авг";/ + "сент";/ + "окт";/ + "нояб";/ + "дек" d_t_fmt "%a %d %b %Y %T" date_fmt "%a %d %b %Y %T %Z" d_fmt "%d.%m.%Y" @@ -257,12 +257,12 @@ LC_ADDRESS % FIXME postal_fmt "???" % https://tt.wikipedia.org/wiki/%D0%A0%D1%83%D1%81%D0%B8%D1%8F : Русия -country_name "" +country_name "Русия" country_ab2 "RU" country_ab3 "RUS" country_num 643 country_car "RUS" -lang_name "" +lang_name "татар" lang_ab "tt" lang_term "tat" lang_lib "tat" From patchwork Mon Jan 8 09:53:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mike FABIAN X-Patchwork-Id: 83517 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 622C5385E453 for ; Mon, 8 Jan 2024 09:54:39 +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 CAB2D385E019 for ; Mon, 8 Jan 2024 09:54:03 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org CAB2D385E019 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 CAB2D385E019 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=1704707645; cv=none; b=GbiYJ2HHdBNiguelHhjduOAAQWGOnEX/zBSBrxL+A09qkupq+BdHJ6UIHd1HRKhxiR02Mv4+mk8YuTmuZgsidBx94K8ezgtsA7i0CXYt7vEEb+SQ5OMEUJn0havKF3HZvtekRezk13Eu07OANXxF8AX6hs5CNmm5sb4eyBQvgo0= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1704707645; c=relaxed/simple; bh=On6THQstRJlgk11TGZ4GtmB9mbp0TbG9wGbaTugljI4=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=FlxcMf9n+0GrFscNn9aVB42k2w82HJbRF+wKH9hwXc8UGF/mINiwO1DxnNtBrcwZ7qHxZN243tBu10HWNVzZC2Yc2oG9PKJIbNBHfrNrLdS9xVmPA+l4wmWfj2UJc452QTopcHotPCV+CeBiPBzt95gb3VM8v+oUd23Hu39RoEU= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1704707643; 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=/adT7H2UK3CXsprVvuBHkJhPDQyqBh1urI0odZSvGYg=; b=hSS3WLgUstMNJL1tMyG4SOMciz/LisuUKWVZbUVnOid83RRX3NZbIuBHBzUPGQFvdGiY67 qlFFIMAr8fEs7Cey1MdqO/3sC8F8VZeJvwi6qp3cohcj/bT4tdPViW6wmCUs7wLoAvr9QH o1UPNsEKsUS8L4a9EhC3/sirhjYREIE= Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-453-DxmNUneZMvebh2vdK0byrw-1; Mon, 08 Jan 2024 04:54:00 -0500 X-MC-Unique: DxmNUneZMvebh2vdK0byrw-1 Received: by mail-wr1-f71.google.com with SMTP id ffacd0b85a97d-33677bbd570so1159379f8f.3 for ; Mon, 08 Jan 2024 01:53:59 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704707638; x=1705312438; 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=/adT7H2UK3CXsprVvuBHkJhPDQyqBh1urI0odZSvGYg=; b=iREu++iA+iq5i26r9z7NTb/mMOWb1tphjbrfv51GZINbC+Ef1JJXTd2H4Z6qSS1HFR YVJzt4/EUYaxGNZHbe8iZGoA/VxcVJtS7MTCKkWCrOZsn1yEqAfpP/K0MDvjRROafKkQ IAiO18bdKlryBIiEiKvwziye4KF7aNrR3YRN6kQsnt8Zg0kqJ267yCTFN2QNNP1yjQfs Dvc89KR0h630VlSgpHnNqLU13O6KPFHRUynXN0EON17SkTsIjAKpaxOwQI7k9uCRdIx1 zWymdkpN8ZKpZOiF5jjttmFXd2D+P74JTFsJu9/rnNYeavHiYHWSvpd7OwyYpUC1brT1 j68Q== X-Gm-Message-State: AOJu0YzYNGANOx2gV07DmK/+0iDQg9ZFx5xsIvsptmbcTnhbfMikjihi eSW3E6GWRHeVbVv/OleJBBhQFDW2Ijr7N9KwgSOa3UcQeUvA9btHqSI4NHDknT1v1MVmd2GiQBp AtV939QhHC2l5dlY5KNnjJr+P3K3O7A4Q1uE= X-Received: by 2002:a05:600c:1f90:b0:40d:5b1c:2714 with SMTP id je16-20020a05600c1f9000b0040d5b1c2714mr1885903wmb.111.1704707638525; Mon, 08 Jan 2024 01:53:58 -0800 (PST) X-Google-Smtp-Source: AGHT+IFgnx4hQuV3i0wqJb5OFwHbAcA5u8fAeeo6N7pX5ECLuCkDoGp1ngRT8SaE6/xSgg5BzXqOiA== X-Received: by 2002:a05:600c:1f90:b0:40d:5b1c:2714 with SMTP id je16-20020a05600c1f9000b0040d5b1c2714mr1885897wmb.111.1704707638216; Mon, 08 Jan 2024 01:53:58 -0800 (PST) Received: from hathi.site (p5dc1778a.dip0.t-ipconnect.de. [93.193.119.138]) by smtp.gmail.com with ESMTPSA id fm15-20020a05600c0c0f00b0040e47dc2e8fsm2187591wmb.6.2024.01.08.01.53.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Jan 2024 01:53:57 -0800 (PST) Received: by hathi.site (Postfix, from userid 10030) id 27E88848DC; Mon, 8 Jan 2024 10:53:57 +0100 (CET) From: Mike FABIAN To: libc-alpha@sourceware.org Cc: Mike FABIAN Subject: [PATCH 2/2] localedata: unicode-gen: Remove redundant \s* from regexp, fix comments Date: Mon, 8 Jan 2024 10:53:53 +0100 Message-ID: <20240108095355.1200521-2-mfabian@redhat.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240108095355.1200521-1-mfabian@redhat.com> References: <20240108095355.1200521-1-mfabian@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.1 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_BARRACUDACENTRAL, 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 --- localedata/charmaps/UTF-8 | 2 +- localedata/unicode-gen/utf8_gen.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/localedata/charmaps/UTF-8 b/localedata/charmaps/UTF-8 index 94f20d5e87..b545cc9b25 100644 --- a/localedata/charmaps/UTF-8 +++ b/localedata/charmaps/UTF-8 @@ -49858,7 +49858,7 @@ END CHARMAP % Character width according to Unicode 15.1.0. % - Default width is 1. % - Double-width characters have width 2; generated from -% "grep '^[^;]*;[WF]' EastAsianWidth.txt" +% "grep '^[^;]*;\s*[WF]' EastAsianWidth.txt" % - Non-spacing characters have width 0; generated from PropList.txt or % "grep '^[^;]*;[^;]*;[^;]*;[^;]*;NSM;' UnicodeData.txt" % - Format control characters have width 0; generated from diff --git a/localedata/unicode-gen/utf8_gen.py b/localedata/unicode-gen/utf8_gen.py index 5e77333bb4..f744e87ffc 100755 --- a/localedata/unicode-gen/utf8_gen.py +++ b/localedata/unicode-gen/utf8_gen.py @@ -204,7 +204,7 @@ def write_header_width(outfile, unicode_version): + '{:s}.\n'.format(unicode_version)) outfile.write('% - Default width is 1.\n') outfile.write('% - Double-width characters have width 2; generated from\n') - outfile.write('% "grep \'^[^;]*;[WF]\' EastAsianWidth.txt"\n') + outfile.write('% "grep \'^[^;]*;\\s*[WF]\' EastAsianWidth.txt"\n') outfile.write('% - Non-spacing characters have width 0; ' + 'generated from PropList.txt or\n') outfile.write('% "grep \'^[^;]*;[^;]*;[^;]*;[^;]*;NSM;\' ' @@ -339,8 +339,8 @@ if __name__ == "__main__": with open(ARGS.east_asian_with_file, mode='r') as EAST_ASIAN_WIDTH_FILE: EAST_ASIAN_WIDTH_LINES = [] for LINE in EAST_ASIAN_WIDTH_FILE: - # If characters from EastAasianWidth.txt which are from - # from reserved ranges (i.e. not yet assigned code points) + # If characters from EastAsianWidth.txt which are from + # reserved ranges (i.e. not yet assigned code points) # are added to the WIDTH section of the UTF-8 file, then # “make check” produces “Unknown Character” errors for # these code points because such unassigned code points @@ -350,7 +350,7 @@ if __name__ == "__main__": # the EastAsianWidth.txt file. if re.match(r'.*\.\..*', LINE): continue - if re.match(r'^[^;]*;\s*[WF]\s*', LINE): + if re.match(r'^[^;]*;\s*[WF]', LINE): EAST_ASIAN_WIDTH_LINES.append(LINE.strip()) with open(ARGS.prop_list_file, mode='r') as PROP_LIST_FILE: PROP_LIST_LINES = []