Resolve merge conflict

Author: Nathan Reyes

CHANGELOG.md

@@ -1,4 +1,4 @@
-# v0.9.4
+# v0.9.5
 ## Improvements
 ### `v-calendar`
 * Adds support for 'day-content' slots. :tada: :tada: :tada: This adds a lot of flexibility by allowing you to provide your own day cells. The layout has also been improved to grow with your cells, so you can now build larger calendars to fill with your own content.
@@ -34,6 +34,11 @@ You can get access to the following slot props:
 | `attibutes` | Array | List of attributes for this day. |
 | `contentStyle` | Object | Content style to apply if you wish, derived from `themeStyles.dayContent` and other attributes. |
 
+# v0.9.4
+## Bug Fixes
+### `v-date-picker`
+* Fix bug where 'Do' format token was not supported. Closes #127.
+
 # v0.9.3
 ## Bug Fixes
 ### `v-calendar`

package.json

@@ -1,6 +1,6 @@
 {
   "name": "v-calendar",
-  "version": "0.9.3",
+  "version": "0.9.4",
   "description": "A clean and extendable plugin for building simple attributed calendars in Vue.js.",
   "keywords": [
     "vue",

src/utils/locales.js

@@ -94,6 +94,10 @@ const getDayNames = (locale, length) => {
   return getWeekdayDates({ utc: true }).map(d => dtf.format(d));
 };
 
+/* eslint-disable no-bitwise */
+const DoFn = d =>
+  `${d}${[null, 'st', 'nd', 'rd'][((d % 100) >> 3) ^ 1 && d % 10] || 'th'}`;
+
 export default locale => {
   const detectedLocale = new Intl.DateTimeFormat().resolvedOptions().locale;
   const searchLocales = [
@@ -124,5 +128,6 @@ export default locale => {
     dayNamesNarrow,
     monthNames,
     monthNamesShort,
+    DoFn,
   };
 };