resources/locales/en-GB/calendars.yml in twitter_cldr-6.11.5 vs resources/locales/en-GB/calendars.yml in twitter_cldr-6.12.0

- old
+ new

@@ -10,17 +10,17 @@ :EBhm: "E h:mm B" :EBhms: "E h:mm:ss B" :EHm: "E HH:mm" :EHms: "E HH:mm:ss" :Ed: "E d" - :Ehm: "E h:mm a" - :Ehms: "E h:mm:ss a" + :Ehm: "E h:mm a" + :Ehms: "E h:mm:ss a" :Gy: "y G" :GyMMM: "MMM y G" :GyMMMEd: "E, d MMM y G" :GyMMMd: "d MMM y G" - :GyMd: "d/M/y GGGGG" + :GyMd: "d/M/y G" :H: HH :Hm: "HH:mm" :Hms: "HH:mm:ss" :Hmsv: "HH:mm:ss v" :Hmv: "HH:mm v" @@ -32,15 +32,15 @@ :MMMMd: "d MMMM" :MMMd: "d MMM" :MMdd: dd/MM :Md: dd/MM :d: d - :h: "h a" - :hm: "h:mm a" - :hms: "h:mm:ss a" - :hmsv: "h:mm:ss a v" - :hmv: "h:mm a v" + :h: h a + :hm: "h:mm a" + :hms: "h:mm:ss a" + :hmsv: "h:mm:ss a v" + :hmv: "h:mm a v" :ms: "mm:ss" ? !ruby/symbol "y" : "y" :yM: MM/y :yMEd: "E, dd/MM/y" @@ -185,12 +185,12 @@ :pattern: "d MMM y" :short: :pattern: dd/MM/y :datetime: :full: - :pattern: "{{date}} 'at' {{time}}" + :pattern: "{{date}}, {{time}}" :long: - :pattern: "{{date}} 'at' {{time}}" + :pattern: "{{date}}, {{time}}" :medium: :pattern: "{{date}}, {{time}}" :short: :pattern: "{{date}}, {{time}}" :time: