itlxrd/Psychotoxical-psysonic
1
0
Fork 0
mirror of https://github.com/Psychotoxical/psysonic.git synced 2026-07-21 23:05:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(settings): clock format "auto" follows the app's UI language (#758)

Browse Source 
Auto previously passed `undefined` to `toLocaleTimeString`, which falls
back to the JS engine's default locale. Inside WebKitGTK that resolves
to `en-US` for many users regardless of `LC_TIME`, so the queue ETA and
sleep-timer preview rendered 12h AM/PM even when the OS clock was 24h.

Pass `i18n.language` instead, matching the convention already used in
the theme-scheduler hour picker (AppearanceTab.tsx). Explicit 12h/24h
choices still override.
This commit is contained in:
Frank Stellmacher
2026-05-17 19:53:11 +02:00
committed by GitHub
parent 33ffb94083
commit 8ac5a69a7c
3 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/PlaybackDelayModal.tsx
+2 -2
View File
@@ -46,7 +46,7 @@ export interface PlaybackDelayModalProps {
}
export default function PlaybackDelayModal({ open, onClose, anchorRef }: PlaybackDelayModalProps) {
const { t } = useTranslation();
const { t, i18n } = useTranslation();
const {
isPlaying,
currentTrack,
@@ -157,7 +157,7 @@ export default function PlaybackDelayModal({ open, onClose, anchorRef }: Playbac
const clockFormat = useAuthStore(s => s.clockFormat);
const previewSeconds = hoverSeconds ?? customSeconds;
const previewAtMs = previewSeconds != null ? nowTick + previewSeconds * 1000 : null;
const previewClock = previewAtMs != null ? formatClockTime(previewAtMs, clockFormat) : null;
const previewClock = previewAtMs != null ? formatClockTime(previewAtMs, clockFormat, i18n.language) : null;
if (!open) return null;
src/components/queuePanel/QueueHeader.tsx
+3 -1
View File
@@ -1,5 +1,6 @@
import { useMemo } from 'react';
import { ChevronDown, ListMusic } from 'lucide-react';
import { useTranslation } from 'react-i18next';
import type { TFunction } from 'i18next';
import { usePlayerStore } from '../../store/playerStore';
import { useAuthStore } from '../../store/authStore';
@@ -26,6 +27,7 @@ export function QueueHeader({
const currentTime = usePlayerStore((s) => Math.floor(s.currentTime / 30) * 30);
const isPlaying = usePlayerStore((s) => s.isPlaying);
const clockFormat = useAuthStore((s) => s.clockFormat);
const { i18n } = useTranslation();
const totalSecs = useMemo(() =>
queue.reduce((acc: number, track: Track) => acc + (track.duration || 0), 0),
@@ -42,7 +44,7 @@ export function QueueHeader({
if (queue.length > 0) {
if (durationMode === 'total') dur = formatLongDuration(Math.floor(totalSecs));
else if (durationMode === 'remaining') dur = `-${formatLongDuration(Math.floor(remainingSecs))}`;
else dur = formatClockTime(Date.now() + remainingSecs * 1000, clockFormat);
else dur = formatClockTime(Date.now() + remainingSecs * 1000, clockFormat, i18n.language);
}
const nextMode: DurationMode =