From 5afe62529053addfb0ebd49f0398146d841efd49 Mon Sep 17 00:00:00 2001 From: Methapon2001 <61303214+Methapon2001@users.noreply.github.com> Date: Mon, 16 Dec 2024 16:27:09 +0700 Subject: [PATCH] refactor: date time util function default --- src/utils/datetime.ts | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/utils/datetime.ts b/src/utils/datetime.ts index 9dd35dd3..098255c2 100644 --- a/src/utils/datetime.ts +++ b/src/utils/datetime.ts @@ -2,6 +2,8 @@ import moment from 'moment'; import 'moment/dist/locale/th'; import 'moment/dist/locale/en-gb'; import { useI18n } from 'vue-i18n'; +import { i18n } from 'src/boot/i18n'; +import { Lang } from './ui'; moment.locale('en-gb'); @@ -29,9 +31,15 @@ export function dateFormatJS(opts: { ), ); - let formattedDate = new Intl.DateTimeFormat(opts.locale || 'en-US', { - day: opts.dayStyle, - month: opts.monthStyle, + const { locale } = i18n.global; + + if (!opts.locale) { + opts.locale = locale.value === Lang.Thai ? 'th-Th' : 'en-US'; + } + + let formattedDate = new Intl.DateTimeFormat(opts.locale, { + day: opts.dayStyle || 'numeric', + month: opts.monthStyle || 'short', timeStyle: opts.timeStyle, year: 'numeric', }).format(dateFormat);