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

- old
+ new

@@ -5,22 +5,22 @@ :additional_formats: :Bh: "h B" :Bhm: "h:mm B" :Bhms: "h:mm:ss B" :E: ccc - :EBhm: "E, h:mm B" - :EBhms: "E, h:mm:ss B" + :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, MMM d, y G" :GyMMMd: "MMM d, y G" - :GyMd: "M/d/y GGGGG" + :GyMd: "y-MM-dd G" :H: HH :Hm: "HH:mm" :Hms: "HH:mm:ss" :Hmsv: "HH:mm:ss v" :Hmv: "HH:mm v" @@ -32,19 +32,19 @@ :MMMMd: "MMMM d" :MMMd: "MMM d" :MMdd: MM-dd :Md: MM-dd :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 + :yM: y-MM :yMEd: "E, y-MM-dd" :yMMM: "MMM y" :yMMMEd: "E, MMM d, y" :yMMMM: "MMMM y" :yMMMd: "MMM d, y" @@ -122,11 +122,11 @@ :eras: :abbr: 0: BCE 1: CE :name: - 0: "Before Common Era" + 0: "before Common Era" 1: "Common Era" :narrow: 0: B 1: A :fields: @@ -141,11 +141,11 @@ :dayperiod-short: a.m./p.m. :era: era :era-narrow: era :era-short: era :hour: hour - :hour-narrow: hr. + :hour-narrow: hr :hour-short: hr :minute: minute :minute-narrow: min :minute-short: min :month: month @@ -153,11 +153,11 @@ :month-short: mo :quarter: quarter :quarter-narrow: qtr :quarter-short: qtr :second: second - :second-narrow: sec. + :second-narrow: sec :second-short: sec :week: week :week-narrow: wk :week-short: wk :weekOfMonth: "week of month" @@ -168,11 +168,11 @@ :weekday-short: "day of wk" :weekdayOfMonth: "weekday of the month" :weekdayOfMonth-narrow: "wkday of mo" :weekdayOfMonth-short: "wkday of mo" :year: year - :year-narrow: yr. + :year-narrow: yr :year-short: yr :zone: "time zone" :zone-narrow: zone :zone-short: zone :formats: @@ -185,26 +185,26 @@ :pattern: "MMM d, y" :short: :pattern: d/M/yy :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: :full: - :pattern: "h:mm:ss a zzzz" + :pattern: "h:mm:ss a zzzz" :long: - :pattern: "h:mm:ss a z" + :pattern: "h:mm:ss a z" :medium: - :pattern: "h:mm:ss a" + :pattern: "h:mm:ss a" :short: - :pattern: "h:mm a" + :pattern: "h:mm a" :months: :format: :abbreviated: 1: Jan 10: Oct @@ -215,11 +215,11 @@ 4: Apr 5: May 6: Jun 7: Jul 8: Aug - 9: Sept + 9: Sep :narrow: 1: J 10: O 11: "N" 12: D @@ -255,10 +255,10 @@ 4: Apr 5: May 6: Jun 7: Jul 8: Aug - 9: Sept + 9: Sep :narrow: 1: J 10: O 11: "N" 12: D