From f7bdf30d1549f9b9e7d47f5314215eeb7116c47f Mon Sep 17 00:00:00 2001 From: Rafal Luzynski Date: Tue, 5 Jan 2016 03:04:41 +0100 Subject: ru_RU, ru_UA: Add alternative month names (bug 10871). [BZ #10871] * localedata/locales/ru_RU (mon): Rename to... (alt_mon): This. (abmon): Rename to... (ab_alt_mon): This. (mon): Import from CLDR (genitive case). (abmon): Copy from the old content except the 5th month which is now in the genitive case, even when abbreviated. * localedata/locales/ru_UA: Likewise. * time/tst-strptime.c (day_tests): Add an actual example of a difference between %b and %Ob in Russian. --- ChangeLog | 14 ++++++++++++++ localedata/locales/ru_RU | 28 ++++++++++++++++++++++++++-- localedata/locales/ru_UA | 28 ++++++++++++++++++++++++++-- time/tst-strptime.c | 12 +++++++----- 4 files changed, 73 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index d391807627..64421eecd2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +2018-01-29 Rafal Luzynski + + [BZ #10871] + * localedata/locales/ru_RU (mon): Rename to... + (alt_mon): This. + (abmon): Rename to... + (ab_alt_mon): This. + (mon): Import from CLDR (genitive case). + (abmon): Copy from the old content except the 5th month which is + now in the genitive case, even when abbreviated. + * localedata/locales/ru_UA: Likewise. + * time/tst-strptime.c (day_tests): Add an actual example of + a difference between %b and %Ob in Russian. + 2018-01-27 Samuel Thibault * sysdeps/mach/hurd/xmknodat.c: Include . diff --git a/localedata/locales/ru_RU b/localedata/locales/ru_RU index d7ba374d9b..0149ffcffc 100644 --- a/localedata/locales/ru_RU +++ b/localedata/locales/ru_RU @@ -122,7 +122,7 @@ abday "";/ "";/ "";/ "" -mon "";/ +alt_mon "";/ "";/ "";/ "";/ @@ -134,7 +134,19 @@ mon "";/ "";/ "";/ "" -abmon "";/ +mon "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "" +ab_alt_mon "";/ "";/ "";/ "";/ @@ -146,6 +158,18 @@ abmon "";/ "";/ "";/ "" +abmon "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "" d_t_fmt "%a %d %b %Y %T" d_fmt "%d.%m.%Y" t_fmt "%T" diff --git a/localedata/locales/ru_UA b/localedata/locales/ru_UA index 3a8d9ebf10..f8d7a12785 100644 --- a/localedata/locales/ru_UA +++ b/localedata/locales/ru_UA @@ -111,7 +111,7 @@ abday "";/ "";/ "";/ "" -mon "";/ +alt_mon "";/ "";/ "";/ "";/ @@ -123,7 +123,19 @@ mon "";/ "";/ "";/ "" -abmon "";/ +mon "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "" +ab_alt_mon "";/ "";/ "";/ "";/ @@ -135,6 +147,18 @@ abmon "";/ "";/ "";/ "" +abmon "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "" d_t_fmt "%a %d %b %Y %T" d_fmt "%d.%m.%Y" t_fmt "%T" diff --git a/time/tst-strptime.c b/time/tst-strptime.c index 49dfbe9535..441e04b454 100644 --- a/time/tst-strptime.c +++ b/time/tst-strptime.c @@ -66,11 +66,13 @@ static const struct { "pl_PL.UTF-8", "25 lis 2017", "%d %Ob %Y", 6, 328, 10, 25 }, /* ноя - pronounce: 'noya' - "Nov" (abbreviated "November") in Russian. */ { "ru_RU.UTF-8", "26 ноя 2017", "%d %b %Y", 0, 329, 10, 26 }, - /* TODO: Add an example of "may"/"maya" (5th month, May) using %Ob in - Russian when the localedata is updated. Without the genitive forms - in localedata the word "maya" is ambiguous and may be mistaken for - "mart" (March). - */ + /* мая - pronounce: 'maya' - "of May" (the genitive case, both full and + abbreviated) in Russian. */ + { "ru_RU.UTF-8", "19 мая 2018", "%d %b %Y", 6, 138, 4, 19 }, + /* май - pronounce: 'may' - "May" (the nominative case, both full and + abbreviated) in Russian. + The nominative case is incorrect here but it is parseable. */ + { "ru_RU.UTF-8", "20 май 2018", "%d %Ob %Y", 0, 139, 4, 20 }, }; -- cgit 1.4.1