Merge branch 'master' into hindu

MenoData · Jun 15, 2020 · a3124de · a3124de
2 parents df9a7dc + 6813293
commit a3124de
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,6 @@
 ## [v5.7] not yet released
 ### Fixed
+- United Kingdom date format [#908]
 - Package `net.time4j.calendar.hindu` not exported for jigsaw [#906]
 
 ## [v5.6] published on 2020-05-31

diff --git a/base/src/main/java/net/time4j/calendar/bahai/package-info.java b/base/src/main/java/net/time4j/calendar/bahai/package-info.java
@@ -0,0 +1,7 @@
+/**
+ * <p>Support for the Badi calendar. </p>
+ */
+/*[deutsch]
+ * <p>Unterst&uuml;tzung des Zugriffs auf den Badi-Kalender. </p>
+ */
+package net.time4j.calendar.bahai;
diff --git a/base/src/main/resources/names/iso8601_en_GB.properties b/base/src/main/resources/names/iso8601_en_GB.properties
@@ -1,5 +1,10 @@
 
 # format patterns
+F(f)_d=EEEE, d MMMM y
+F(l)_d=d MMMM y
+F(m)_d=d MMM y
+F(s)_d=dd/MM/y
+
 F(alt)=HH:mm:ss 'o''clock'
 
 F(f)_t=HH:mm:ss zzzz