fix: resolve conflicts

vueuse · Sep 21, 2022 · f9e0b88 · f9e0b88
1 parent d48a08b
commit f9e0b88
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/packages/shared/useDateFormat/index.ts b/packages/shared/useDateFormat/index.ts
@@ -44,8 +44,8 @@ export const formatDate = (date: Date, formatStr: string, options: UseDateFormat
     YYYY: () => years,
     M: () => month + 1,
     MM: () => `${month + 1}`.padStart(2, '0'),
-    MMM: () => date.toLocaleDateString(locales, { month: 'short' }),
-    MMMM: () => date.toLocaleDateString(locales, { month: 'long' }),
+    MMM: () => date.toLocaleDateString(options.locales, { month: 'short' }),
+    MMMM: () => date.toLocaleDateString(options.locales, { month: 'long' }),
     D: () => String(days),
     DD: () => `${days}`.padStart(2, '0'),
     H: () => String(hours),