From 308cd6b91db513ad6425a7ed0904163cdf69423e Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 13 Nov 2025 16:33:08 +0000
Subject: [PATCH 1/2] Fixed #18189 - added option to pick the day the week
 starts on

---
 app/Http/Controllers/SettingsController.php   |  1 +
 ...5_11_13_160816_add_day_of_week_setting.php | 30 +++++++++++++++
 resources/lang/en-US/datepicker.php           |  2 +
 resources/views/layouts/default.blade.php     |  2 +-
 .../views/settings/localization.blade.php     | 37 +++++++++++++++++++
 5 files changed, 71 insertions(+), 1 deletion(-)
 create mode 100644 database/migrations/2025_11_13_160816_add_day_of_week_setting.php

diff --git a/app/Http/Controllers/SettingsController.php b/app/Http/Controllers/SettingsController.php
index dac6fb49695d..ffdb6cdbc807 100644
--- a/app/Http/Controllers/SettingsController.php
+++ b/app/Http/Controllers/SettingsController.php
@@ -589,6 +589,7 @@ public function postLocalization(StoreLocalizationSettings $request) : RedirectR
         $setting->time_display_format = $request->input('time_display_format');
         $setting->digit_separator = $request->input('digit_separator');
         $setting->name_display_format = $request->input('name_display_format');
+        $setting->week_start = $request->input('week_start', 0);
 
         if ($setting->save()) {
             return redirect()->route('settings.index')
diff --git a/database/migrations/2025_11_13_160816_add_day_of_week_setting.php b/database/migrations/2025_11_13_160816_add_day_of_week_setting.php
new file mode 100644
index 000000000000..b060c927d3b2
--- /dev/null
+++ b/database/migrations/2025_11_13_160816_add_day_of_week_setting.php
@@ -0,0 +1,30 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('settings', function (Blueprint $table) {
+            $table->tinyInteger('week_start')->after('locale')->nullable()->default(0);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('settings', function (Blueprint $table) {
+            if (Schema::hasColumn('settings', 'week_start')) {
+                $table->dropColumn('week_start');
+            }
+        });
+    }
+};
diff --git a/resources/lang/en-US/datepicker.php b/resources/lang/en-US/datepicker.php
index 1abad03a810d..8bfe5792fe23 100644
--- a/resources/lang/en-US/datepicker.php
+++ b/resources/lang/en-US/datepicker.php
@@ -13,6 +13,8 @@
     |
     */
 
+    'week_start_select' => 'Select Day of Week',
+    'week_start' => 'Day of the Week',
     'today' => 'Today',
     'clear' => 'Clear',
     'days' => [
diff --git a/resources/views/layouts/default.blade.php b/resources/views/layouts/default.blade.php
index 3ddaea4c19fa..d495e067ee04 100644
--- a/resources/views/layouts/default.blade.php
+++ b/resources/views/layouts/default.blade.php
@@ -1145,7 +1145,7 @@
                 today: "{{ trans('datepicker.today') }}",
                 clear: "{{ trans('datepicker.clear') }}",
                 format: "yyyy-mm-dd",
-                weekStart: 0
+                weekStart: {{ $snipeSettings->week_start ?? 0 }},
             };
 
             var clipboard = new ClipboardJS('.js-copy-link');
diff --git a/resources/views/settings/localization.blade.php b/resources/views/settings/localization.blade.php
index 0181f7a7ebb3..dc3e0ddc3aee 100644
--- a/resources/views/settings/localization.blade.php
+++ b/resources/views/settings/localization.blade.php
@@ -86,6 +86,43 @@
 
                         </div>
 
+                        <!-- Week Start format -->
+                        <div class="form-group {{ $errors->has('week_start') ? 'error' : '' }}">
+
+                            <label for="week_start" class="col-md-3 control-label">{{ trans('general.week_start') }}</label>
+
+                            <div class="col-md-5 col-xs-12">
+                                <select name="week_start" class="select2" style="width: 100%;" aria-label="week_start" data-placeholder="{{ trans('datepicker.select_day') }}">
+                                    <option value="0" @selected(old('week_start', $setting->week_start) == 0)>
+                                        {{ trans('datepicker.days.sunday') }}
+                                    </option>
+                                    <option value="1" @selected(old('week_start', $setting->week_start) == 1)>
+                                        {{ trans('datepicker.days.monday') }}
+                                    </option>
+                                    <option value="2" @selected(old('week_start', $setting->week_start) == 2)>
+                                        {{ trans('datepicker.days.tuesday') }}
+                                    </option>
+                                    <option value="3" @selected(old('week_start', $setting->week_start) == 3)>
+                                        {{ trans('datepicker.days.wednesday') }}
+                                    </option>
+                                    <option value="4" @selected(old('week_start', $setting->week_start) == 4)>
+                                        {{ trans('datepicker.days.thursday') }}
+                                    </option>
+                                    <option value="5" @selected(old('week_start', $setting->week_start) == 5)>
+                                        {{ trans('datepicker.days.friday') }}
+                                    </option>
+                                    <option value="6" @selected(old('week_start', $setting->week_start) == 6)>
+                                        {{ trans('datepicker.days.saturday') }}
+                                    </option>
+
+                                </select>
+
+                            </div>
+
+                            {!! $errors->first('week_start', '<div class="col-md-9 col-md-offset-3"><span class="alert-msg" aria-hidden="true">:message</span> </div>') !!}
+
+                        </div>
+
                         <!-- Currency -->
                         <div class="form-group {{ $errors->has('default_currency') ? 'error' : '' }}">
 

From 6b9d4941bef7d4c683d49997bbe6292c33c30ae3 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 13 Nov 2025 16:35:40 +0000
Subject: [PATCH 2/2] Language tweaks

---
 resources/lang/en-US/datepicker.php             | 2 +-
 resources/views/settings/localization.blade.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/lang/en-US/datepicker.php b/resources/lang/en-US/datepicker.php
index 8bfe5792fe23..5dee7274af9c 100644
--- a/resources/lang/en-US/datepicker.php
+++ b/resources/lang/en-US/datepicker.php
@@ -14,7 +14,7 @@
     */
 
     'week_start_select' => 'Select Day of Week',
-    'week_start' => 'Day of the Week',
+    'week_start' => 'Day the Week Starts On',
     'today' => 'Today',
     'clear' => 'Clear',
     'days' => [
diff --git a/resources/views/settings/localization.blade.php b/resources/views/settings/localization.blade.php
index dc3e0ddc3aee..cfd4c7efee7a 100644
--- a/resources/views/settings/localization.blade.php
+++ b/resources/views/settings/localization.blade.php
@@ -89,7 +89,7 @@
                         <!-- Week Start format -->
                         <div class="form-group {{ $errors->has('week_start') ? 'error' : '' }}">
 
-                            <label for="week_start" class="col-md-3 control-label">{{ trans('general.week_start') }}</label>
+                            <label for="week_start" class="col-md-3 control-label">{{ trans('datepicker.week_start') }}</label>
 
                             <div class="col-md-5 col-xs-12">
                                 <select name="week_start" class="select2" style="width: 100%;" aria-label="week_start" data-placeholder="{{ trans('datepicker.select_day') }}">