From: PhiTux <redacted>
Date: Wed, 22 Oct 2025 14:09:32 +0000 (+0200)
Subject: added feature to pick monday/sunday as first-day-of-week
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=06f271515dbdcd7e0287a5fdf05168ffc326f8a4;p=DailyTxT.git

added feature to pick monday/sunday as first-day-of-week
---

diff --git a/README.md b/README.md
index fa65a70..11dba07 100644
--- a/README.md
+++ b/README.md
@@ -166,6 +166,10 @@ The old version 1 is moved to the [v1 branch](https://github.com/PhiTux/DailyTxT
 
 ### Newest Testing Versions:
 ```
+2.0.0-testing.4 (2025-10-22)
+- Fixed a bug, that showed wrong weekdays in the calendar
+- Added a feature to choose the first day of the week (Monday or Sunday) in the settings.
+
 2.0.0-testing.3 (2025-10-13)
 - Updated the migration process in the frontend. When migration fails on serverside, the user now gets notified.
 
diff --git a/backend/handlers/settings.go b/backend/handlers/settings.go
index 6aa3ebe..f1e3ad0 100644
--- a/backend/handlers/settings.go
+++ b/backend/handlers/settings.go
@@ -27,6 +27,7 @@ func GetDefaultSettings() map[string]any {
 		"checkForUpdates":            true,
 		"includeTestVersions":        false,
 		"requirePasswordOnPageLoad":  false,
+		"firstDayOfWeek":             "monday",
 	}
 }
 
diff --git a/frontend/src/lib/Datepicker.svelte b/frontend/src/lib/Datepicker.svelte
index 9403948..eac204e 100644
--- a/frontend/src/lib/Datepicker.svelte
+++ b/frontend/src/lib/Datepicker.svelte
@@ -1,6 +1,6 @@
 <script>
 	import { cal, selectedDate, readingDate } from '$lib/calendarStore.js';
-	import { readingMode } from '$lib/settingsStore.js';
+	import { readingMode, settings } from '$lib/settingsStore.js';
 	import { onMount } from 'svelte';
 	import { fly } from 'svelte/transition';
 	import * as bootstrap from 'bootstrap';
@@ -43,9 +43,16 @@
 		const lastDay = new Date(year, month + 1, 0);
 
 		let tempDays = [];
-		// monday is first day
-		let firstDayIndex = firstDay.getDay() - 1;
-		if (firstDayIndex === -1) firstDayIndex = 6; // sunday gets 6
+		let firstDayIndex;
+
+		if ($settings.firstDayOfWeek === 'sunday') {
+			// sunday is first day
+			firstDayIndex = firstDay.getDay();
+		} else {
+			// monday is first day
+			firstDayIndex = firstDay.getDay() - 1;
+			if (firstDayIndex === -1) firstDayIndex = 6; // sunday gets 6
+		}
 
 		for (let i = 0; i < firstDayIndex; i++) {
 			tempDays.push(null); // Fill empty slots before the first day
@@ -136,16 +143,19 @@
 		}
 	};
 
-	// weekdays
-	const weekDays = [
-		$t('calendar.day_short.monday'),
-		$t('calendar.day_short.tuesday'),
-		$t('calendar.day_short.wednesday'),
-		$t('calendar.day_short.thursday'),
-		$t('calendar.day_short.friday'),
-		$t('calendar.day_short.saturday'),
-		$t('calendar.day_short.sunday')
-	];
+	// weekdays (reordered when first day of week is Sunday)
+	const weekDays = $derived.by(() => {
+		const base = [
+			$t('calendar.day_short.monday'),
+			$t('calendar.day_short.tuesday'),
+			$t('calendar.day_short.wednesday'),
+			$t('calendar.day_short.thursday'),
+			$t('calendar.day_short.friday'),
+			$t('calendar.day_short.saturday'),
+			$t('calendar.day_short.sunday')
+		];
+		return $settings.firstDayOfWeek === 'sunday' ? [base[6], ...base.slice(0, 6)] : base;
+	});
 
 	// --- Swipe Navigation (month) ---
 	let swipeActive = false;
diff --git a/frontend/src/routes/(authed)/+layout.svelte b/frontend/src/routes/(authed)/+layout.svelte
index 91dfe8f..03ad568 100644
--- a/frontend/src/routes/(authed)/+layout.svelte
+++ b/frontend/src/routes/(authed)/+layout.svelte
@@ -1649,6 +1649,20 @@
 										</div>
 									</div>
 
+									<div id="FirstDayOfWeek">
+										{#if $tempSettings.firstDayOfWeek !== $settings.firstDayOfWeek}
+											{@render unsavedChanges()}
+										{/if}
+										<h5>{$t('settings.first_day_of_week')}</h5>
+										<div class="form-text mt-2">
+											{$t('settings.first_day_of_week.help_text')}
+										</div>
+										<select class="form-select w-auto" bind:value={$tempSettings.firstDayOfWeek}>
+											<option value="sunday">{$t('weekdays.sunday')}</option>
+											<option value="monday">{$t('weekdays.monday')}</option>
+										</select>
+									</div>
+
 									<div id="aLookBack">
 										{#if $tempSettings.useALookBack !== $settings.useALookBack || JSON.stringify(aLookBackYears
 													.trim()