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.

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  <digitalfreak@lingonborough.com>
+
+	[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  <samuel.thibault@ens-lyon.org>
 
 	* sysdeps/mach/hurd/xmknodat.c: Include <sys/sysmacros.h>.
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   "<U0412><U0441>";/
         "<U0427><U0442>";/
         "<U041F><U0442>";/
         "<U0421><U0431>"
-mon     "<U042F><U043D><U0432><U0430><U0440><U044C>";/
+alt_mon "<U042F><U043D><U0432><U0430><U0440><U044C>";/
         "<U0424><U0435><U0432><U0440><U0430><U043B><U044C>";/
         "<U041C><U0430><U0440><U0442>";/
         "<U0410><U043F><U0440><U0435><U043B><U044C>";/
@@ -134,7 +134,19 @@ mon     "<U042F><U043D><U0432><U0430><U0440><U044C>";/
         "<U041E><U043A><U0442><U044F><U0431><U0440><U044C>";/
         "<U041D><U043E><U044F><U0431><U0440><U044C>";/
         "<U0414><U0435><U043A><U0430><U0431><U0440><U044C>"
-abmon   "<U044F><U043D><U0432>";/
+mon     "<U044F><U043D><U0432><U0430><U0440><U044F>";/
+        "<U0444><U0435><U0432><U0440><U0430><U043B><U044F>";/
+        "<U043C><U0430><U0440><U0442><U0430>";/
+        "<U0430><U043F><U0440><U0435><U043B><U044F>";/
+        "<U043C><U0430><U044F>";/
+        "<U0438><U044E><U043D><U044F>";/
+        "<U0438><U044E><U043B><U044F>";/
+        "<U0430><U0432><U0433><U0443><U0441><U0442><U0430>";/
+        "<U0441><U0435><U043D><U0442><U044F><U0431><U0440><U044F>";/
+        "<U043E><U043A><U0442><U044F><U0431><U0440><U044F>";/
+        "<U043D><U043E><U044F><U0431><U0440><U044F>";/
+        "<U0434><U0435><U043A><U0430><U0431><U0440><U044F>"
+ab_alt_mon "<U044F><U043D><U0432>";/
         "<U0444><U0435><U0432>";/
         "<U043C><U0430><U0440>";/
         "<U0430><U043F><U0440>";/
@@ -146,6 +158,18 @@ abmon   "<U044F><U043D><U0432>";/
         "<U043E><U043A><U0442>";/
         "<U043D><U043E><U044F>";/
         "<U0434><U0435><U043A>"
+abmon   "<U044F><U043D><U0432>";/
+        "<U0444><U0435><U0432>";/
+        "<U043C><U0430><U0440>";/
+        "<U0430><U043F><U0440>";/
+        "<U043C><U0430><U044F>";/
+        "<U0438><U044E><U043D>";/
+        "<U0438><U044E><U043B>";/
+        "<U0430><U0432><U0433>";/
+        "<U0441><U0435><U043D>";/
+        "<U043E><U043A><U0442>";/
+        "<U043D><U043E><U044F>";/
+        "<U0434><U0435><U043A>"
 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   "<U0412><U0441><U043A>";/
         "<U0427><U0442><U0432>";/
         "<U041F><U0442><U043D>";/
         "<U0421><U0443><U0431>"
-mon     "<U042F><U043D><U0432><U0430><U0440><U044C>";/
+alt_mon "<U042F><U043D><U0432><U0430><U0440><U044C>";/
         "<U0424><U0435><U0432><U0440><U0430><U043B><U044C>";/
         "<U041C><U0430><U0440><U0442>";/
         "<U0410><U043F><U0440><U0435><U043B><U044C>";/
@@ -123,7 +123,19 @@ mon     "<U042F><U043D><U0432><U0430><U0440><U044C>";/
         "<U041E><U043A><U0442><U044F><U0431><U0440><U044C>";/
         "<U041D><U043E><U044F><U0431><U0440><U044C>";/
         "<U0414><U0435><U043A><U0430><U0431><U0440><U044C>"
-abmon   "<U042F><U043D><U0432>";/
+mon     "<U044F><U043D><U0432><U0430><U0440><U044F>";/
+        "<U0444><U0435><U0432><U0440><U0430><U043B><U044F>";/
+        "<U043C><U0430><U0440><U0442><U0430>";/
+        "<U0430><U043F><U0440><U0435><U043B><U044F>";/
+        "<U043C><U0430><U044F>";/
+        "<U0438><U044E><U043D><U044F>";/
+        "<U0438><U044E><U043B><U044F>";/
+        "<U0430><U0432><U0433><U0443><U0441><U0442><U0430>";/
+        "<U0441><U0435><U043D><U0442><U044F><U0431><U0440><U044F>";/
+        "<U043E><U043A><U0442><U044F><U0431><U0440><U044F>";/
+        "<U043D><U043E><U044F><U0431><U0440><U044F>";/
+        "<U0434><U0435><U043A><U0430><U0431><U0440><U044F>"
+ab_alt_mon "<U042F><U043D><U0432>";/
         "<U0424><U0435><U0432>";/
         "<U041C><U0430><U0440>";/
         "<U0410><U043F><U0440>";/
@@ -135,6 +147,18 @@ abmon   "<U042F><U043D><U0432>";/
         "<U041E><U043A><U0442>";/
         "<U041D><U043E><U044F>";/
         "<U0414><U0435><U043A>"
+abmon   "<U044F><U043D><U0432>";/
+        "<U0444><U0435><U0432>";/
+        "<U043C><U0430><U0440>";/
+        "<U0430><U043F><U0440>";/
+        "<U043C><U0430><U044F>";/
+        "<U0438><U044E><U043D>";/
+        "<U0438><U044E><U043B>";/
+        "<U0430><U0432><U0433>";/
+        "<U0441><U0435><U043D>";/
+        "<U043E><U043A><U0442>";/
+        "<U043D><U043E><U044F>";/
+        "<U0434><U0435><U043A>"
 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 },
 };