branch: elpa/datetime
commit ee6cbeb8f6d86b86edde6e8ede23579fe5e02e0f
Author: Paul Pogonyshev <pogonys...@gmail.com>
Commit: Paul Pogonyshev <pogonys...@gmail.com>
Alter data harvesting to not drop locales that are completely the same as
their parent (e.g. `ru-RU' is now listed among known locales).
---
dev/HarvestData.java | 12 ++++++++----
locale-data.extmap | Bin 50699 -> 51999 bytes
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/dev/HarvestData.java b/dev/HarvestData.java
index 17363f2b40..6de8617afb 100644
--- a/dev/HarvestData.java
+++ b/dev/HarvestData.java
@@ -129,17 +129,21 @@ public class HarvestData
if (Objects.equals (locale, parent))
continue;
- if (Objects.equals (data.get (parent), data.get (locale)))
- data.remove (locale);
+ if (Objects.equals (data.get (parent), data.get (locale))) {
+ // We used to delete such locales, but now keep them in the
database.
+ // Otherwise, at runtime you can't for example use `ru-RU' and
must use
+ // `ru' instead.
+ data.put (locale, new HashMap <> ());
+ }
else {
for (Iterator <Map.Entry <String, String>> it = data.get
(locale).entrySet ().iterator (); it.hasNext ();) {
Map.Entry <String, String> entry = it.next ();
if (Objects.equals (entry.getValue (), data.get
(parent).get (entry.getKey ())))
it.remove ();
}
-
- data.get (locale).put (":parent", parent.toLanguageTag ());
}
+
+ data.get (locale).put (":parent", parent.toLanguageTag ());
}
System.out.println ("(");
diff --git a/locale-data.extmap b/locale-data.extmap
index e21bfb9735..dec9c4eff9 100644
Binary files a/locale-data.extmap and b/locale-data.extmap differ
