localization again

NyaomiDEV · Aug 5, 2024 · 4a06246 · 4a06246
1 parent 281d15b
commit 4a06246
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/modals/FrontingEntryEdit.vue b/src/modals/FrontingEntryEdit.vue
@@ -183,12 +183,12 @@
 
 			<MemberSelect :onlyOne="true" ref="memberSelectModal" />
 			<IonModal class="stack-modal" :keep-contents-mounted="true">
-				<IonDatetime id="startTime" v-model="startTime" :showDefaultButtons="true" :hourCycle="twelveHourClock ? 'h12' : 'h24'" :firstDayOfWeek="firstWeekOfDayIsSunday ? 0 : 1">
+				<IonDatetime id="startTime" v-model="startTime" :showDefaultButtons="true" :hourCycle="twelveHourClock ? 'h12' : 'h23'" :firstDayOfWeek="firstWeekOfDayIsSunday ? 0 : 1">
 					<span slot="title">{{ $t("options:frontHistory.edit.startTime") }}</span>
 				</IonDatetime>
 			</IonModal>
 			<IonModal class="stack-modal" :keep-contents-mounted="true">
-				<IonDatetime id="endTime" v-model="endTime" :showDefaultButtons="true" :hourCycle="twelveHourClock ? 'h12' : 'h24'" :firstDayOfWeek="firstWeekOfDayIsSunday ? 0 : 1">
+				<IonDatetime id="endTime" v-model="endTime" :showDefaultButtons="true" :hourCycle="twelveHourClock ? 'h12' : 'h23'" :firstDayOfWeek="firstWeekOfDayIsSunday ? 0 : 1">
 					<span slot="title">{{ $t("options:frontHistory.edit.endTime") }}</span>
 				</IonDatetime>
 			</IonModal>

diff --git a/src/views/options/FrontHistory.vue b/src/views/options/FrontHistory.vue
@@ -14,11 +14,14 @@
 
 	import calendarMD from "@material-design-icons/svg/outlined/calendar_month.svg";
 	import listMD from "@material-design-icons/svg/outlined/list.svg";
+	import { appConfig } from '../../lib/config';
 
 	const isIOS = inject<boolean>("isIOS");
 	const frontingEntryModal = ref();
 	const frontingEntry = ref();
 
+	const firstWeekOfDayIsSunday = appConfig.locale.firstWeekOfDayIsSunday;
+
 	const isCalendarView = ref(false);
 	const date = ref(dayjs().toISOString());
 
@@ -80,7 +83,7 @@
 
 		<IonContent>
 			<div class="container">
-				<IonDatetime presentation="date" @ionChange="(e) => date = e.detail.value as string" v-if="isCalendarView" />
+				<IonDatetime presentation="date" :firstDayOfWeek="firstWeekOfDayIsSunday ? 0 : 1" @ionChange="(e) => date = e.detail.value as string" v-if="isCalendarView" />
 			</div>
 
 			<IonList :inset="isIOS" v-if="isCalendarView">