mirror of
https://github.com/MBombeck/HealthLog.git
synced 2026-11-10 05:12:14 +00:00
The H24 / H12 preference only reached makeFormatters().time. Surfaces that build their own Intl.DateTimeFormat — the sleep hypnogram axis, the workout list and detail headers — omitted the hour cycle, so an en-locale (or AUTO) user saw AM/PM even with H24 selected. The security activity feed and session list rendered raw toLocaleString(), bypassing both the locale and the preference entirely. Export hourCycleOptions from format-locale as the single source for the H12 / H24 / AUTO Intl options and spread it into the self-built formatters, preserving each surface's locale and timezone. Route the security cards through useFormatters().dateTime. Drop the date-time field's local copy of the helper. Guards: the helper contract, the en-US hour/minute call-site pattern (no AM/PM under H24, AM/PM under H12), and formatUpdatedLabel fed an H24 formatter for the briefing freshness label.
241 lines
8.2 KiB
TypeScript
241 lines
8.2 KiB
TypeScript
/**
|
|
* Locale-aware formatters.
|
|
*
|
|
* HealthLog's UI language is user-configurable (DE/EN). Numbers, dates, and
|
|
* times must render in the active locale — not in the hard-coded de-DE that
|
|
* lingered from the German-first era.
|
|
*
|
|
* Call via the `useFormatters()` client hook. For server-only code paths
|
|
* (jobs, API routes, PDF generation) pass the locale explicitly through
|
|
* `makeFormatters(locale)`. The optional second argument carries the
|
|
* per-user timezone (v1.4.25 W7) — when omitted the formatter falls back
|
|
* to `DISPLAY_TIMEZONE` so legacy callers keep rendering in Europe/Berlin.
|
|
*
|
|
* UTC is always preserved in the database.
|
|
*/
|
|
|
|
import type { Locale } from "./i18n/config";
|
|
|
|
/**
|
|
* Fallback timezone for surfaces that are not yet user-scoped (admin
|
|
* tables, audit log viewer, anything without a resolved user). User-
|
|
* scoped surfaces should call `makeFormatters(locale, userTz)` with
|
|
* the value from `resolveUserTimezone()`.
|
|
*/
|
|
export const DISPLAY_TIMEZONE = "Europe/Berlin";
|
|
|
|
/**
|
|
* Map our short locale ("de" / "en") to a full BCP-47 tag suitable for
|
|
* `Intl.*`. When we add locales, extend this map — do not rely on the short
|
|
* tag directly since browsers differ in how they handle "en" vs "en-US".
|
|
*/
|
|
const INTL_LOCALE_MAP: Record<Locale, string> = {
|
|
de: "de-DE",
|
|
en: "en-US",
|
|
fr: "fr-FR",
|
|
es: "es-ES",
|
|
it: "it-IT",
|
|
pl: "pl-PL",
|
|
};
|
|
|
|
export function resolveIntlLocale(locale: Locale): string {
|
|
return INTL_LOCALE_MAP[locale] ?? "en-US";
|
|
}
|
|
|
|
/**
|
|
* Hour-cycle display preference (mirrors the `TimeFormatPreference` Prisma
|
|
* enum). AUTO defers to the locale's own convention (en-US → AM/PM, de-DE →
|
|
* 24h); H12 forces AM/PM; H24 forces a 24-hour clock ("h23": midnight is
|
|
* 00:30, never 24:30). Display-time only — stored instants stay UTC.
|
|
*/
|
|
export type TimeFormatPreference = "AUTO" | "H12" | "H24";
|
|
|
|
/**
|
|
* Date-order display preference (mirrors the `DateFormatPreference` Prisma
|
|
* enum). AUTO defers to the locale's own field order (de-DE → dd.MM.yyyy,
|
|
* en-US → MM/dd/yyyy); DMY pins day-month-year, MDY pins month-day-year,
|
|
* YMD pins ISO yyyy-MM-dd. Display-time only — stored instants stay UTC.
|
|
*/
|
|
export type DateFormatPreference = "AUTO" | "DMY" | "MDY" | "YMD";
|
|
|
|
/**
|
|
* Intl options for the requested hour cycle. AUTO contributes nothing so
|
|
* `Intl.DateTimeFormat` falls back to the locale default.
|
|
*
|
|
* Exported so call sites that build their own `Intl.DateTimeFormat` (chart
|
|
* axes, list rows that deliberately render in the browser timezone rather
|
|
* than the profile zone) can still honour the user's H12 / H24 preference by
|
|
* spreading these options. Pair it with `useTimeFormatPreference()` on the
|
|
* client. Any new hour/minute renderer must route through this rather than
|
|
* re-deciding the cycle locally — that is the regression this single source
|
|
* prevents (an `en`-locale or AUTO user got AM/PM even with H24 selected
|
|
* wherever a formatter omitted the cycle).
|
|
*/
|
|
export function hourCycleOptions(
|
|
timeFormat: TimeFormatPreference,
|
|
): Intl.DateTimeFormatOptions {
|
|
switch (timeFormat) {
|
|
case "H12":
|
|
return { hour12: true };
|
|
case "H24":
|
|
return { hourCycle: "h23" };
|
|
default:
|
|
return {};
|
|
}
|
|
}
|
|
|
|
/**
|
|
* The Intl locale tag a non-AUTO date preference renders through. The
|
|
* field order is a property of the BCP-47 locale, not a `DateTimeFormat`
|
|
* option, so we pin a canonical locale whose default numeric date order
|
|
* matches the requested preference and reuse the user's own locale only
|
|
* for AUTO. DMY is rendered through de-DE so it carries the app-wide
|
|
* dotted separator (dd.MM.yyyy); MDY through en-US (MM/dd/yyyy); YMD
|
|
* through the ISO-canonical en-CA / sv (yyyy-MM-dd). The day/month/year
|
|
* `2-digit`/`numeric` field set is supplied by the caller.
|
|
*/
|
|
function dateOrderLocale(
|
|
dateFormat: DateFormatPreference,
|
|
localeTag: string,
|
|
): string {
|
|
switch (dateFormat) {
|
|
case "DMY":
|
|
return "de-DE";
|
|
case "MDY":
|
|
return "en-US";
|
|
case "YMD":
|
|
// en-CA renders numeric dates as yyyy-MM-dd across engines; it is the
|
|
// ISO-8601 default order without pulling a locale the app doesn't ship.
|
|
return "en-CA";
|
|
default:
|
|
return localeTag;
|
|
}
|
|
}
|
|
|
|
type DateInput = Date | string | number;
|
|
|
|
function asDate(value: DateInput): Date {
|
|
return value instanceof Date ? value : new Date(value);
|
|
}
|
|
|
|
export interface Formatters {
|
|
/** Integer or decimal with the active locale's decimal separator. */
|
|
number: (value: number, fractionDigits?: number) => string;
|
|
/** Same as `number` but thousands-grouped. */
|
|
integer: (value: number) => string;
|
|
/** Percentage, e.g. 0.835 → "83,5 %" in DE / "83.5%" in EN. */
|
|
percent: (value: number, fractionDigits?: number) => string;
|
|
/** Short date, e.g. "19.02.2026" / "02/19/2026". */
|
|
date: (value: DateInput) => string;
|
|
/** Short date without year, e.g. "19.02." / "Feb 19". */
|
|
dateShort: (value: DateInput) => string;
|
|
/** Full date + time; hour cycle follows the `timeFormat` preference. */
|
|
dateTime: (value: DateInput) => string;
|
|
/** Time only, e.g. "14:30" or "2:30 PM" per the `timeFormat` preference. */
|
|
time: (value: DateInput) => string;
|
|
/** Short weekday + date, e.g. "Do., 19.02." / "Thu, Feb 19". */
|
|
dateWithWeekday: (value: DateInput) => string;
|
|
/** For axis labels: 3-letter month abbreviation. */
|
|
monthShort: (value: DateInput) => string;
|
|
}
|
|
|
|
export function makeFormatters(
|
|
locale: Locale,
|
|
userTz?: string,
|
|
timeFormat: TimeFormatPreference = "AUTO",
|
|
dateFormat: DateFormatPreference = "AUTO",
|
|
): Formatters {
|
|
const intlLocale = resolveIntlLocale(locale);
|
|
const tz = userTz && userTz.length > 0 ? userTz : DISPLAY_TIMEZONE;
|
|
const hourOpts = hourCycleOptions(timeFormat);
|
|
// Field-order locale for the numeric date renderers. AUTO keeps the
|
|
// user's own locale; DMY/MDY/YMD pin a canonical locale whose default
|
|
// numeric order matches. `monthShort` deliberately stays on `intlLocale`
|
|
// so axis month names follow the UI language, not the date-order pin.
|
|
const dateLocale = dateOrderLocale(dateFormat, intlLocale);
|
|
|
|
return {
|
|
number: (value, fractionDigits) =>
|
|
new Intl.NumberFormat(intlLocale, {
|
|
minimumFractionDigits: fractionDigits,
|
|
maximumFractionDigits: fractionDigits,
|
|
}).format(value),
|
|
|
|
integer: (value) =>
|
|
new Intl.NumberFormat(intlLocale, { maximumFractionDigits: 0 }).format(
|
|
value,
|
|
),
|
|
|
|
percent: (value, fractionDigits = 0) =>
|
|
new Intl.NumberFormat(intlLocale, {
|
|
style: "percent",
|
|
minimumFractionDigits: fractionDigits,
|
|
maximumFractionDigits: fractionDigits,
|
|
}).format(value),
|
|
|
|
date: (value) =>
|
|
asDate(value).toLocaleDateString(dateLocale, {
|
|
timeZone: tz,
|
|
day: "2-digit",
|
|
month: "2-digit",
|
|
year: "numeric",
|
|
}),
|
|
|
|
dateShort: (value) =>
|
|
asDate(value).toLocaleDateString(dateLocale, {
|
|
timeZone: tz,
|
|
day: "2-digit",
|
|
month: "2-digit",
|
|
}),
|
|
|
|
dateTime: (value) =>
|
|
asDate(value).toLocaleString(dateLocale, {
|
|
timeZone: tz,
|
|
day: "2-digit",
|
|
month: "2-digit",
|
|
year: "numeric",
|
|
hour: "2-digit",
|
|
minute: "2-digit",
|
|
...hourOpts,
|
|
}),
|
|
|
|
time: (value) =>
|
|
asDate(value).toLocaleTimeString(intlLocale, {
|
|
timeZone: tz,
|
|
hour: "2-digit",
|
|
minute: "2-digit",
|
|
...hourOpts,
|
|
}),
|
|
|
|
dateWithWeekday: (value) =>
|
|
asDate(value).toLocaleDateString(dateLocale, {
|
|
timeZone: tz,
|
|
weekday: "short",
|
|
day: "2-digit",
|
|
month: "2-digit",
|
|
}),
|
|
|
|
monthShort: (value) =>
|
|
asDate(value).toLocaleDateString(intlLocale, {
|
|
timeZone: tz,
|
|
month: "short",
|
|
}),
|
|
};
|
|
}
|
|
|
|
/**
|
|
* Parse locale from a `Accept-Language` header or `healthlog-locale` cookie.
|
|
* Server-side helper for jobs, API routes, and PDF generation where there is
|
|
* no React context.
|
|
*/
|
|
export function parseLocaleFromAcceptLanguage(header: string | null): Locale {
|
|
if (!header) return "en";
|
|
const primary = header.split(",")[0]?.trim().toLowerCase() ?? "";
|
|
if (primary.startsWith("de")) return "de";
|
|
if (primary.startsWith("fr")) return "fr";
|
|
if (primary.startsWith("es")) return "es";
|
|
if (primary.startsWith("it")) return "it";
|
|
if (primary.startsWith("pl")) return "pl";
|
|
return "en";
|
|
}
|