From e41b98864f5cd243d4c072419c83c9b6d51bf68b Mon Sep 17 00:00:00 2001
From: Grigory Frolov <2168057+gynsus@users.noreply.github.com>
Date: Fri, 21 Aug 2026 22:24:54 +0300
Subject: [PATCH 1/4] feat: workspace timezone setting for calendar and post
 dates
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

A nullable IANA timezone on the workspace (Settings → Workspace). When
set, every date the app renders or schedules — the calendar, the post
lists (all/scheduled/posted/drafts) and the schedule picker — uses it via
the shared date module's getUserTimezone(); empty keeps the pre-setting
behavior (the viewer's browser timezone). Shared through the auth
Inertia props so the whole team sees the same wall-clock times.
---
 .../App/Workspace/UpdateWorkspaceRequest.php  |  1 +
 .../AuthWorkspaceResource.php                 |  1 +
 app/Models/Workspace.php                      |  1 +
 ...20000_add_timezone_to_workspaces_table.php | 26 ++++++++++++++++
 lang/ar/settings.php                          |  3 ++
 lang/de/settings.php                          |  3 ++
 lang/el/settings.php                          |  3 ++
 lang/en/settings.php                          |  3 ++
 lang/es/settings.php                          |  3 ++
 lang/fr/settings.php                          |  3 ++
 lang/it/settings.php                          |  3 ++
 lang/ja/settings.php                          |  3 ++
 lang/ko/settings.php                          |  3 ++
 lang/nl/settings.php                          |  3 ++
 lang/pl/settings.php                          |  3 ++
 lang/pt-BR/settings.php                       |  3 ++
 lang/ru/settings.php                          |  3 ++
 lang/tr/settings.php                          |  3 ++
 lang/uk/settings.php                          |  3 ++
 lang/zh/settings.php                          |  3 ++
 .../js/components/settings/WorkspaceTab.vue   | 25 ++++++++++++++++
 resources/js/date.ts                          |  8 +++++
 .../js/pages/settings/workspace/Workspace.vue |  1 +
 tests/Feature/WorkspaceControllerTest.php     | 30 +++++++++++++++++++
 24 files changed, 141 insertions(+)
 create mode 100644 database/migrations/2026_08_20_120000_add_timezone_to_workspaces_table.php

diff --git a/app/Http/Requests/App/Workspace/UpdateWorkspaceRequest.php b/app/Http/Requests/App/Workspace/UpdateWorkspaceRequest.php
index ad8add4ee..b8e17e970 100644
--- a/app/Http/Requests/App/Workspace/UpdateWorkspaceRequest.php
+++ b/app/Http/Requests/App/Workspace/UpdateWorkspaceRequest.php
@@ -35,6 +35,7 @@ public function rules(): array
             'image_style' => ['sometimes', 'required', 'string', Rule::in(ImageStyle::values())],
             'content_language' => ['sometimes', 'string', Rule::in(ContentLanguage::values())],
             'logo_url' => ['nullable', 'url', 'max:1024'],
+            'timezone' => ['sometimes', 'nullable', 'string', 'timezone:all'],
         ];
     }
 }
diff --git a/app/Http/Resources/App/HandleInertiaRequests/AuthWorkspaceResource.php b/app/Http/Resources/App/HandleInertiaRequests/AuthWorkspaceResource.php
index 4413b15ac..d51da01f4 100644
--- a/app/Http/Resources/App/HandleInertiaRequests/AuthWorkspaceResource.php
+++ b/app/Http/Resources/App/HandleInertiaRequests/AuthWorkspaceResource.php
@@ -18,6 +18,7 @@ public static function make(Workspace $workspace, ?User $user = null): array
             'id' => $workspace->id,
             'name' => $workspace->name,
             'logo_url' => $workspace->logo_url,
+            'timezone' => $workspace->timezone,
             'created_at' => $workspace->created_at->toIso8601String(),
             'role' => $user ? self::resolveRole($workspace, $user) : null,
         ];
diff --git a/app/Models/Workspace.php b/app/Models/Workspace.php
index aba4944ad..06f4f5d1f 100644
--- a/app/Models/Workspace.php
+++ b/app/Models/Workspace.php
@@ -33,6 +33,7 @@ class Workspace extends Model
         'brand_font',
         'image_style',
         'content_language',
+        'timezone',
     ];
 
     protected function casts(): array
diff --git a/database/migrations/2026_08_20_120000_add_timezone_to_workspaces_table.php b/database/migrations/2026_08_20_120000_add_timezone_to_workspaces_table.php
new file mode 100644
index 000000000..f15b8e9ae
--- /dev/null
+++ b/database/migrations/2026_08_20_120000_add_timezone_to_workspaces_table.php
@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    public function up(): void
+    {
+        Schema::table('workspaces', function (Blueprint $table) {
+            // IANA identifier (e.g. "Australia/Brisbane"). Null = the viewer's
+            // browser timezone, the pre-setting behavior.
+            $table->string('timezone', 64)->nullable()->after('content_language');
+        });
+    }
+
+    public function down(): void
+    {
+        Schema::table('workspaces', function (Blueprint $table) {
+            $table->dropColumn('timezone');
+        });
+    }
+};
diff --git a/lang/ar/settings.php b/lang/ar/settings.php
index d3dc72c88..044ea3fb2 100644
--- a/lang/ar/settings.php
+++ b/lang/ar/settings.php
@@ -52,6 +52,9 @@
         'avatar' => 'الصورة الرمزية',
         'name' => 'الاسم',
         'name_placeholder' => 'الاسم الكامل',
+        'timezone' => 'المنطقة الزمنية',
+        'timezone_auto' => 'تلقائي — منطقة المتصفح (:tz)',
+        'timezone_description' => 'يُعرض التقويم والجدولة وتواريخ المنشورات بهذه المنطقة الزمنية لجميع أعضاء مساحة العمل.',
         'email' => 'البريد الإلكتروني',
         'email_placeholder' => 'البريد الإلكتروني',
         'email_unverified' => 'لم يتم تأكيد بريدك الإلكتروني.',
diff --git a/lang/de/settings.php b/lang/de/settings.php
index e1bfc9991..768ac1c26 100644
--- a/lang/de/settings.php
+++ b/lang/de/settings.php
@@ -54,6 +54,9 @@
         'avatar' => 'Avatar',
         'name' => 'Name',
         'name_placeholder' => 'Vollständiger Name',
+        'timezone' => 'Zeitzone',
+        'timezone_auto' => 'Auto — Browser-Zeitzone (:tz)',
+        'timezone_description' => 'Kalender, Zeitplan und Beitragsdaten werden für alle im Workspace in dieser Zeitzone angezeigt.',
         'email' => 'E-Mail-Adresse',
         'email_placeholder' => 'E-Mail-Adresse',
         'email_unverified' => 'Deine E-Mail-Adresse ist nicht bestätigt.',
diff --git a/lang/el/settings.php b/lang/el/settings.php
index 3ce5941f8..74d1fb5ed 100644
--- a/lang/el/settings.php
+++ b/lang/el/settings.php
@@ -52,6 +52,9 @@
         'avatar' => 'Άβαταρ',
         'name' => 'Όνομα',
         'name_placeholder' => 'Ονοματεπώνυμο',
+        'timezone' => 'Ζώνη ώρας',
+        'timezone_auto' => 'Αυτόματα — ζώνη του προγράμματος περιήγησης (:tz)',
+        'timezone_description' => 'Το ημερολόγιο, ο προγραμματισμός και οι ημερομηνίες αναρτήσεων εμφανίζονται σε αυτήν τη ζώνη για όλο το workspace.',
         'email' => 'Διεύθυνση email',
         'email_placeholder' => 'Διεύθυνση email',
         'email_unverified' => 'Η διεύθυνση email σας δεν έχει επαληθευτεί.',
diff --git a/lang/en/settings.php b/lang/en/settings.php
index b4b7dc806..7b3e1831c 100644
--- a/lang/en/settings.php
+++ b/lang/en/settings.php
@@ -52,6 +52,9 @@
         'avatar' => 'Avatar',
         'name' => 'Name',
         'name_placeholder' => 'Full name',
+        'timezone' => 'Timezone',
+        'timezone_auto' => 'Auto — browser timezone (:tz)',
+        'timezone_description' => 'Calendar, schedule and post dates are shown in this timezone for everyone in the workspace.',
         'email' => 'Email address',
         'email_placeholder' => 'Email address',
         'email_unverified' => 'Your email address is unverified.',
diff --git a/lang/es/settings.php b/lang/es/settings.php
index 44310f2b3..aea1870ce 100644
--- a/lang/es/settings.php
+++ b/lang/es/settings.php
@@ -52,6 +52,9 @@
         'avatar' => 'Avatar',
         'name' => 'Nombre',
         'name_placeholder' => 'Nombre completo',
+        'timezone' => 'Zona horaria',
+        'timezone_auto' => 'Auto — zona del navegador (:tz)',
+        'timezone_description' => 'El calendario, la programación y las fechas de publicaciones se muestran en esta zona para todo el workspace.',
         'email' => 'Correo electrónico',
         'email_placeholder' => 'Correo electrónico',
         'email_unverified' => 'Tu correo electrónico no ha sido verificado.',
diff --git a/lang/fr/settings.php b/lang/fr/settings.php
index 2cede7c15..44d71d3db 100644
--- a/lang/fr/settings.php
+++ b/lang/fr/settings.php
@@ -52,6 +52,9 @@
         'avatar' => 'Avatar',
         'name' => 'Nom',
         'name_placeholder' => 'Nom complet',
+        'timezone' => 'Fuseau horaire',
+        'timezone_auto' => 'Auto — fuseau du navigateur (:tz)',
+        'timezone_description' => 'Le calendrier, la planification et les dates des publications s’affichent dans ce fuseau pour tout le workspace.',
         'email' => 'Adresse e-mail',
         'email_placeholder' => 'Adresse e-mail',
         'email_unverified' => 'Votre adresse e-mail n\'est pas vérifiée.',
diff --git a/lang/it/settings.php b/lang/it/settings.php
index 08f8e3417..2693108f0 100644
--- a/lang/it/settings.php
+++ b/lang/it/settings.php
@@ -52,6 +52,9 @@
         'avatar' => 'Avatar',
         'name' => 'Nome',
         'name_placeholder' => 'Nome completo',
+        'timezone' => 'Fuso orario',
+        'timezone_auto' => 'Auto — fuso del browser (:tz)',
+        'timezone_description' => 'Calendario, programmazione e date dei post vengono mostrati in questo fuso per tutto il workspace.',
         'email' => 'Indirizzo email',
         'email_placeholder' => 'Indirizzo email',
         'email_unverified' => 'Il tuo indirizzo email non è verificato.',
diff --git a/lang/ja/settings.php b/lang/ja/settings.php
index 94e76beb7..31701a4f6 100644
--- a/lang/ja/settings.php
+++ b/lang/ja/settings.php
@@ -52,6 +52,9 @@
         'avatar' => 'アバター',
         'name' => '名前',
         'name_placeholder' => '氏名',
+        'timezone' => 'タイムゾーン',
+        'timezone_auto' => '自動 — ブラウザのタイムゾーン (:tz)',
+        'timezone_description' => 'カレンダー、スケジュール、投稿日時はワークスペース全員にこのタイムゾーンで表示されます。',
         'email' => 'メールアドレス',
         'email_placeholder' => 'メールアドレス',
         'email_unverified' => 'メールアドレスが未確認です。',
diff --git a/lang/ko/settings.php b/lang/ko/settings.php
index 77fb6569b..feabb001f 100644
--- a/lang/ko/settings.php
+++ b/lang/ko/settings.php
@@ -52,6 +52,9 @@
         'avatar' => '아바타',
         'name' => '이름',
         'name_placeholder' => '전체 이름',
+        'timezone' => '시간대',
+        'timezone_auto' => '자동 — 브라우저 시간대 (:tz)',
+        'timezone_description' => '캘린더, 일정, 게시물 날짜가 워크스페이스 전체에 이 시간대로 표시됩니다.',
         'email' => '이메일 주소',
         'email_placeholder' => '이메일 주소',
         'email_unverified' => '이메일 주소가 인증되지 않았습니다.',
diff --git a/lang/nl/settings.php b/lang/nl/settings.php
index 46c1eb79d..67f3aaf4d 100644
--- a/lang/nl/settings.php
+++ b/lang/nl/settings.php
@@ -52,6 +52,9 @@
         'avatar' => 'Avatar',
         'name' => 'Naam',
         'name_placeholder' => 'Volledige naam',
+        'timezone' => 'Tijdzone',
+        'timezone_auto' => 'Auto — browsertijdzone (:tz)',
+        'timezone_description' => 'Kalender, planning en berichtdatums worden voor iedereen in de workspace in deze tijdzone getoond.',
         'email' => 'E-mailadres',
         'email_placeholder' => 'E-mailadres',
         'email_unverified' => 'Je e-mailadres is niet geverifieerd.',
diff --git a/lang/pl/settings.php b/lang/pl/settings.php
index 89520348f..e460940ff 100644
--- a/lang/pl/settings.php
+++ b/lang/pl/settings.php
@@ -52,6 +52,9 @@
         'avatar' => 'Awatar',
         'name' => 'Imię i nazwisko',
         'name_placeholder' => 'Imię i nazwisko',
+        'timezone' => 'Strefa czasowa',
+        'timezone_auto' => 'Auto — strefa przeglądarki (:tz)',
+        'timezone_description' => 'Kalendarz, harmonogram i daty postów są pokazywane w tej strefie wszystkim w workspace.',
         'email' => 'Adres e-mail',
         'email_placeholder' => 'Adres e-mail',
         'email_unverified' => 'Twój adres e-mail nie został zweryfikowany.',
diff --git a/lang/pt-BR/settings.php b/lang/pt-BR/settings.php
index 1ec2a7936..a40ca25b8 100644
--- a/lang/pt-BR/settings.php
+++ b/lang/pt-BR/settings.php
@@ -52,6 +52,9 @@
         'avatar' => 'Avatar',
         'name' => 'Nome',
         'name_placeholder' => 'Nome completo',
+        'timezone' => 'Fuso horário',
+        'timezone_auto' => 'Auto — fuso do navegador (:tz)',
+        'timezone_description' => 'Calendário, agendamento e datas das publicações são exibidos neste fuso para todo o workspace.',
         'email' => 'Endereço de e-mail',
         'email_placeholder' => 'Endereço de e-mail',
         'email_unverified' => 'Seu endereço de e-mail não foi verificado.',
diff --git a/lang/ru/settings.php b/lang/ru/settings.php
index 79cf9d15f..3ab2a1d9b 100644
--- a/lang/ru/settings.php
+++ b/lang/ru/settings.php
@@ -52,6 +52,9 @@
         'avatar' => 'Аватар',
         'name' => 'Имя',
         'name_placeholder' => 'Полное имя',
+        'timezone' => 'Часовой пояс',
+        'timezone_auto' => 'Авто — часовой пояс браузера (:tz)',
+        'timezone_description' => 'Календарь, расписание и даты постов показываются в этом поясе всем участникам воркспейса.',
         'email' => 'Адрес email',
         'email_placeholder' => 'Адрес email',
         'email_unverified' => 'Ваш адрес email не подтверждён.',
diff --git a/lang/tr/settings.php b/lang/tr/settings.php
index f2852da05..f7d099ae5 100644
--- a/lang/tr/settings.php
+++ b/lang/tr/settings.php
@@ -54,6 +54,9 @@
         'avatar' => 'Avatar',
         'name' => 'Ad',
         'name_placeholder' => 'Ad soyad',
+        'timezone' => 'Saat dilimi',
+        'timezone_auto' => 'Otomatik — tarayıcı saat dilimi (:tz)',
+        'timezone_description' => 'Takvim, plan ve gönderi tarihleri çalışma alanındaki herkese bu dilimde gösterilir.',
         'email' => 'E-posta adresi',
         'email_placeholder' => 'E-posta adresi',
         'email_unverified' => 'E-posta adresiniz doğrulanmadı.',
diff --git a/lang/uk/settings.php b/lang/uk/settings.php
index b53ab183b..22b181e0b 100644
--- a/lang/uk/settings.php
+++ b/lang/uk/settings.php
@@ -52,6 +52,9 @@
         'avatar' => 'Аватар',
         'name' => 'Ім’я',
         'name_placeholder' => 'Повне ім’я',
+        'timezone' => 'Часовий пояс',
+        'timezone_auto' => 'Авто — часовий пояс браузера (:tz)',
+        'timezone_description' => 'Календар, розклад і дати постів показуються в цьому поясі всім учасникам воркспейсу.',
         'email' => 'Адреса email',
         'email_placeholder' => 'Адреса email',
         'email_unverified' => 'Вашу адресу email не підтверджено.',
diff --git a/lang/zh/settings.php b/lang/zh/settings.php
index e830106c5..6ca50e4f9 100644
--- a/lang/zh/settings.php
+++ b/lang/zh/settings.php
@@ -52,6 +52,9 @@
         'avatar' => '头像',
         'name' => '姓名',
         'name_placeholder' => '全名',
+        'timezone' => '时区',
+        'timezone_auto' => '自动 — 浏览器时区 (:tz)',
+        'timezone_description' => '日历、排期和帖子日期将以此时区向工作区所有成员显示。',
         'email' => '邮箱地址',
         'email_placeholder' => '邮箱地址',
         'email_unverified' => '你的邮箱地址尚未验证。',
diff --git a/resources/js/components/settings/WorkspaceTab.vue b/resources/js/components/settings/WorkspaceTab.vue
index 100fdc5c1..ba09d4fa0 100644
--- a/resources/js/components/settings/WorkspaceTab.vue
+++ b/resources/js/components/settings/WorkspaceTab.vue
@@ -18,6 +18,7 @@ interface Workspace {
     name: string;
     has_logo: boolean;
     logo_url: string | null;
+    timezone?: string | null;
 }
 
 defineProps<{
@@ -27,6 +28,16 @@ defineProps<{
 }>();
 
 const { canManageBilling } = useWorkspaceRole();
+
+const browserTimezone = Intl.DateTimeFormat().resolvedOptions().timeZone;
+
+const timezones: string[] = (() => {
+    try {
+        return (Intl as any).supportedValuesOf('timeZone') as string[];
+    } catch {
+        return [browserTimezone];
+    }
+})();
 </script>
 
 <template>
@@ -70,6 +81,20 @@ const { canManageBilling } = useWorkspaceRole();
                     <InputError :message="errors.name" />
                 </div>
 
+                <div class="grid gap-2">
+                    <Label for="timezone">{{ $t('settings.workspace.timezone') }}</Label>
+                    <select
+                        id="timezone"
+                        name="timezone"
+                        class="border-input h-9 w-full rounded-md border-2 bg-transparent px-3 py-1 text-sm shadow-2xs"
+                    >
+                        <option value="" :selected="!workspace.timezone">{{ $t('settings.workspace.timezone_auto', { tz: browserTimezone }) }}</option>
+                        <option v-for="tz in timezones" :key="tz" :value="tz" :selected="workspace.timezone === tz">{{ tz }}</option>
+                    </select>
+                    <p class="text-xs text-foreground/60">{{ $t('settings.workspace.timezone_description') }}</p>
+                    <InputError :message="errors.timezone" />
+                </div>
+
                 <Button :disabled="processing">{{ $t('settings.workspace.save') }}</Button>
             </Form>
         </div>
diff --git a/resources/js/date.ts b/resources/js/date.ts
index ba72480e0..c5075741e 100644
--- a/resources/js/date.ts
+++ b/resources/js/date.ts
@@ -1,10 +1,18 @@
 import dayjs from '@/dayjs';
+import { usePage } from '@inertiajs/vue3';
 
 /**
  * Obtém o timezone do usuário
  * Tenta pegar do Inertia page props primeiro, senão usa o timezone do browser
  */
 function getUserTimezone(): string {
+    try {
+        const tz = (usePage().props as any)?.auth?.currentWorkspace?.timezone;
+        if (tz) return tz as string;
+    } catch {
+        // Вне контекста Inertia (например, в тестах) — падаем на браузерную.
+    }
+
     return Intl.DateTimeFormat().resolvedOptions().timeZone;
 }
 
diff --git a/resources/js/pages/settings/workspace/Workspace.vue b/resources/js/pages/settings/workspace/Workspace.vue
index e0ffb9c1c..5542417b1 100644
--- a/resources/js/pages/settings/workspace/Workspace.vue
+++ b/resources/js/pages/settings/workspace/Workspace.vue
@@ -16,6 +16,7 @@ interface Workspace {
     brand_description: string | null;
     brand_voice_traits: string[] | null;
     content_language: string;
+    timezone?: string | null;
 }
 
 defineProps<{
diff --git a/tests/Feature/WorkspaceControllerTest.php b/tests/Feature/WorkspaceControllerTest.php
index 26542a832..85a47236f 100644
--- a/tests/Feature/WorkspaceControllerTest.php
+++ b/tests/Feature/WorkspaceControllerTest.php
@@ -335,7 +335,37 @@
     $response->assertRedirect(route('login'));
 });
 
+test('update workspace settings persists the workspace timezone', function () {
+    $this->actingAs($this->user)
+        ->put(route('app.workspace.settings.update'), [
+            'name' => $this->workspace->name,
+            'timezone' => 'Australia/Brisbane',
+        ]);
+
+    expect($this->workspace->fresh()->timezone)->toBe('Australia/Brisbane');
+
+    // Пустое значение возвращает режим «авто» (браузерная таймзона).
+    $this->actingAs($this->user)
+        ->put(route('app.workspace.settings.update'), [
+            'name' => $this->workspace->name,
+            'timezone' => '',
+        ]);
+
+    expect($this->workspace->fresh()->timezone)->toBeNull();
+});
+
+test('update workspace settings rejects an invalid timezone', function () {
+    $response = $this->actingAs($this->user)
+        ->put(route('app.workspace.settings.update'), [
+            'name' => $this->workspace->name,
+            'timezone' => 'Mars/Olympus_Mons',
+        ]);
+
+    $response->assertSessionHasErrors('timezone');
+});
+
 test('update workspace settings updates workspace and redirects back', function () {
+
     $response = $this->actingAs($this->user)
         ->from(route('app.workspace.brand'))
         ->put(route('app.workspace.settings.update'), [

From f9ac52686f7db0fdd509d2d2c94a9520892c4afe Mon Sep 17 00:00:00 2001
From: Grigory Frolov <2168057+gynsus@users.noreply.github.com>
Date: Fri, 21 Aug 2026 22:42:52 +0300
Subject: [PATCH 2/4] fix: bucket the calendar by the workspace timezone

The calendar grouped posts into days by their UTC date (the $tz seam was
hardcoded to 'UTC'), so with a workspace timezone set an evening post
still appeared on the previous/next day. Day navigation, the query range
and the day keys now all use the workspace timezone; without the setting
the behavior is unchanged.
---
 app/Http/Controllers/App/PostController.php |  5 ++++-
 tests/Feature/PostControllerTest.php        | 23 +++++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/app/Http/Controllers/App/PostController.php b/app/Http/Controllers/App/PostController.php
index 9b0702eb8..5e9c8a283 100644
--- a/app/Http/Controllers/App/PostController.php
+++ b/app/Http/Controllers/App/PostController.php
@@ -94,7 +94,10 @@ public function calendar(Request $request): Response|RedirectResponse
 
         $this->authorize('view', $workspace);
 
-        $tz = 'UTC';
+        // Дни календаря считаются в таймзоне воркспейса: пост на 23:00 по
+        // Брисбену должен лежать в брисбенском дне, а не в UTC-шном. Без
+        // настройки — прежнее поведение (UTC).
+        $tz = $workspace->timezone ?: 'UTC';
         $view = $request->input('view', 'week');
 
         $currentDay = $request->input('day')
diff --git a/tests/Feature/PostControllerTest.php b/tests/Feature/PostControllerTest.php
index e68ea13e5..5460fad7f 100644
--- a/tests/Feature/PostControllerTest.php
+++ b/tests/Feature/PostControllerTest.php
@@ -170,7 +170,30 @@
     );
 });
 
+test('calendar buckets posts by the workspace timezone', function () {
+    $this->workspace->update(['timezone' => 'Australia/Brisbane']);
+
+    // 20:00 UTC во вторник = 06:00 среды по Брисбену (UTC+10): пост должен
+    // лежать в среде, а не во вторнике.
+    $scheduledAt = now('Australia/Brisbane')->startOfWeek()->addDays(2)->setTime(6, 0);
+
+    Post::factory()->create([
+        'workspace_id' => $this->workspace->id,
+        'user_id' => $this->user->id,
+        'status' => \App\Enums\Post\Status::Scheduled,
+        'scheduled_at' => $scheduledAt->copy()->utc(),
+    ]);
+
+    $response = $this->actingAs($this->user)->get(route('app.calendar', ['view' => 'week', 'week' => $scheduledAt->format('Y-m-d')]));
+
+    $response->assertOk();
+    $response->assertInertia(fn ($page) => $page
+        ->has('posts.'.$scheduledAt->format('Y-m-d'))
+    );
+});
+
 test('calendar supports month view', function () {
+
     $response = $this->actingAs($this->user)->get(route('app.calendar', ['view' => 'month']));
 
     $response->assertOk();

From 8c22fe3d45fa383e948df2f52d8e61489ff288d7 Mon Sep 17 00:00:00 2001
From: Grigory Frolov <2168057+gynsus@users.noreply.github.com>
Date: Fri, 21 Aug 2026 23:00:35 +0300
Subject: [PATCH 3/4] feat: workspace date & time format presets
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

A datetime_format preset on the workspace (Settings → Workspace, next to
the timezone): 24h/12h day-month, dotted and slashed variants, or auto —
the locale defaults, the pre-setting behavior. The shared date module
applies the preset to formatDate/formatTime/formatDateTime, so the
calendar and every post list render one consistent format. The posts
table also falls back to updated_at for drafts instead of an em dash.
---
 .../App/Workspace/UpdateWorkspaceRequest.php  |  1 +
 .../AuthWorkspaceResource.php                 |  1 +
 app/Models/Workspace.php                      |  1 +
 ...dd_datetime_format_to_workspaces_table.php | 26 +++++++++++++++++
 lang/ar/settings.php                          |  3 ++
 lang/de/settings.php                          |  3 ++
 lang/el/settings.php                          |  3 ++
 lang/en/settings.php                          |  3 ++
 lang/es/settings.php                          |  3 ++
 lang/fr/settings.php                          |  3 ++
 lang/it/settings.php                          |  3 ++
 lang/ja/settings.php                          |  3 ++
 lang/ko/settings.php                          |  3 ++
 lang/nl/settings.php                          |  3 ++
 lang/pl/settings.php                          |  3 ++
 lang/pt-BR/settings.php                       |  3 ++
 lang/ru/settings.php                          |  3 ++
 lang/tr/settings.php                          |  3 ++
 lang/uk/settings.php                          |  3 ++
 lang/zh/settings.php                          |  3 ++
 .../js/components/settings/WorkspaceTab.vue   | 22 +++++++++++++++
 resources/js/date.ts                          | 28 +++++++++++++++++--
 resources/js/pages/posts/Index.vue            |  3 +-
 tests/Feature/WorkspaceControllerTest.php     | 19 +++++++++++++
 24 files changed, 145 insertions(+), 4 deletions(-)
 create mode 100644 database/migrations/2026_08_20_140000_add_datetime_format_to_workspaces_table.php

diff --git a/app/Http/Requests/App/Workspace/UpdateWorkspaceRequest.php b/app/Http/Requests/App/Workspace/UpdateWorkspaceRequest.php
index b8e17e970..6ba1ae8b3 100644
--- a/app/Http/Requests/App/Workspace/UpdateWorkspaceRequest.php
+++ b/app/Http/Requests/App/Workspace/UpdateWorkspaceRequest.php
@@ -36,6 +36,7 @@ public function rules(): array
             'content_language' => ['sometimes', 'string', Rule::in(ContentLanguage::values())],
             'logo_url' => ['nullable', 'url', 'max:1024'],
             'timezone' => ['sometimes', 'nullable', 'string', 'timezone:all'],
+            'datetime_format' => ['sometimes', 'nullable', 'string', Rule::in(['dmy_24', 'dmy_12', 'dots_24', 'slash_12'])],
         ];
     }
 }
diff --git a/app/Http/Resources/App/HandleInertiaRequests/AuthWorkspaceResource.php b/app/Http/Resources/App/HandleInertiaRequests/AuthWorkspaceResource.php
index d51da01f4..dc3c59333 100644
--- a/app/Http/Resources/App/HandleInertiaRequests/AuthWorkspaceResource.php
+++ b/app/Http/Resources/App/HandleInertiaRequests/AuthWorkspaceResource.php
@@ -19,6 +19,7 @@ public static function make(Workspace $workspace, ?User $user = null): array
             'name' => $workspace->name,
             'logo_url' => $workspace->logo_url,
             'timezone' => $workspace->timezone,
+            'datetime_format' => $workspace->datetime_format,
             'created_at' => $workspace->created_at->toIso8601String(),
             'role' => $user ? self::resolveRole($workspace, $user) : null,
         ];
diff --git a/app/Models/Workspace.php b/app/Models/Workspace.php
index 06f4f5d1f..f97c6cc1c 100644
--- a/app/Models/Workspace.php
+++ b/app/Models/Workspace.php
@@ -34,6 +34,7 @@ class Workspace extends Model
         'image_style',
         'content_language',
         'timezone',
+        'datetime_format',
     ];
 
     protected function casts(): array
diff --git a/database/migrations/2026_08_20_140000_add_datetime_format_to_workspaces_table.php b/database/migrations/2026_08_20_140000_add_datetime_format_to_workspaces_table.php
new file mode 100644
index 000000000..b07841976
--- /dev/null
+++ b/database/migrations/2026_08_20_140000_add_datetime_format_to_workspaces_table.php
@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    public function up(): void
+    {
+        Schema::table('workspaces', function (Blueprint $table) {
+            // Пресет отображения даты/времени (см. UpdateWorkspaceRequest).
+            // Null = «авто»: локализованный формат dayjs, прежнее поведение.
+            $table->string('datetime_format', 20)->nullable()->after('timezone');
+        });
+    }
+
+    public function down(): void
+    {
+        Schema::table('workspaces', function (Blueprint $table) {
+            $table->dropColumn('datetime_format');
+        });
+    }
+};
diff --git a/lang/ar/settings.php b/lang/ar/settings.php
index 044ea3fb2..3df42ed18 100644
--- a/lang/ar/settings.php
+++ b/lang/ar/settings.php
@@ -55,6 +55,9 @@
         'timezone' => 'المنطقة الزمنية',
         'timezone_auto' => 'تلقائي — منطقة المتصفح (:tz)',
         'timezone_description' => 'يُعرض التقويم والجدولة وتواريخ المنشورات بهذه المنطقة الزمنية لجميع أعضاء مساحة العمل.',
+        'datetime_format' => 'تنسيق التاريخ والوقت',
+        'datetime_format_auto' => 'تلقائي — حسب اللغة',
+        'datetime_format_description' => 'يُطبَّق على التقويم وجميع قوائم المنشورات.',
         'email' => 'البريد الإلكتروني',
         'email_placeholder' => 'البريد الإلكتروني',
         'email_unverified' => 'لم يتم تأكيد بريدك الإلكتروني.',
diff --git a/lang/de/settings.php b/lang/de/settings.php
index 768ac1c26..036548e51 100644
--- a/lang/de/settings.php
+++ b/lang/de/settings.php
@@ -57,6 +57,9 @@
         'timezone' => 'Zeitzone',
         'timezone_auto' => 'Auto — Browser-Zeitzone (:tz)',
         'timezone_description' => 'Kalender, Zeitplan und Beitragsdaten werden für alle im Workspace in dieser Zeitzone angezeigt.',
+        'datetime_format' => 'Datums- & Zeitformat',
+        'datetime_format_auto' => 'Auto — Sprachstandard',
+        'datetime_format_description' => 'Gilt für den Kalender und alle Beitragslisten.',
         'email' => 'E-Mail-Adresse',
         'email_placeholder' => 'E-Mail-Adresse',
         'email_unverified' => 'Deine E-Mail-Adresse ist nicht bestätigt.',
diff --git a/lang/el/settings.php b/lang/el/settings.php
index 74d1fb5ed..6853b069f 100644
--- a/lang/el/settings.php
+++ b/lang/el/settings.php
@@ -55,6 +55,9 @@
         'timezone' => 'Ζώνη ώρας',
         'timezone_auto' => 'Αυτόματα — ζώνη του προγράμματος περιήγησης (:tz)',
         'timezone_description' => 'Το ημερολόγιο, ο προγραμματισμός και οι ημερομηνίες αναρτήσεων εμφανίζονται σε αυτήν τη ζώνη για όλο το workspace.',
+        'datetime_format' => 'Μορφή ημερομηνίας και ώρας',
+        'datetime_format_auto' => 'Αυτόματα — προεπιλογή γλώσσας',
+        'datetime_format_description' => 'Εφαρμόζεται στο ημερολόγιο και σε όλες τις λίστες αναρτήσεων.',
         'email' => 'Διεύθυνση email',
         'email_placeholder' => 'Διεύθυνση email',
         'email_unverified' => 'Η διεύθυνση email σας δεν έχει επαληθευτεί.',
diff --git a/lang/en/settings.php b/lang/en/settings.php
index 7b3e1831c..fb00484e1 100644
--- a/lang/en/settings.php
+++ b/lang/en/settings.php
@@ -55,6 +55,9 @@
         'timezone' => 'Timezone',
         'timezone_auto' => 'Auto — browser timezone (:tz)',
         'timezone_description' => 'Calendar, schedule and post dates are shown in this timezone for everyone in the workspace.',
+        'datetime_format' => 'Date & time format',
+        'datetime_format_auto' => 'Auto — language default',
+        'datetime_format_description' => 'Applied to the calendar and all post lists.',
         'email' => 'Email address',
         'email_placeholder' => 'Email address',
         'email_unverified' => 'Your email address is unverified.',
diff --git a/lang/es/settings.php b/lang/es/settings.php
index aea1870ce..8c023fe55 100644
--- a/lang/es/settings.php
+++ b/lang/es/settings.php
@@ -55,6 +55,9 @@
         'timezone' => 'Zona horaria',
         'timezone_auto' => 'Auto — zona del navegador (:tz)',
         'timezone_description' => 'El calendario, la programación y las fechas de publicaciones se muestran en esta zona para todo el workspace.',
+        'datetime_format' => 'Formato de fecha y hora',
+        'datetime_format_auto' => 'Auto — según el idioma',
+        'datetime_format_description' => 'Se aplica al calendario y a todas las listas de publicaciones.',
         'email' => 'Correo electrónico',
         'email_placeholder' => 'Correo electrónico',
         'email_unverified' => 'Tu correo electrónico no ha sido verificado.',
diff --git a/lang/fr/settings.php b/lang/fr/settings.php
index 44d71d3db..b13cc331c 100644
--- a/lang/fr/settings.php
+++ b/lang/fr/settings.php
@@ -55,6 +55,9 @@
         'timezone' => 'Fuseau horaire',
         'timezone_auto' => 'Auto — fuseau du navigateur (:tz)',
         'timezone_description' => 'Le calendrier, la planification et les dates des publications s’affichent dans ce fuseau pour tout le workspace.',
+        'datetime_format' => 'Format de date et d’heure',
+        'datetime_format_auto' => 'Auto — selon la langue',
+        'datetime_format_description' => 'Appliqué au calendrier et à toutes les listes de publications.',
         'email' => 'Adresse e-mail',
         'email_placeholder' => 'Adresse e-mail',
         'email_unverified' => 'Votre adresse e-mail n\'est pas vérifiée.',
diff --git a/lang/it/settings.php b/lang/it/settings.php
index 2693108f0..8b2b9319c 100644
--- a/lang/it/settings.php
+++ b/lang/it/settings.php
@@ -55,6 +55,9 @@
         'timezone' => 'Fuso orario',
         'timezone_auto' => 'Auto — fuso del browser (:tz)',
         'timezone_description' => 'Calendario, programmazione e date dei post vengono mostrati in questo fuso per tutto il workspace.',
+        'datetime_format' => 'Formato data e ora',
+        'datetime_format_auto' => 'Auto — in base alla lingua',
+        'datetime_format_description' => 'Applicato al calendario e a tutti gli elenchi di post.',
         'email' => 'Indirizzo email',
         'email_placeholder' => 'Indirizzo email',
         'email_unverified' => 'Il tuo indirizzo email non è verificato.',
diff --git a/lang/ja/settings.php b/lang/ja/settings.php
index 31701a4f6..856f6890b 100644
--- a/lang/ja/settings.php
+++ b/lang/ja/settings.php
@@ -55,6 +55,9 @@
         'timezone' => 'タイムゾーン',
         'timezone_auto' => '自動 — ブラウザのタイムゾーン (:tz)',
         'timezone_description' => 'カレンダー、スケジュール、投稿日時はワークスペース全員にこのタイムゾーンで表示されます。',
+        'datetime_format' => '日付と時刻の形式',
+        'datetime_format_auto' => '自動 — 言語の既定',
+        'datetime_format_description' => 'カレンダーとすべての投稿リストに適用されます。',
         'email' => 'メールアドレス',
         'email_placeholder' => 'メールアドレス',
         'email_unverified' => 'メールアドレスが未確認です。',
diff --git a/lang/ko/settings.php b/lang/ko/settings.php
index feabb001f..c66224c3d 100644
--- a/lang/ko/settings.php
+++ b/lang/ko/settings.php
@@ -55,6 +55,9 @@
         'timezone' => '시간대',
         'timezone_auto' => '자동 — 브라우저 시간대 (:tz)',
         'timezone_description' => '캘린더, 일정, 게시물 날짜가 워크스페이스 전체에 이 시간대로 표시됩니다.',
+        'datetime_format' => '날짜 및 시간 형식',
+        'datetime_format_auto' => '자동 — 언어 기본값',
+        'datetime_format_description' => '캘린더와 모든 게시물 목록에 적용됩니다.',
         'email' => '이메일 주소',
         'email_placeholder' => '이메일 주소',
         'email_unverified' => '이메일 주소가 인증되지 않았습니다.',
diff --git a/lang/nl/settings.php b/lang/nl/settings.php
index 67f3aaf4d..e69c17732 100644
--- a/lang/nl/settings.php
+++ b/lang/nl/settings.php
@@ -55,6 +55,9 @@
         'timezone' => 'Tijdzone',
         'timezone_auto' => 'Auto — browsertijdzone (:tz)',
         'timezone_description' => 'Kalender, planning en berichtdatums worden voor iedereen in de workspace in deze tijdzone getoond.',
+        'datetime_format' => 'Datum- en tijdnotatie',
+        'datetime_format_auto' => 'Auto — taalstandaard',
+        'datetime_format_description' => 'Toegepast op de kalender en alle berichtlijsten.',
         'email' => 'E-mailadres',
         'email_placeholder' => 'E-mailadres',
         'email_unverified' => 'Je e-mailadres is niet geverifieerd.',
diff --git a/lang/pl/settings.php b/lang/pl/settings.php
index e460940ff..aef033823 100644
--- a/lang/pl/settings.php
+++ b/lang/pl/settings.php
@@ -55,6 +55,9 @@
         'timezone' => 'Strefa czasowa',
         'timezone_auto' => 'Auto — strefa przeglądarki (:tz)',
         'timezone_description' => 'Kalendarz, harmonogram i daty postów są pokazywane w tej strefie wszystkim w workspace.',
+        'datetime_format' => 'Format daty i godziny',
+        'datetime_format_auto' => 'Auto — wg języka',
+        'datetime_format_description' => 'Stosowany do kalendarza i wszystkich list postów.',
         'email' => 'Adres e-mail',
         'email_placeholder' => 'Adres e-mail',
         'email_unverified' => 'Twój adres e-mail nie został zweryfikowany.',
diff --git a/lang/pt-BR/settings.php b/lang/pt-BR/settings.php
index a40ca25b8..557aaa9de 100644
--- a/lang/pt-BR/settings.php
+++ b/lang/pt-BR/settings.php
@@ -55,6 +55,9 @@
         'timezone' => 'Fuso horário',
         'timezone_auto' => 'Auto — fuso do navegador (:tz)',
         'timezone_description' => 'Calendário, agendamento e datas das publicações são exibidos neste fuso para todo o workspace.',
+        'datetime_format' => 'Formato de data e hora',
+        'datetime_format_auto' => 'Auto — padrão do idioma',
+        'datetime_format_description' => 'Aplicado ao calendário e a todas as listas de publicações.',
         'email' => 'Endereço de e-mail',
         'email_placeholder' => 'Endereço de e-mail',
         'email_unverified' => 'Seu endereço de e-mail não foi verificado.',
diff --git a/lang/ru/settings.php b/lang/ru/settings.php
index 3ab2a1d9b..a12cde879 100644
--- a/lang/ru/settings.php
+++ b/lang/ru/settings.php
@@ -55,6 +55,9 @@
         'timezone' => 'Часовой пояс',
         'timezone_auto' => 'Авто — часовой пояс браузера (:tz)',
         'timezone_description' => 'Календарь, расписание и даты постов показываются в этом поясе всем участникам воркспейса.',
+        'datetime_format' => 'Формат даты и времени',
+        'datetime_format_auto' => 'Авто — по языку интерфейса',
+        'datetime_format_description' => 'Применяется к календарю и всем спискам постов.',
         'email' => 'Адрес email',
         'email_placeholder' => 'Адрес email',
         'email_unverified' => 'Ваш адрес email не подтверждён.',
diff --git a/lang/tr/settings.php b/lang/tr/settings.php
index f7d099ae5..f1a7e0db5 100644
--- a/lang/tr/settings.php
+++ b/lang/tr/settings.php
@@ -57,6 +57,9 @@
         'timezone' => 'Saat dilimi',
         'timezone_auto' => 'Otomatik — tarayıcı saat dilimi (:tz)',
         'timezone_description' => 'Takvim, plan ve gönderi tarihleri çalışma alanındaki herkese bu dilimde gösterilir.',
+        'datetime_format' => 'Tarih ve saat biçimi',
+        'datetime_format_auto' => 'Otomatik — dil varsayılanı',
+        'datetime_format_description' => 'Takvime ve tüm gönderi listelerine uygulanır.',
         'email' => 'E-posta adresi',
         'email_placeholder' => 'E-posta adresi',
         'email_unverified' => 'E-posta adresiniz doğrulanmadı.',
diff --git a/lang/uk/settings.php b/lang/uk/settings.php
index 22b181e0b..f6d89fd2a 100644
--- a/lang/uk/settings.php
+++ b/lang/uk/settings.php
@@ -55,6 +55,9 @@
         'timezone' => 'Часовий пояс',
         'timezone_auto' => 'Авто — часовий пояс браузера (:tz)',
         'timezone_description' => 'Календар, розклад і дати постів показуються в цьому поясі всім учасникам воркспейсу.',
+        'datetime_format' => 'Формат дати й часу',
+        'datetime_format_auto' => 'Авто — за мовою інтерфейсу',
+        'datetime_format_description' => 'Застосовується до календаря та всіх списків постів.',
         'email' => 'Адреса email',
         'email_placeholder' => 'Адреса email',
         'email_unverified' => 'Вашу адресу email не підтверджено.',
diff --git a/lang/zh/settings.php b/lang/zh/settings.php
index 6ca50e4f9..7a04f403b 100644
--- a/lang/zh/settings.php
+++ b/lang/zh/settings.php
@@ -55,6 +55,9 @@
         'timezone' => '时区',
         'timezone_auto' => '自动 — 浏览器时区 (:tz)',
         'timezone_description' => '日历、排期和帖子日期将以此时区向工作区所有成员显示。',
+        'datetime_format' => '日期和时间格式',
+        'datetime_format_auto' => '自动 — 随界面语言',
+        'datetime_format_description' => '应用于日历和所有帖子列表。',
         'email' => '邮箱地址',
         'email_placeholder' => '邮箱地址',
         'email_unverified' => '你的邮箱地址尚未验证。',
diff --git a/resources/js/components/settings/WorkspaceTab.vue b/resources/js/components/settings/WorkspaceTab.vue
index ba09d4fa0..aa30457ad 100644
--- a/resources/js/components/settings/WorkspaceTab.vue
+++ b/resources/js/components/settings/WorkspaceTab.vue
@@ -19,6 +19,7 @@ interface Workspace {
     has_logo: boolean;
     logo_url: string | null;
     timezone?: string | null;
+    datetime_format?: string | null;
 }
 
 defineProps<{
@@ -38,6 +39,13 @@ const timezones: string[] = (() => {
         return [browserTimezone];
     }
 })();
+
+const formatPresets = [
+    { value: 'dmy_24', example: '20 Aug 2026, 18:30' },
+    { value: 'dmy_12', example: '20 Aug 2026, 6:30 PM' },
+    { value: 'dots_24', example: '20.08.2026 18:30' },
+    { value: 'slash_12', example: '08/20/2026 6:30 PM' },
+];
 </script>
 
 <template>
@@ -95,6 +103,20 @@ const timezones: string[] = (() => {
                     <InputError :message="errors.timezone" />
                 </div>
 
+                <div class="grid gap-2">
+                    <Label for="datetime_format">{{ $t('settings.workspace.datetime_format') }}</Label>
+                    <select
+                        id="datetime_format"
+                        name="datetime_format"
+                        class="border-input h-9 w-full rounded-md border-2 bg-transparent px-3 py-1 text-sm shadow-2xs"
+                    >
+                        <option value="" :selected="!workspace.datetime_format">{{ $t('settings.workspace.datetime_format_auto') }}</option>
+                        <option v-for="preset in formatPresets" :key="preset.value" :value="preset.value" :selected="workspace.datetime_format === preset.value">{{ preset.example }}</option>
+                    </select>
+                    <p class="text-xs text-foreground/60">{{ $t('settings.workspace.datetime_format_description') }}</p>
+                    <InputError :message="errors.datetime_format" />
+                </div>
+
                 <Button :disabled="processing">{{ $t('settings.workspace.save') }}</Button>
             </Form>
         </div>
diff --git a/resources/js/date.ts b/resources/js/date.ts
index c5075741e..ed5486263 100644
--- a/resources/js/date.ts
+++ b/resources/js/date.ts
@@ -16,6 +16,28 @@ function getUserTimezone(): string {
     return Intl.DateTimeFormat().resolvedOptions().timeZone;
 }
 
+/**
+ * Пресеты формата даты/времени из настроек воркспейса. Null/неизвестное
+ * значение — «авто»: локализованные форматы dayjs (прежнее поведение).
+ */
+const DATETIME_PRESETS: Record<string, { date: string; time: string; datetime: string }> = {
+    dmy_24: { date: 'D MMM YYYY', time: 'HH:mm', datetime: 'D MMM YYYY, HH:mm' },
+    dmy_12: { date: 'D MMM YYYY', time: 'h:mm A', datetime: 'D MMM YYYY, h:mm A' },
+    dots_24: { date: 'DD.MM.YYYY', time: 'HH:mm', datetime: 'DD.MM.YYYY HH:mm' },
+    slash_12: { date: 'MM/DD/YYYY', time: 'h:mm A', datetime: 'MM/DD/YYYY h:mm A' },
+};
+
+function getWorkspacePreset(): { date: string; time: string; datetime: string } | null {
+    try {
+        const preset = (usePage().props as any)?.auth?.currentWorkspace?.datetime_format;
+        if (preset && DATETIME_PRESETS[preset]) return DATETIME_PRESETS[preset];
+    } catch {
+        // Вне контекста Inertia — «авто».
+    }
+
+    return null;
+}
+
 /** Resolve scheduled local datetime for platform previews, else now. */
 const resolvePreviewPostedAt = (postedAt?: string | null) => {
     if (postedAt) {
@@ -38,7 +60,7 @@ const formatAbsolutePreviewPostedAt = (postedAt?: string | null) => {
 export default {
     formatDate(date: string | null | undefined) {
         if (!date) return '-';
-        return dayjs.utc(date).tz(getUserTimezone()).format('LL');
+        return dayjs.utc(date).tz(getUserTimezone()).format(getWorkspacePreset()?.date ?? 'LL');
     },
 
     /**
@@ -59,7 +81,7 @@ export default {
             return '—';
         }
 
-        return dayjs.utc(date).tz(getUserTimezone()).format('LLL');
+        return dayjs.utc(date).tz(getUserTimezone()).format(getWorkspacePreset()?.datetime ?? 'LLL');
     },
 
     /**
@@ -139,7 +161,7 @@ export default {
 
     formatTime(date: string | null | undefined) {
         if (!date) return '-';
-        return dayjs.utc(date).tz(getUserTimezone()).format('HH:mm');
+        return dayjs.utc(date).tz(getUserTimezone()).format(getWorkspacePreset()?.time ?? 'HH:mm');
     },
 
     formatDateTimeForApi(date: string) {
diff --git a/resources/js/pages/posts/Index.vue b/resources/js/pages/posts/Index.vue
index d94e8caea..e47433511 100644
--- a/resources/js/pages/posts/Index.vue
+++ b/resources/js/pages/posts/Index.vue
@@ -69,6 +69,7 @@ interface Post {
     status: string;
     scheduled_at: string | null;
     published_at: string | null;
+    updated_at: string | null;
     post_platforms: PostPlatform[];
     labels: Label[];
 }
@@ -286,7 +287,7 @@ useWorkspaceEcho(
                                     </Badge>
                                 </TableCell>
                                 <TableCell>
-                                    {{ formatDateTime(post.scheduled_at ?? post.published_at) }}
+                                    {{ formatDateTime(post.scheduled_at ?? post.published_at ?? post.updated_at) }}
                                 </TableCell>
                                 <TableCell class="text-right" @click.stop>
                                     <DropdownMenu>
diff --git a/tests/Feature/WorkspaceControllerTest.php b/tests/Feature/WorkspaceControllerTest.php
index 85a47236f..1d6cb3d22 100644
--- a/tests/Feature/WorkspaceControllerTest.php
+++ b/tests/Feature/WorkspaceControllerTest.php
@@ -354,7 +354,26 @@
     expect($this->workspace->fresh()->timezone)->toBeNull();
 });
 
+test('update workspace settings persists the datetime format preset', function () {
+    $this->actingAs($this->user)
+        ->put(route('app.workspace.settings.update'), [
+            'name' => $this->workspace->name,
+            'datetime_format' => 'dots_24',
+        ]);
+
+    expect($this->workspace->fresh()->datetime_format)->toBe('dots_24');
+
+    $response = $this->actingAs($this->user)
+        ->put(route('app.workspace.settings.update'), [
+            'name' => $this->workspace->name,
+            'datetime_format' => 'not-a-preset',
+        ]);
+
+    $response->assertSessionHasErrors('datetime_format');
+});
+
 test('update workspace settings rejects an invalid timezone', function () {
+
     $response = $this->actingAs($this->user)
         ->put(route('app.workspace.settings.update'), [
             'name' => $this->workspace->name,

From 5f729ce022aac6522e08227806303e46d03f1a3e Mon Sep 17 00:00:00 2001
From: Grigory Frolov <2168057+gynsus@users.noreply.github.com>
Date: Sun, 30 Aug 2026 14:12:32 +0300
Subject: [PATCH 4/4] fix: workspace timezone/format translations were under
 settings.profile

---
 lang/ar/settings.php                          | 12 +++----
 lang/de/settings.php                          | 12 +++----
 lang/el/settings.php                          | 12 +++----
 lang/en/settings.php                          | 12 +++----
 lang/es/settings.php                          | 12 +++----
 lang/fr/settings.php                          | 12 +++----
 lang/it/settings.php                          | 12 +++----
 lang/ja/settings.php                          | 12 +++----
 lang/ko/settings.php                          | 12 +++----
 lang/nl/settings.php                          | 12 +++----
 lang/pl/settings.php                          | 12 +++----
 lang/pt-BR/settings.php                       | 12 +++----
 lang/ru/settings.php                          | 12 +++----
 lang/tr/settings.php                          | 12 +++----
 lang/uk/settings.php                          | 12 +++----
 lang/zh/settings.php                          | 12 +++----
 .../Unit/WorkspaceSettingsTranslationTest.php | 32 +++++++++++++++++++
 17 files changed, 128 insertions(+), 96 deletions(-)
 create mode 100644 tests/Unit/WorkspaceSettingsTranslationTest.php

diff --git a/lang/ar/settings.php b/lang/ar/settings.php
index 3df42ed18..9921e761f 100644
--- a/lang/ar/settings.php
+++ b/lang/ar/settings.php
@@ -52,12 +52,6 @@
         'avatar' => 'الصورة الرمزية',
         'name' => 'الاسم',
         'name_placeholder' => 'الاسم الكامل',
-        'timezone' => 'المنطقة الزمنية',
-        'timezone_auto' => 'تلقائي — منطقة المتصفح (:tz)',
-        'timezone_description' => 'يُعرض التقويم والجدولة وتواريخ المنشورات بهذه المنطقة الزمنية لجميع أعضاء مساحة العمل.',
-        'datetime_format' => 'تنسيق التاريخ والوقت',
-        'datetime_format_auto' => 'تلقائي — حسب اللغة',
-        'datetime_format_description' => 'يُطبَّق على التقويم وجميع قوائم المنشورات.',
         'email' => 'البريد الإلكتروني',
         'email_placeholder' => 'البريد الإلكتروني',
         'email_unverified' => 'لم يتم تأكيد بريدك الإلكتروني.',
@@ -146,6 +140,12 @@
         'members_description' => 'إدارة أعضاء مساحة العمل والدعوات',
         'name' => 'الاسم',
         'name_placeholder' => 'مساحة عملي',
+        'timezone' => 'المنطقة الزمنية',
+        'timezone_auto' => 'تلقائي — منطقة المتصفح (:tz)',
+        'timezone_description' => 'يُعرض التقويم والجدولة وتواريخ المنشورات بهذه المنطقة الزمنية لجميع أعضاء مساحة العمل.',
+        'datetime_format' => 'تنسيق التاريخ والوقت',
+        'datetime_format_auto' => 'تلقائي — حسب اللغة',
+        'datetime_format_description' => 'يُطبَّق على التقويم وجميع قوائم المنشورات.',
         'save' => 'حفظ',
         'danger_description' => 'إجراءات لا يمكن التراجع عنها.',
         'delete_warning' => 'تحذير',
diff --git a/lang/de/settings.php b/lang/de/settings.php
index 036548e51..1b2424f72 100644
--- a/lang/de/settings.php
+++ b/lang/de/settings.php
@@ -54,12 +54,6 @@
         'avatar' => 'Avatar',
         'name' => 'Name',
         'name_placeholder' => 'Vollständiger Name',
-        'timezone' => 'Zeitzone',
-        'timezone_auto' => 'Auto — Browser-Zeitzone (:tz)',
-        'timezone_description' => 'Kalender, Zeitplan und Beitragsdaten werden für alle im Workspace in dieser Zeitzone angezeigt.',
-        'datetime_format' => 'Datums- & Zeitformat',
-        'datetime_format_auto' => 'Auto — Sprachstandard',
-        'datetime_format_description' => 'Gilt für den Kalender und alle Beitragslisten.',
         'email' => 'E-Mail-Adresse',
         'email_placeholder' => 'E-Mail-Adresse',
         'email_unverified' => 'Deine E-Mail-Adresse ist nicht bestätigt.',
@@ -148,6 +142,12 @@
         'members_description' => 'Verwalte die Mitglieder und Einladungen des Workspace',
         'name' => 'Name',
         'name_placeholder' => 'Mein Workspace',
+        'timezone' => 'Zeitzone',
+        'timezone_auto' => 'Auto — Browser-Zeitzone (:tz)',
+        'timezone_description' => 'Kalender, Zeitplan und Beitragsdaten werden für alle im Workspace in dieser Zeitzone angezeigt.',
+        'datetime_format' => 'Datums- & Zeitformat',
+        'datetime_format_auto' => 'Auto — Sprachstandard',
+        'datetime_format_description' => 'Gilt für den Kalender und alle Beitragslisten.',
         'save' => 'Speichern',
         'danger_description' => 'Unwiderrufliche Aktionen.',
         'delete_warning' => 'Warnung',
diff --git a/lang/el/settings.php b/lang/el/settings.php
index 6853b069f..6dc9400cb 100644
--- a/lang/el/settings.php
+++ b/lang/el/settings.php
@@ -52,12 +52,6 @@
         'avatar' => 'Άβαταρ',
         'name' => 'Όνομα',
         'name_placeholder' => 'Ονοματεπώνυμο',
-        'timezone' => 'Ζώνη ώρας',
-        'timezone_auto' => 'Αυτόματα — ζώνη του προγράμματος περιήγησης (:tz)',
-        'timezone_description' => 'Το ημερολόγιο, ο προγραμματισμός και οι ημερομηνίες αναρτήσεων εμφανίζονται σε αυτήν τη ζώνη για όλο το workspace.',
-        'datetime_format' => 'Μορφή ημερομηνίας και ώρας',
-        'datetime_format_auto' => 'Αυτόματα — προεπιλογή γλώσσας',
-        'datetime_format_description' => 'Εφαρμόζεται στο ημερολόγιο και σε όλες τις λίστες αναρτήσεων.',
         'email' => 'Διεύθυνση email',
         'email_placeholder' => 'Διεύθυνση email',
         'email_unverified' => 'Η διεύθυνση email σας δεν έχει επαληθευτεί.',
@@ -146,6 +140,12 @@
         'members_description' => 'Διαχειριστείτε τα μέλη και τις προσκλήσεις του workspace',
         'name' => 'Όνομα',
         'name_placeholder' => 'Το workspace μου',
+        'timezone' => 'Ζώνη ώρας',
+        'timezone_auto' => 'Αυτόματα — ζώνη του προγράμματος περιήγησης (:tz)',
+        'timezone_description' => 'Το ημερολόγιο, ο προγραμματισμός και οι ημερομηνίες αναρτήσεων εμφανίζονται σε αυτήν τη ζώνη για όλο το workspace.',
+        'datetime_format' => 'Μορφή ημερομηνίας και ώρας',
+        'datetime_format_auto' => 'Αυτόματα — προεπιλογή γλώσσας',
+        'datetime_format_description' => 'Εφαρμόζεται στο ημερολόγιο και σε όλες τις λίστες αναρτήσεων.',
         'save' => 'Αποθήκευση',
         'danger_description' => 'Μη αναστρέψιμες ενέργειες.',
         'delete_warning' => 'Προειδοποίηση',
diff --git a/lang/en/settings.php b/lang/en/settings.php
index fb00484e1..79feff6ec 100644
--- a/lang/en/settings.php
+++ b/lang/en/settings.php
@@ -52,12 +52,6 @@
         'avatar' => 'Avatar',
         'name' => 'Name',
         'name_placeholder' => 'Full name',
-        'timezone' => 'Timezone',
-        'timezone_auto' => 'Auto — browser timezone (:tz)',
-        'timezone_description' => 'Calendar, schedule and post dates are shown in this timezone for everyone in the workspace.',
-        'datetime_format' => 'Date & time format',
-        'datetime_format_auto' => 'Auto — language default',
-        'datetime_format_description' => 'Applied to the calendar and all post lists.',
         'email' => 'Email address',
         'email_placeholder' => 'Email address',
         'email_unverified' => 'Your email address is unverified.',
@@ -146,6 +140,12 @@
         'members_description' => 'Manage workspace members and invitations',
         'name' => 'Name',
         'name_placeholder' => 'My Workspace',
+        'timezone' => 'Timezone',
+        'timezone_auto' => 'Auto — browser timezone (:tz)',
+        'timezone_description' => 'Calendar, schedule and post dates are shown in this timezone for everyone in the workspace.',
+        'datetime_format' => 'Date & time format',
+        'datetime_format_auto' => 'Auto — language default',
+        'datetime_format_description' => 'Applied to the calendar and all post lists.',
         'save' => 'Save',
         'danger_description' => 'Irreversible actions.',
         'delete_warning' => 'Warning',
diff --git a/lang/es/settings.php b/lang/es/settings.php
index 8c023fe55..def7ac3a0 100644
--- a/lang/es/settings.php
+++ b/lang/es/settings.php
@@ -52,12 +52,6 @@
         'avatar' => 'Avatar',
         'name' => 'Nombre',
         'name_placeholder' => 'Nombre completo',
-        'timezone' => 'Zona horaria',
-        'timezone_auto' => 'Auto — zona del navegador (:tz)',
-        'timezone_description' => 'El calendario, la programación y las fechas de publicaciones se muestran en esta zona para todo el workspace.',
-        'datetime_format' => 'Formato de fecha y hora',
-        'datetime_format_auto' => 'Auto — según el idioma',
-        'datetime_format_description' => 'Se aplica al calendario y a todas las listas de publicaciones.',
         'email' => 'Correo electrónico',
         'email_placeholder' => 'Correo electrónico',
         'email_unverified' => 'Tu correo electrónico no ha sido verificado.',
@@ -146,6 +140,12 @@
         'members_description' => 'Administra miembros e invitaciones del workspace',
         'name' => 'Nombre',
         'name_placeholder' => 'Mi Workspace',
+        'timezone' => 'Zona horaria',
+        'timezone_auto' => 'Auto — zona del navegador (:tz)',
+        'timezone_description' => 'El calendario, la programación y las fechas de publicaciones se muestran en esta zona para todo el workspace.',
+        'datetime_format' => 'Formato de fecha y hora',
+        'datetime_format_auto' => 'Auto — según el idioma',
+        'datetime_format_description' => 'Se aplica al calendario y a todas las listas de publicaciones.',
         'save' => 'Guardar',
         'danger_description' => 'Acciones irreversibles.',
         'delete_warning' => 'Advertencia',
diff --git a/lang/fr/settings.php b/lang/fr/settings.php
index b13cc331c..c31c80f10 100644
--- a/lang/fr/settings.php
+++ b/lang/fr/settings.php
@@ -52,12 +52,6 @@
         'avatar' => 'Avatar',
         'name' => 'Nom',
         'name_placeholder' => 'Nom complet',
-        'timezone' => 'Fuseau horaire',
-        'timezone_auto' => 'Auto — fuseau du navigateur (:tz)',
-        'timezone_description' => 'Le calendrier, la planification et les dates des publications s’affichent dans ce fuseau pour tout le workspace.',
-        'datetime_format' => 'Format de date et d’heure',
-        'datetime_format_auto' => 'Auto — selon la langue',
-        'datetime_format_description' => 'Appliqué au calendrier et à toutes les listes de publications.',
         'email' => 'Adresse e-mail',
         'email_placeholder' => 'Adresse e-mail',
         'email_unverified' => 'Votre adresse e-mail n\'est pas vérifiée.',
@@ -146,6 +140,12 @@
         'members_description' => 'Gérez les membres et les invitations de l\'espace de travail',
         'name' => 'Nom',
         'name_placeholder' => 'Mon espace de travail',
+        'timezone' => 'Fuseau horaire',
+        'timezone_auto' => 'Auto — fuseau du navigateur (:tz)',
+        'timezone_description' => 'Le calendrier, la planification et les dates des publications s’affichent dans ce fuseau pour tout le workspace.',
+        'datetime_format' => 'Format de date et d’heure',
+        'datetime_format_auto' => 'Auto — selon la langue',
+        'datetime_format_description' => 'Appliqué au calendrier et à toutes les listes de publications.',
         'save' => 'Enregistrer',
         'danger_description' => 'Actions irréversibles.',
         'delete_warning' => 'Avertissement',
diff --git a/lang/it/settings.php b/lang/it/settings.php
index 8b2b9319c..e06b1bd03 100644
--- a/lang/it/settings.php
+++ b/lang/it/settings.php
@@ -52,12 +52,6 @@
         'avatar' => 'Avatar',
         'name' => 'Nome',
         'name_placeholder' => 'Nome completo',
-        'timezone' => 'Fuso orario',
-        'timezone_auto' => 'Auto — fuso del browser (:tz)',
-        'timezone_description' => 'Calendario, programmazione e date dei post vengono mostrati in questo fuso per tutto il workspace.',
-        'datetime_format' => 'Formato data e ora',
-        'datetime_format_auto' => 'Auto — in base alla lingua',
-        'datetime_format_description' => 'Applicato al calendario e a tutti gli elenchi di post.',
         'email' => 'Indirizzo email',
         'email_placeholder' => 'Indirizzo email',
         'email_unverified' => 'Il tuo indirizzo email non è verificato.',
@@ -146,6 +140,12 @@
         'members_description' => 'Gestisci i membri e gli inviti del workspace',
         'name' => 'Nome',
         'name_placeholder' => 'Il mio workspace',
+        'timezone' => 'Fuso orario',
+        'timezone_auto' => 'Auto — fuso del browser (:tz)',
+        'timezone_description' => 'Calendario, programmazione e date dei post vengono mostrati in questo fuso per tutto il workspace.',
+        'datetime_format' => 'Formato data e ora',
+        'datetime_format_auto' => 'Auto — in base alla lingua',
+        'datetime_format_description' => 'Applicato al calendario e a tutti gli elenchi di post.',
         'save' => 'Salva',
         'danger_description' => 'Azioni irreversibili.',
         'delete_warning' => 'Attenzione',
diff --git a/lang/ja/settings.php b/lang/ja/settings.php
index 856f6890b..ab9b01105 100644
--- a/lang/ja/settings.php
+++ b/lang/ja/settings.php
@@ -52,12 +52,6 @@
         'avatar' => 'アバター',
         'name' => '名前',
         'name_placeholder' => '氏名',
-        'timezone' => 'タイムゾーン',
-        'timezone_auto' => '自動 — ブラウザのタイムゾーン (:tz)',
-        'timezone_description' => 'カレンダー、スケジュール、投稿日時はワークスペース全員にこのタイムゾーンで表示されます。',
-        'datetime_format' => '日付と時刻の形式',
-        'datetime_format_auto' => '自動 — 言語の既定',
-        'datetime_format_description' => 'カレンダーとすべての投稿リストに適用されます。',
         'email' => 'メールアドレス',
         'email_placeholder' => 'メールアドレス',
         'email_unverified' => 'メールアドレスが未確認です。',
@@ -146,6 +140,12 @@
         'members_description' => 'ワークスペースのメンバーと招待を管理します',
         'name' => '名前',
         'name_placeholder' => 'マイワークスペース',
+        'timezone' => 'タイムゾーン',
+        'timezone_auto' => '自動 — ブラウザのタイムゾーン (:tz)',
+        'timezone_description' => 'カレンダー、スケジュール、投稿日時はワークスペース全員にこのタイムゾーンで表示されます。',
+        'datetime_format' => '日付と時刻の形式',
+        'datetime_format_auto' => '自動 — 言語の既定',
+        'datetime_format_description' => 'カレンダーとすべての投稿リストに適用されます。',
         'save' => '保存',
         'danger_description' => '元に戻せない操作です。',
         'delete_warning' => '警告',
diff --git a/lang/ko/settings.php b/lang/ko/settings.php
index c66224c3d..45def7382 100644
--- a/lang/ko/settings.php
+++ b/lang/ko/settings.php
@@ -52,12 +52,6 @@
         'avatar' => '아바타',
         'name' => '이름',
         'name_placeholder' => '전체 이름',
-        'timezone' => '시간대',
-        'timezone_auto' => '자동 — 브라우저 시간대 (:tz)',
-        'timezone_description' => '캘린더, 일정, 게시물 날짜가 워크스페이스 전체에 이 시간대로 표시됩니다.',
-        'datetime_format' => '날짜 및 시간 형식',
-        'datetime_format_auto' => '자동 — 언어 기본값',
-        'datetime_format_description' => '캘린더와 모든 게시물 목록에 적용됩니다.',
         'email' => '이메일 주소',
         'email_placeholder' => '이메일 주소',
         'email_unverified' => '이메일 주소가 인증되지 않았습니다.',
@@ -146,6 +140,12 @@
         'members_description' => '워크스페이스 멤버와 초대를 관리하세요',
         'name' => '이름',
         'name_placeholder' => '내 워크스페이스',
+        'timezone' => '시간대',
+        'timezone_auto' => '자동 — 브라우저 시간대 (:tz)',
+        'timezone_description' => '캘린더, 일정, 게시물 날짜가 워크스페이스 전체에 이 시간대로 표시됩니다.',
+        'datetime_format' => '날짜 및 시간 형식',
+        'datetime_format_auto' => '자동 — 언어 기본값',
+        'datetime_format_description' => '캘린더와 모든 게시물 목록에 적용됩니다.',
         'save' => '저장',
         'danger_description' => '되돌릴 수 없는 작업입니다.',
         'delete_warning' => '경고',
diff --git a/lang/nl/settings.php b/lang/nl/settings.php
index e69c17732..70c922abb 100644
--- a/lang/nl/settings.php
+++ b/lang/nl/settings.php
@@ -52,12 +52,6 @@
         'avatar' => 'Avatar',
         'name' => 'Naam',
         'name_placeholder' => 'Volledige naam',
-        'timezone' => 'Tijdzone',
-        'timezone_auto' => 'Auto — browsertijdzone (:tz)',
-        'timezone_description' => 'Kalender, planning en berichtdatums worden voor iedereen in de workspace in deze tijdzone getoond.',
-        'datetime_format' => 'Datum- en tijdnotatie',
-        'datetime_format_auto' => 'Auto — taalstandaard',
-        'datetime_format_description' => 'Toegepast op de kalender en alle berichtlijsten.',
         'email' => 'E-mailadres',
         'email_placeholder' => 'E-mailadres',
         'email_unverified' => 'Je e-mailadres is niet geverifieerd.',
@@ -146,6 +140,12 @@
         'members_description' => 'Beheer workspaceleden en uitnodigingen',
         'name' => 'Naam',
         'name_placeholder' => 'Mijn workspace',
+        'timezone' => 'Tijdzone',
+        'timezone_auto' => 'Auto — browsertijdzone (:tz)',
+        'timezone_description' => 'Kalender, planning en berichtdatums worden voor iedereen in de workspace in deze tijdzone getoond.',
+        'datetime_format' => 'Datum- en tijdnotatie',
+        'datetime_format_auto' => 'Auto — taalstandaard',
+        'datetime_format_description' => 'Toegepast op de kalender en alle berichtlijsten.',
         'save' => 'Opslaan',
         'danger_description' => 'Onomkeerbare acties.',
         'delete_warning' => 'Waarschuwing',
diff --git a/lang/pl/settings.php b/lang/pl/settings.php
index aef033823..ab126c024 100644
--- a/lang/pl/settings.php
+++ b/lang/pl/settings.php
@@ -52,12 +52,6 @@
         'avatar' => 'Awatar',
         'name' => 'Imię i nazwisko',
         'name_placeholder' => 'Imię i nazwisko',
-        'timezone' => 'Strefa czasowa',
-        'timezone_auto' => 'Auto — strefa przeglądarki (:tz)',
-        'timezone_description' => 'Kalendarz, harmonogram i daty postów są pokazywane w tej strefie wszystkim w workspace.',
-        'datetime_format' => 'Format daty i godziny',
-        'datetime_format_auto' => 'Auto — wg języka',
-        'datetime_format_description' => 'Stosowany do kalendarza i wszystkich list postów.',
         'email' => 'Adres e-mail',
         'email_placeholder' => 'Adres e-mail',
         'email_unverified' => 'Twój adres e-mail nie został zweryfikowany.',
@@ -146,6 +140,12 @@
         'members_description' => 'Zarządzaj członkami i zaproszeniami przestrzeni roboczej',
         'name' => 'Nazwa',
         'name_placeholder' => 'Moja przestrzeń robocza',
+        'timezone' => 'Strefa czasowa',
+        'timezone_auto' => 'Auto — strefa przeglądarki (:tz)',
+        'timezone_description' => 'Kalendarz, harmonogram i daty postów są pokazywane w tej strefie wszystkim w workspace.',
+        'datetime_format' => 'Format daty i godziny',
+        'datetime_format_auto' => 'Auto — wg języka',
+        'datetime_format_description' => 'Stosowany do kalendarza i wszystkich list postów.',
         'save' => 'Zapisz',
         'danger_description' => 'Nieodwracalne działania.',
         'delete_warning' => 'Ostrzeżenie',
diff --git a/lang/pt-BR/settings.php b/lang/pt-BR/settings.php
index 557aaa9de..1fea9a65a 100644
--- a/lang/pt-BR/settings.php
+++ b/lang/pt-BR/settings.php
@@ -52,12 +52,6 @@
         'avatar' => 'Avatar',
         'name' => 'Nome',
         'name_placeholder' => 'Nome completo',
-        'timezone' => 'Fuso horário',
-        'timezone_auto' => 'Auto — fuso do navegador (:tz)',
-        'timezone_description' => 'Calendário, agendamento e datas das publicações são exibidos neste fuso para todo o workspace.',
-        'datetime_format' => 'Formato de data e hora',
-        'datetime_format_auto' => 'Auto — padrão do idioma',
-        'datetime_format_description' => 'Aplicado ao calendário e a todas as listas de publicações.',
         'email' => 'Endereço de e-mail',
         'email_placeholder' => 'Endereço de e-mail',
         'email_unverified' => 'Seu endereço de e-mail não foi verificado.',
@@ -146,6 +140,12 @@
         'members_description' => 'Gerencie membros e convites do workspace',
         'name' => 'Nome',
         'name_placeholder' => 'Meu Workspace',
+        'timezone' => 'Fuso horário',
+        'timezone_auto' => 'Auto — fuso do navegador (:tz)',
+        'timezone_description' => 'Calendário, agendamento e datas das publicações são exibidos neste fuso para todo o workspace.',
+        'datetime_format' => 'Formato de data e hora',
+        'datetime_format_auto' => 'Auto — padrão do idioma',
+        'datetime_format_description' => 'Aplicado ao calendário e a todas as listas de publicações.',
         'save' => 'Salvar',
         'danger_description' => 'Ações irreversíveis.',
         'delete_warning' => 'Atenção',
diff --git a/lang/ru/settings.php b/lang/ru/settings.php
index a12cde879..398db12fa 100644
--- a/lang/ru/settings.php
+++ b/lang/ru/settings.php
@@ -52,12 +52,6 @@
         'avatar' => 'Аватар',
         'name' => 'Имя',
         'name_placeholder' => 'Полное имя',
-        'timezone' => 'Часовой пояс',
-        'timezone_auto' => 'Авто — часовой пояс браузера (:tz)',
-        'timezone_description' => 'Календарь, расписание и даты постов показываются в этом поясе всем участникам воркспейса.',
-        'datetime_format' => 'Формат даты и времени',
-        'datetime_format_auto' => 'Авто — по языку интерфейса',
-        'datetime_format_description' => 'Применяется к календарю и всем спискам постов.',
         'email' => 'Адрес email',
         'email_placeholder' => 'Адрес email',
         'email_unverified' => 'Ваш адрес email не подтверждён.',
@@ -146,6 +140,12 @@
         'members_description' => 'Управляйте участниками и приглашениями рабочего пространства',
         'name' => 'Название',
         'name_placeholder' => 'Моё рабочее пространство',
+        'timezone' => 'Часовой пояс',
+        'timezone_auto' => 'Авто — часовой пояс браузера (:tz)',
+        'timezone_description' => 'Календарь, расписание и даты постов показываются в этом поясе всем участникам воркспейса.',
+        'datetime_format' => 'Формат даты и времени',
+        'datetime_format_auto' => 'Авто — по языку интерфейса',
+        'datetime_format_description' => 'Применяется к календарю и всем спискам постов.',
         'save' => 'Сохранить',
         'danger_description' => 'Необратимые действия.',
         'delete_warning' => 'Внимание',
diff --git a/lang/tr/settings.php b/lang/tr/settings.php
index f1a7e0db5..20b42c50c 100644
--- a/lang/tr/settings.php
+++ b/lang/tr/settings.php
@@ -54,12 +54,6 @@
         'avatar' => 'Avatar',
         'name' => 'Ad',
         'name_placeholder' => 'Ad soyad',
-        'timezone' => 'Saat dilimi',
-        'timezone_auto' => 'Otomatik — tarayıcı saat dilimi (:tz)',
-        'timezone_description' => 'Takvim, plan ve gönderi tarihleri çalışma alanındaki herkese bu dilimde gösterilir.',
-        'datetime_format' => 'Tarih ve saat biçimi',
-        'datetime_format_auto' => 'Otomatik — dil varsayılanı',
-        'datetime_format_description' => 'Takvime ve tüm gönderi listelerine uygulanır.',
         'email' => 'E-posta adresi',
         'email_placeholder' => 'E-posta adresi',
         'email_unverified' => 'E-posta adresiniz doğrulanmadı.',
@@ -148,6 +142,12 @@
         'members_description' => 'Çalışma alanı üyelerini ve davetlerini yönetin',
         'name' => 'Ad',
         'name_placeholder' => 'Çalışma Alanım',
+        'timezone' => 'Saat dilimi',
+        'timezone_auto' => 'Otomatik — tarayıcı saat dilimi (:tz)',
+        'timezone_description' => 'Takvim, plan ve gönderi tarihleri çalışma alanındaki herkese bu dilimde gösterilir.',
+        'datetime_format' => 'Tarih ve saat biçimi',
+        'datetime_format_auto' => 'Otomatik — dil varsayılanı',
+        'datetime_format_description' => 'Takvime ve tüm gönderi listelerine uygulanır.',
         'save' => 'Kaydet',
         'danger_description' => 'Geri alınamaz işlemler.',
         'delete_warning' => 'Uyarı',
diff --git a/lang/uk/settings.php b/lang/uk/settings.php
index f6d89fd2a..3d7511f83 100644
--- a/lang/uk/settings.php
+++ b/lang/uk/settings.php
@@ -52,12 +52,6 @@
         'avatar' => 'Аватар',
         'name' => 'Ім’я',
         'name_placeholder' => 'Повне ім’я',
-        'timezone' => 'Часовий пояс',
-        'timezone_auto' => 'Авто — часовий пояс браузера (:tz)',
-        'timezone_description' => 'Календар, розклад і дати постів показуються в цьому поясі всім учасникам воркспейсу.',
-        'datetime_format' => 'Формат дати й часу',
-        'datetime_format_auto' => 'Авто — за мовою інтерфейсу',
-        'datetime_format_description' => 'Застосовується до календаря та всіх списків постів.',
         'email' => 'Адреса email',
         'email_placeholder' => 'Адреса email',
         'email_unverified' => 'Вашу адресу email не підтверджено.',
@@ -146,6 +140,12 @@
         'members_description' => 'Керуйте учасниками та запрошеннями робочого простору',
         'name' => 'Назва',
         'name_placeholder' => 'Мій робочий простір',
+        'timezone' => 'Часовий пояс',
+        'timezone_auto' => 'Авто — часовий пояс браузера (:tz)',
+        'timezone_description' => 'Календар, розклад і дати постів показуються в цьому поясі всім учасникам воркспейсу.',
+        'datetime_format' => 'Формат дати й часу',
+        'datetime_format_auto' => 'Авто — за мовою інтерфейсу',
+        'datetime_format_description' => 'Застосовується до календаря та всіх списків постів.',
         'save' => 'Зберегти',
         'danger_description' => 'Незворотні дії.',
         'delete_warning' => 'Увага',
diff --git a/lang/zh/settings.php b/lang/zh/settings.php
index 7a04f403b..236cd3ddc 100644
--- a/lang/zh/settings.php
+++ b/lang/zh/settings.php
@@ -52,12 +52,6 @@
         'avatar' => '头像',
         'name' => '姓名',
         'name_placeholder' => '全名',
-        'timezone' => '时区',
-        'timezone_auto' => '自动 — 浏览器时区 (:tz)',
-        'timezone_description' => '日历、排期和帖子日期将以此时区向工作区所有成员显示。',
-        'datetime_format' => '日期和时间格式',
-        'datetime_format_auto' => '自动 — 随界面语言',
-        'datetime_format_description' => '应用于日历和所有帖子列表。',
         'email' => '邮箱地址',
         'email_placeholder' => '邮箱地址',
         'email_unverified' => '你的邮箱地址尚未验证。',
@@ -146,6 +140,12 @@
         'members_description' => '管理工作区成员和邀请',
         'name' => '名称',
         'name_placeholder' => '我的工作区',
+        'timezone' => '时区',
+        'timezone_auto' => '自动 — 浏览器时区 (:tz)',
+        'timezone_description' => '日历、排期和帖子日期将以此时区向工作区所有成员显示。',
+        'datetime_format' => '日期和时间格式',
+        'datetime_format_auto' => '自动 — 随界面语言',
+        'datetime_format_description' => '应用于日历和所有帖子列表。',
         'save' => '保存',
         'danger_description' => '不可撤销的操作。',
         'delete_warning' => '警告',
diff --git a/tests/Unit/WorkspaceSettingsTranslationTest.php b/tests/Unit/WorkspaceSettingsTranslationTest.php
new file mode 100644
index 000000000..e7eec2018
--- /dev/null
+++ b/tests/Unit/WorkspaceSettingsTranslationTest.php
@@ -0,0 +1,32 @@
+<?php
+
+declare(strict_types=1);
+
+test('workspace timezone and datetime format keys exist in every locale', function () {
+    $locales = collect(glob(lang_path('*')) ?: [])
+        ->filter(fn (string $path) => is_dir($path) && is_file("{$path}/settings.php"))
+        ->map(fn (string $path) => basename($path))
+        ->values()
+        ->all();
+
+    expect($locales)->not->toBeEmpty();
+
+    $keys = [
+        'workspace.timezone',
+        'workspace.timezone_auto',
+        'workspace.timezone_description',
+        'workspace.datetime_format',
+        'workspace.datetime_format_auto',
+        'workspace.datetime_format_description',
+    ];
+
+    foreach ($locales as $locale) {
+        $translations = require lang_path("{$locale}/settings.php");
+
+        foreach ($keys as $key) {
+            expect(data_get($translations, $key))
+                ->toBeString()
+                ->not->toBeEmpty("Missing {$key} in {$locale}");
+        }
+    }
+});