diff --git a/packages/web-app-photo-addon/src/components/PhotoLightbox.vue b/packages/web-app-photo-addon/src/components/PhotoLightbox.vue index eb40ab19c..9c2f97220 100644 --- a/packages/web-app-photo-addon/src/components/PhotoLightbox.vue +++ b/packages/web-app-photo-addon/src/components/PhotoLightbox.vue @@ -890,12 +890,12 @@ onUnmounted(() => { function formatExifDate(dateStr: string): string { try { const d = new Date(dateStr) - return d.toLocaleDateString(getUserLocale(), { + return d.toLocaleString(getUserLocale(), { year: 'numeric', month: 'short', day: 'numeric', hour: '2-digit', - minute: '2-digit' + minute: '2-digit', }) } catch { return dateStr diff --git a/packages/web-app-photo-addon/src/composables/usePhotos.ts b/packages/web-app-photo-addon/src/composables/usePhotos.ts index f0da1bed1..a28afc13f 100644 --- a/packages/web-app-photo-addon/src/composables/usePhotos.ts +++ b/packages/web-app-photo-addon/src/composables/usePhotos.ts @@ -269,7 +269,8 @@ export function usePhotos() { /** * Format date key for display based on mode */ - function formatDateKey(dateKey: string, mode: GroupMode): string { + function formatDateKey(dateKey: string, mode: GroupMode, locale?: string): string { + const loc = locale || undefined const today = new Date() const yesterday = new Date(today) yesterday.setDate(yesterday.getDate() - 1) @@ -280,13 +281,13 @@ export function usePhotos() { case 'month': { const [year, month] = dateKey.split('-').map(Number) const date = new Date(year, month - 1, 1) - return date.toLocaleDateString(undefined, { year: 'numeric', month: 'long' }) + return date.toLocaleDateString(loc, { year: 'numeric', month: 'long' }) } case 'week': { const [year, weekPart] = dateKey.split('-W') const weekNum = parseInt(weekPart) const { start: weekStart, end: weekEnd } = getWeekDateRange(parseInt(year), weekNum) - return `${weekStart.toLocaleDateString(undefined, { month: 'short', day: 'numeric' })} - ${weekEnd.toLocaleDateString(undefined, { month: 'short', day: 'numeric', year: 'numeric' })}` + return `${weekStart.toLocaleDateString(loc, { month: 'short', day: 'numeric' })} - ${weekEnd.toLocaleDateString(loc, { month: 'short', day: 'numeric', year: 'numeric' })}` } case 'day': default: { @@ -294,7 +295,7 @@ export function usePhotos() { const date = new Date(year, month - 1, day) if (date.toDateString() === today.toDateString()) return 'Today' if (date.toDateString() === yesterday.toDateString()) return 'Yesterday' - return date.toLocaleDateString(undefined, { + return date.toLocaleDateString(loc, { weekday: 'long', year: 'numeric', month: 'long', diff --git a/packages/web-app-photo-addon/src/views/PhotosView.vue b/packages/web-app-photo-addon/src/views/PhotosView.vue index 94377ca4a..0dd51a62e 100644 --- a/packages/web-app-photo-addon/src/views/PhotosView.vue +++ b/packages/web-app-photo-addon/src/views/PhotosView.vue @@ -35,7 +35,7 @@ - + {{ $gettext('EXIF only') }}