Skip to content

Open-source personal finance manager. Self-hosted, privacy-first.

feat(settings): configurable number and date formats (#264)

Tássio Noronha47eedd693875
diff --git a/backend/app/api/admin.py b/backend/app/api/admin.py
index 9f924eac..0fa4e87b 100644
--- a/backend/app/api/admin.py
+++ b/backend/app/api/admin.py
@@ -25,6 +25,8 @@ ALLOWED_SETTINGS = {
"use_provider_categories",
"theme_color_light",
"theme_color_dark",
+ "number_format",
+ "date_format",
}
@@ -127,6 +129,8 @@ async def update_setting(
"registration_enabled": {"true", "false"},
"credit_card_accounting_mode": {"cash", "accrual"},
"use_provider_categories": {"true", "false"},
+ "number_format": {"auto", "comma_dot", "dot_comma", "space_comma"},
+ "date_format": {"auto", "dmy", "mdy", "ymd"},
}
if key in SETTING_VALIDATORS and data.value not in SETTING_VALIDATORS[key]:
@@ -172,6 +176,30 @@ async def accounting_mode(
return {"mode": mode}
[email protected]("/number-format")
+async def number_format(
+ session: AsyncSession = Depends(get_async_session),
+ _user: User = Depends(current_active_user),
+):
+ """Global display format for numbers and dates. Readable by any signed-in
+ user (not just admins) so the frontend can format consistently for everyone.
+ Defaults to 'auto' — derive separators from each user's display currency."""
+ fmt = await admin_service.get_number_format(session)
+ return {"format": fmt}
+
+
[email protected]("/date-format")
+async def date_format(
+ session: AsyncSession = Depends(get_async_session),
+ _user: User = Depends(current_active_user),
+):
+ """Global display format for dates. Readable by any signed-in user.
+ Defaults to 'auto' — derive the field order from the number format /
+ display currency. Month names always follow the user's app language."""
+ fmt = await admin_service.get_date_format(session)
+ return {"format": fmt}
+
+
async def check_registration_enabled(
request: Request,
session: AsyncSession = Depends(get_async_session),
diff --git a/backend/app/services/admin_service.py b/backend/app/services/admin_service.py
index 513250e6..8ba5e5e8 100644
--- a/backend/app/services/admin_service.py
+++ b/backend/app/services/admin_service.py
@@ -255,6 +255,32 @@ async def get_credit_card_accounting_mode(session: AsyncSession) -> str:
return "cash"
+async def get_number_format(session: AsyncSession) -> str:
+ """Return the global number/date display format.
+
+ Global app setting controlling thousands/decimal separators (and, on the
+ frontend, the locale used for date display). One of 'auto', 'comma_dot'
+ (1,000.00), 'dot_comma' (1.000,00) or 'space_comma' (1 000,00). Defaults to
+ 'auto', which derives the format from the user's display currency."""
+ setting = await get_app_setting(session, "number_format")
+ if setting and setting.value in ("auto", "comma_dot", "dot_comma", "space_comma"):
+ return setting.value
+ return "auto"
+
+
+async def get_date_format(session: AsyncSession) -> str:
+ """Return the global date display format.
+
+ Global app setting controlling the date field order. One of 'auto'
+ (derive from the number format / currency), 'dmy' (DD/MM/YYYY), 'mdy'
+ (MM/DD/YYYY) or 'ymd' (YYYY-MM-DD). Month names follow the user's app
+ language regardless. Defaults to 'auto'."""
+ setting = await get_app_setting(session, "date_format")
+ if setting and setting.value in ("auto", "dmy", "mdy", "ymd"):
+ return setting.value
+ return "auto"
+
+
async def use_provider_categories(session: AsyncSession) -> bool:
"""Whether sync should map provider-supplied categories (e.g. Pluggy's
`category` field) onto the user's seeded categories via PLUGGY_CATEGORY_MAP.
diff --git a/frontend/src/components/app-layout.tsx b/frontend/src/components/app-layout.tsx
index 6d2abe52..2bd78551 100644
--- a/frontend/src/components/app-layout.tsx
+++ b/frontend/src/components/app-layout.tsx
@@ -2,6 +2,7 @@ import { useState, useCallback, useEffect } from 'react'
import { getAccountName } from '@/lib/account-utils'
import { Link, Outlet, useLocation, useNavigate } from 'react-router-dom'
import { useTranslation } from 'react-i18next'
+import { useDisplayLocale } from '@/hooks/use-display-locale'
import { useQuery } from '@tanstack/react-query'
import { useAuth } from '@/contexts/auth-context'
import { auth as authApi, backup as backupApi, admin as adminApi } from '@/lib/api'
@@ -99,10 +100,10 @@ function formatCurrency(value: number, currency = 'USD', locale = 'en-US') {
}
export function AppLayout() {
- const { t, i18n } = useTranslation()
+ const { t } = useTranslation()
const { user, logout, updateUser } = useAuth()
const userCurrency = user?.preferences?.currency_display ?? 'USD'
- const locale = i18n.language === 'en' ? 'en-US' : i18n.language
+ const locale = useDisplayLocale()
const { theme, setTheme, resolvedTheme } = useTheme()
const location = useLocation()
const [sidebarOpen, setSidebarOpen] = useState(false)
@@ -459,7 +460,7 @@ export function AppLayout() {
</div>
<div className="text-right shrink-0 ml-2">
<span className={`block tabular-nums font-medium text-xs ${balance < 0 ? 'text-rose-400' : 'text-sidebar-foreground'}`}>
- {mask(formatCurrency(balance, acc.currency))}
+ {mask(formatCurrency(balance, acc.currency, locale))}
</span>
{pctChange !== null && (
<span className={`block text-[10px] tabular-nums font-medium ${pctChange >= 0 ? 'text-emerald-400' : 'text-rose-400'}`}>
diff --git a/frontend/src/components/command-palette.tsx b/frontend/src/components/command-palette.tsx
index 8289bcb1..24691eab 100644
--- a/frontend/src/components/command-palette.tsx
+++ b/frontend/src/components/command-palette.tsx
@@ -3,6 +3,7 @@ import { Command } from 'cmdk'
import { Dialog as DialogPrimitive } from 'radix-ui'
import { useNavigate } from 'react-router-dom'
import { useTranslation } from 'react-i18next'
+import { useDisplayLocale } from '@/hooks/use-display-locale'
import { useQuery } from '@tanstack/react-query'
import {
Search,
@@ -258,13 +259,13 @@ export interface CommandPaletteProps {
}
export function CommandPalette({ open, onOpenChange }: CommandPaletteProps) {
- const { t, i18n } = useTranslation()
+ const { t } = useTranslation()
const navigate = useNavigate()
const [query, setQuery] = useState('')
const [debounced, setDebounced] = useState('')
const recents = useSyncExternalStore(subscribeRecents, getRecentSnapshot, getRecentSnapshot)
const inputRef = useRef<HTMLInputElement>(null)
- const locale = i18n.language === 'en' ? 'en-US' : i18n.language
+ const locale = useDisplayLocale()
// Focus the input whenever the palette opens. The cmdk Command is re-keyed
// on `open` so results and selection reset automatically. We reset our own
diff --git a/frontend/src/components/import-review-table.tsx b/frontend/src/components/import-review-table.tsx
index 3dee0798..335d1d77 100644
--- a/frontend/src/components/import-review-table.tsx
+++ b/frontend/src/components/import-review-table.tsx
@@ -22,6 +22,7 @@ interface ImportReviewTableProps {
groups: CategoryGroup[]
userCurrency: string
locale: string
+ dateLocale: string
searchQuery: string
filterCategoryIds: string[]
filterUncategorized: boolean
@@ -42,6 +43,7 @@ export function ImportReviewTable({
groups,
userCurrency,
locale,
+ dateLocale,
searchQuery,
filterCategoryIds,
filterUncategorized,
@@ -156,7 +158,7 @@ export function ImportReviewTable({
/>
</TableCell>
<TableCell className="py-2.5 text-xs text-muted-foreground whitespace-nowrap">
- {new Date(tx.date).toLocaleDateString(locale)}
+ {new Date(tx.date).toLocaleDateString(dateLocale)}
</TableCell>
<TableCell className={`py-2.5 text-sm ${tx.excluded ? 'line-through text-muted-foreground' : 'text-foreground'}`}>
{tx.description}
diff --git a/frontend/src/components/link-transfer-dialog.tsx b/frontend/src/components/link-transfer-dialog.tsx
index 00936664..afb3c622 100644
--- a/frontend/src/components/link-transfer-dialog.tsx
+++ b/frontend/src/components/link-transfer-dialog.tsx
@@ -1,6 +1,7 @@
import { useMemo, useState } from 'react'
import { getAccountName } from '@/lib/account-utils'
import { useTranslation } from 'react-i18next'
+import { useDisplayLocale, useDateLocale } from '@/hooks/use-display-locale'
import { useQuery } from '@tanstack/react-query'
import { Button } from '@/components/ui/button'
import {
@@ -28,9 +29,10 @@ type CounterpartCardProps = {
currency: string
sign: '+' | '−'
locale: string
+ dateLocale: string
}
-function CounterpartCard({ label, description, account, date, amount, currency, sign, locale }: CounterpartCardProps) {
+function CounterpartCard({ label, description, account, date, amount, currency, sign, locale, dateLocale }: CounterpartCardProps) {
const colorClass = sign === '+' ? 'text-emerald-600' : 'text-rose-500'
return (
<div className="rounded-lg border border-border bg-muted/30 p-3">
@@ -42,7 +44,7 @@ function CounterpartCard({ label, description, account, date, amount, currency,
</p>
<p className="text-xs text-muted-foreground truncate">{account}</p>
<p className="text-xs text-muted-foreground mt-1">
- {new Date(date + 'T00:00:00').toLocaleDateString(locale)}
+ {new Date(date + 'T00:00:00').toLocaleDateString(dateLocale)}{/* date order from setting, words from app language */}
</p>
<p className={`text-sm font-bold tabular-nums ${colorClass} mt-2`}>
{sign}
@@ -78,8 +80,9 @@ export function LinkTransferDialog({
onCreateCounterpart,
loading,
}: Props) {
- const { t, i18n } = useTranslation()
- const locale = i18n.language === 'en' ? 'en-US' : i18n.language
+ const { t } = useTranslation()
+ const locale = useDisplayLocale()
+ const dateLocale = useDateLocale()
const isDirectMode = !!(debit && credit)
const isPickerMode = !!anchor && !isDirectMode
@@ -182,6 +185,7 @@ export function LinkTransferDialog({
currency={anchor!.currency}
sign={anchor!.type === 'debit' ? '−' : '+'}
locale={locale}
+ dateLocale={dateLocale}
/>
<div className="relative">
@@ -237,7 +241,7 @@ export function LinkTransferDialog({
)}
</div>
<p className="text-xs text-muted-foreground truncate">
- {account ? getAccountName(account) : '—'} · {new Date(c.date + 'T00:00:00').toLocaleDateString(locale)}
+ {account ? getAccountName(account) : '—'} · {new Date(c.date + 'T00:00:00').toLocaleDateString(dateLocale)}
</p>
</div>
<p className={`text-sm font-bold tabular-nums ${colorClass} shrink-0`}>
@@ -329,6 +333,7 @@ export function LinkTransferDialog({
currency={effectiveDebit.currency}
sign="−"
locale={locale}
+ dateLocale={dateLocale}
/>
<div className="flex items-center">
<ArrowRight size={18} className="text-muted-foreground" />
@@ -342,6 +347,7 @@ export function LinkTransferDialog({
currency={effectiveCredit.currency}
sign="+"
locale={locale}
+ dateLocale={dateLocale}
/>
</div>
diff --git a/frontend/src/components/transaction-attachments.tsx b/frontend/src/components/transaction-attachments.tsx
index 57c47e9e..ec3cecf2 100644
--- a/frontend/src/components/transaction-attachments.tsx
+++ b/frontend/src/components/transaction-attachments.tsx
@@ -1,5 +1,6 @@
import { useRef, useState, useEffect, useCallback } from 'react'
import { useTranslation } from 'react-i18next'
+import { useDateLocale } from '@/hooks/use-display-locale'
import { useQuery, useMutation, useQueryClient } from '@tanstack/react-query'
import { transactions as transactionsApi, settings as settingsApi } from '@/lib/api'
import { toast } from 'sonner'
@@ -57,7 +58,7 @@ export function TransactionAttachments({
onPreviewChange?: (preview: AttachmentPreview | null) => void
activePreviewId?: string | null
}) {
- const { t, i18n } = useTranslation()
+ const { t } = useTranslation()
const queryClient = useQueryClient()
const fileInputRef = useRef<HTMLInputElement>(null)
const lastClickedRef = useRef<string | null>(null)
@@ -69,8 +70,7 @@ export function TransactionAttachments({
const renameInputRef = useRef<HTMLInputElement>(null)
const [thumbnails, setThumbnails] = useState<Record<string, string>>({})
const [optimisticFiles, setOptimisticFiles] = useState<OptimisticAttachment[]>([])
-
- const locale = i18n.language === 'en' ? 'en-US' : i18n.language
+ const dateLocale = useDateLocale()
const queryKey = ['attachments', transactionId]
const { data: attachmentSettings } = useQuery({
@@ -528,7 +528,7 @@ export function TransactionAttachments({
<p className="text-[10px] text-muted-foreground mt-1 leading-tight">
{isUploading
? t('transactions.attachmentsUploading')
- : `${formatFileSize(att.size)} · ${new Date((att as Attachment).created_at).toLocaleDateString(locale, { month: 'short', day: 'numeric' })}`
+ : `${formatFileSize(att.size)} · ${new Date((att as Attachment).created_at).toLocaleDateString(dateLocale, { month: 'short', day: 'numeric' })}`
}
</p>
</div>
diff --git a/frontend/src/components/transaction-dialog.tsx b/frontend/src/components/transaction-dialog.tsx
index 92da0bbf..ef51a9f2 100644
--- a/frontend/src/components/transaction-dialog.tsx
+++ b/frontend/src/components/transaction-dialog.tsx
@@ -1,6 +1,7 @@
import { useState, useEffect, useCallback, useRef } from 'react'
import { getAccountName } from '@/lib/account-utils'
import { useTranslation } from 'react-i18next'
+import { useDateLocale } from '@/hooks/use-display-locale'
import { useQuery } from '@tanstack/react-query'
import { useAuth } from '@/contexts/auth-context'
import { currencies as currenciesApi, transactions as transactionsApi, settings as settingsApi, payees as payeesApi } from '@/lib/api'
@@ -308,10 +309,10 @@ function TransactionForm({
activePreviewId: string | null
hasPreview: boolean
}) {
- const { t, i18n } = useTranslation()
+ const { t } = useTranslation()
const { user } = useAuth()
const userCurrency = user?.preferences?.currency_display ?? 'USD'
- const locale = i18n.language === 'en' ? 'en-US' : i18n.language
+ const dateLocale = useDateLocale()
const { data: supportedCurrencies } = useQuery({
queryKey: ['currencies'],
queryFn: currenciesApi.list,
@@ -599,7 +600,7 @@ function TransactionForm({
<div className="flex items-center gap-2 p-3 text-sm bg-blue-50 dark:bg-blue-950 border border-blue-200 dark:border-blue-800 rounded-md">
<span>{t('transactions.recurringInfo', {
frequency: t(`recurring.${recurringMatch.frequency}`),
- next: new Date(recurringMatch.next_occurrence).toLocaleDateString(locale),
+ next: new Date(recurringMatch.next_occurrence).toLocaleDateString(dateLocale),
})}</span>
</div>
)}
@@ -774,16 +775,16 @@ function TransactionForm({
return (
<div className="space-y-2">
<Label>
- {t('transactions.effectiveBillDate', 'Data efetiva da fatura')}{' '}
+ {t('transactions.effectiveBillDate', 'Effective bill date')}{' '}
<span className="text-muted-foreground font-normal text-xs">
- ({t('transactions.effectiveBillDateHint', 'manual, sobrescreve o ciclo automático')})
+ ({t('transactions.effectiveBillDateHint', 'manual, overrides the automatic cycle')})
</span>
</Label>
<div className="inline-flex items-center gap-1">
<DatePickerInput
value={effectiveBillDate}
onChange={setEffectiveBillDate}
- placeholder={t('transactions.effectiveBillDatePlaceholder', 'Vencimento da fatura (opcional)')}
+ placeholder={t('transactions.effectiveBillDatePlaceholder', 'Bill due date (optional)')}
/>
{effectiveBillDate && (
<button
diff --git a/frontend/src/components/transaction-drill-down.tsx b/frontend/src/components/transaction-drill-down.tsx
index f1d1d359..ceb7d8c4 100644
--- a/frontend/src/components/transaction-drill-down.tsx
+++ b/frontend/src/components/transaction-drill-down.tsx
@@ -1,5 +1,6 @@
import { useEffect, useRef, useMemo } from 'react'
import { useTranslation } from 'react-i18next'
+import { useDisplayLocale, useDateLocale } from '@/hooks/use-display-locale'
import { useQuery } from '@tanstack/react-query'
import { transactions as transactionsApi, dashboard, admin } from '@/lib/api'
import { AlertTriangle, Info, Paperclip, X } from 'lucide-react'
@@ -47,11 +48,12 @@ export function TransactionDrillDown({
onClose: () => void
onTransactionClick?: (tx: Transaction) => void
}) {
- const { t, i18n } = useTranslation()
+ const { t } = useTranslation()
const { user } = useAuth()
const { mask } = usePrivacyMode()
const userCurrency = user?.preferences?.currency_display ?? 'USD'
- const locale = i18n.language === 'en' ? 'en-US' : i18n.language
+ const locale = useDisplayLocale()
+ const dateLocale = useDateLocale()
const panelRef = useRef<HTMLDivElement>(null)
const { data, isLoading } = useQuery({
@@ -257,7 +259,7 @@ export function TransactionDrillDown({
)}
</div>
<p className="text-xs text-muted-foreground">
- {new Date(item.date + 'T00:00:00').toLocaleDateString(locale)}
+ {new Date(item.date + 'T00:00:00').toLocaleDateString(dateLocale)}
{item.categoryName && ` · ${item.categoryName}`}
</p>
</div>
diff --git a/frontend/src/components/transaction-splits-section.tsx b/frontend/src/components/transaction-splits-section.tsx
index 202c496f..46426c0e 100644
--- a/frontend/src/components/transaction-splits-section.tsx
+++ b/frontend/src/components/transaction-splits-section.tsx
@@ -1,5 +1,6 @@
import { useEffect, useMemo, useRef, useState } from 'react'
import { useTranslation } from 'react-i18next'
+import { useDisplayLocale } from '@/hooks/use-display-locale'
import { useQuery } from '@tanstack/react-query'
import { Users } from 'lucide-react'
@@ -57,6 +58,7 @@ export function TransactionSplitsSection({
onValidityChange?: (valid: boolean) => void
}) {
const { t } = useTranslation()
+ const locale = useDisplayLocale()
const [enabled, setEnabled] = useState(value !== null)
const [groupId, setGroupId] = useState<string>('')
const [shareType, setShareType] = useState<ShareType>(value?.share_type ?? 'equal')
@@ -269,7 +271,7 @@ export function TransactionSplitsSection({
</label>
{computed !== null && (
<span className="text-xs text-muted-foreground tabular-nums">
- {formatCurrency(computed, currency)}
+ {formatCurrency(computed, currency, locale)}
</span>
)}
{shareType === 'exact' && row.selected && (
diff --git a/frontend/src/components/transactions-filter-bar.tsx b/frontend/src/components/transactions-filter-bar.tsx
index ca8cb0ee..9e8cad69 100644
--- a/frontend/src/components/transactions-filter-bar.tsx
+++ b/frontend/src/components/transactions-filter-bar.tsx
@@ -1,6 +1,7 @@
import { useMemo, useRef, useState } from 'react'
import { getAccountName } from '@/lib/account-utils'
import { useTranslation } from 'react-i18next'
+import { useDisplayLocale, useDateLocale } from '@/hooks/use-display-locale'
import { format, startOfMonth, startOfYear, subDays } from 'date-fns'
import {
ArrowUpDown,
@@ -110,7 +111,8 @@ export function TransactionsFilterBar({
groups,
}: TransactionsFilterBarProps) {
const { t, i18n } = useTranslation()
- const locale = i18n.language === 'en' ? 'en-US' : i18n.language
+ const locale = useDisplayLocale()
+ const dateLocale = useDateLocale()
const dateFnsLocale = i18n.language === 'pt-BR' ? ptBR : enUS
const [menuOpen, setMenuOpen] = useState(false)
const [accountSubOpen, setAccountSubOpen] = useState(false)
@@ -199,14 +201,14 @@ export function TransactionsFilterBar({
const dateLabel = useMemo(() => {
if (!filterFrom && !filterTo) return null
const fmt = (iso: string) =>
- new Date(iso + 'T00:00:00').toLocaleDateString(locale, {
+ new Date(iso + 'T00:00:00').toLocaleDateString(dateLocale, {
day: '2-digit',
month: 'short',
})
if (filterFrom && filterTo) return `${fmt(filterFrom)} — ${fmt(filterTo)}`
if (filterFrom) return `≥ ${fmt(filterFrom)}`
return `≤ ${fmt(filterTo)}`
- }, [filterFrom, filterTo, locale])
+ }, [filterFrom, filterTo, dateLocale])
const amountLabel = useMemo(() => {
if (!filterMinAmount && !filterMaxAmount) return null
@@ -925,7 +927,7 @@ export function TransactionsFilterBar({
</p>
<p className="mt-0.5 text-[11px] text-muted-foreground/70">
{draftFrom || draftTo
- ? formatRange(draftFrom, draftTo, locale)
+ ? formatRange(draftFrom, draftTo, dateLocale)
: t('transactions.filtersBar.pickRange')}
</p>
</div>
diff --git a/frontend/src/components/ui/date-picker-input.tsx b/frontend/src/components/ui/date-picker-input.tsx
index d0e06f47..c851762e 100644
--- a/frontend/src/components/ui/date-picker-input.tsx
+++ b/frontend/src/components/ui/date-picker-input.tsx
@@ -3,6 +3,7 @@ import { format } from 'date-fns'
import { ptBR, enUS } from 'date-fns/locale'
import { CalendarIcon } from 'lucide-react'
import { useTranslation } from 'react-i18next'
+import { useDateLocale } from '@/hooks/use-display-locale'
import { Popover, PopoverTrigger, PopoverContent } from '@/components/ui/popover'
import { Calendar } from '@/components/ui/calendar'
import { cn } from '@/lib/utils'
@@ -27,11 +28,11 @@ function DatePickerInput({
const { i18n } = useTranslation()
const [open, setOpen] = useState(false)
const dateFnsLocale = i18n.language === 'pt-BR' ? ptBR : enUS
- const locale = i18n.language === 'en' ? 'en-US' : i18n.language
+ const dateLocale = useDateLocale()
const selectedDate = value ? new Date(value + 'T00:00:00') : undefined
const displayText = selectedDate
- ? selectedDate.toLocaleDateString(locale)
+ ? selectedDate.toLocaleDateString(dateLocale)
: placeholder || 'dd/mm/yyyy'
return (
diff --git a/frontend/src/hooks/use-display-locale.ts b/frontend/src/hooks/use-display-locale.ts
new file mode 100644
index 00000000..8a2d9e33
--- /dev/null
+++ b/frontend/src/hooks/use-display-locale.ts
@@ -0,0 +1,66 @@
+import { useQuery } from '@tanstack/react-query'
+import { useTranslation } from 'react-i18next'
+import { admin } from '@/lib/api'
+import { resolveDisplayLocale, resolveDateLocale } from '@/lib/format'
+import { resolveSupportedLang } from '@/lib/i18n'
+import { useAuth } from '@/contexts/auth-context'
+
+/**
+ * Resolve the BCP-47 locale used for displaying currency and dates.
+ *
+ * Combines the admin-wide `number_format` setting with the signed-in user's
+ * display currency. When the admin leaves the format on "auto" the separators
+ * follow the currency (EUR → 1.000,00, USD → 1,000.00); an explicit choice
+ * overrides that for everyone. Falls back to the UI language when neither is
+ * known.
+ *
+ * Used everywhere a value is shown to replace the old language-derived locale,
+ * so number/date formatting no longer silently tracks the UI language.
+ */
+export function useDisplayLocale(): string {
+ const { i18n } = useTranslation()
+ const { user } = useAuth()
+
+ const { data } = useQuery({
+ queryKey: ['admin', 'number-format'],
+ queryFn: () => admin.numberFormat(),
+ staleTime: Infinity,
+ retry: false,
+ })
+
+ const fallback = i18n.language === 'en' ? 'en-US' : i18n.language
+ return resolveDisplayLocale(data?.format, user?.preferences?.currency_display, fallback)
+}
+
+/**
+ * Resolve the locale used for displaying *dates*. Month/day words follow the
+ * user's app language; only the field order (day-first vs month-first) follows
+ * the admin number/date format setting. Pair currency rendering with
+ * {@link useDisplayLocale} and date rendering with this hook.
+ */
+export function useDateLocale(): string {
+ const { i18n } = useTranslation()
+ const { user } = useAuth()
+
+ const { data: numberData } = useQuery({
+ queryKey: ['admin', 'number-format'],
+ queryFn: () => admin.numberFormat(),
+ staleTime: Infinity,
+ retry: false,
+ })
+
+ const { data: dateData } = useQuery({
+ queryKey: ['admin', 'date-format'],
+ queryFn: () => admin.dateFormat(),
+ staleTime: Infinity,
+ retry: false,
+ })
+
+ const language = resolveSupportedLang(i18n.resolvedLanguage ?? i18n.language)
+ return resolveDateLocale(
+ dateData?.format,
+ numberData?.format,
+ user?.preferences?.currency_display,
+ language,
+ )
+}
diff --git a/frontend/src/lib/api.ts b/frontend/src/lib/api.ts
index a285d9a6..1c98d375 100644
--- a/frontend/src/lib/api.ts
+++ b/frontend/src/lib/api.ts
@@ -1,4 +1,5 @@
import axios from 'axios'
+import type { NumberFormat, DateFormat } from '@/lib/format'
import type {
User,
AdminUser,
@@ -1036,6 +1037,14 @@ export const admin = {
const { data } = await api.get('/admin/accounting-mode')
return data
},
+ numberFormat: async (): Promise<{ format: NumberFormat }> => {
+ const { data } = await api.get('/admin/number-format')
+ return data
+ },
+ dateFormat: async (): Promise<{ format: DateFormat }> => {
+ const { data } = await api.get('/admin/date-format')
+ return data
+ },
defaultColors: async (): Promise<{ light: string | null; dark: string | null }> => {
const { data } = await api.get('/admin/default-colors')
return data
diff --git a/frontend/src/lib/format.ts b/frontend/src/lib/format.ts
index c4521500..bfdbedc4 100644
--- a/frontend/src/lib/format.ts
+++ b/frontend/src/lib/format.ts
@@ -1,3 +1,138 @@
+/**
+ * Number / date display formatting.
+ *
+ * The admin-configurable `number_format` setting decides how numbers and dates
+ * read:
+ * - Numbers/currency resolve to a representative BCP-47 locale whose
+ * thousands/decimal separators match the setting (`resolveDisplayLocale`).
+ * - Dates keep the user's app language for month/day *words* but take their
+ * field *order* (day-first vs month-first) from the setting
+ * (`resolveDateLocale`). So an English UI on the European format shows
+ * "4 Jun 2026" / "04/06/2026" — never the German "4. Juni".
+ */
+
+export type NumberFormat = 'auto' | 'comma_dot' | 'dot_comma' | 'space_comma'
+
+/** Admin date-format setting. 'auto' derives the order from the number format. */
+export type DateFormat = 'auto' | 'dmy' | 'mdy' | 'ymd'
+
+export type DateOrder = 'mdy' | 'dmy' | 'ymd'
+
+/** Explicit format → representative locale (separators only matter here). */
+const FORMAT_LOCALE: Record<Exclude<NumberFormat, 'auto'>, string> = {
+ comma_dot: 'en-US', // 1,000.00
+ dot_comma: 'de-DE', // 1.000,00
+ space_comma: 'fr-FR', // 1 000,00
+}
+
+/**
+ * Currency code → locale used when the format is "auto". Picks the separator
+ * convention native to each currency (e.g. EUR → 1.000,00, USD → 1,000.00).
+ */
+const CURRENCY_LOCALE: Record<string, string> = {
+ BRL: 'pt-BR',
+ USD: 'en-US',
+ EUR: 'de-DE',
+ GBP: 'en-GB',
+ JPY: 'ja-JP',
+ CAD: 'en-CA',
+ AUD: 'en-AU',
+ CHF: 'de-CH',
+ CNY: 'zh-CN',
+ ARS: 'es-AR',
+ MXN: 'es-MX',
+ CLP: 'es-CL',
+ COP: 'es-CO',
+ PEN: 'es-PE',
+ UYU: 'es-UY',
+ INR: 'en-IN',
+ SEK: 'sv-SE',
+ DKK: 'da-DK',
+ NOK: 'nb-NO',
+ PLN: 'pl-PL',
+ CZK: 'cs-CZ',
+ HUF: 'hu-HU',
+ RON: 'ro-RO',
+ CRC: 'es-CR',
+ IDR: 'id-ID',
+ DOP: 'es-DO',
+}
+
+/**
+ * Resolve the locale used for number/date display.
+ *
+ * @param numberFormat Admin setting ('auto' or an explicit format).
+ * @param currency The user's display currency — drives "auto".
+ * @param fallback Locale to use when nothing else matches (UI language).
+ */
+export function resolveDisplayLocale(
+ numberFormat: NumberFormat | undefined,
+ currency: string | undefined,
+ fallback = 'en-US',
+): string {
+ if (numberFormat && numberFormat !== 'auto') {
+ return FORMAT_LOCALE[numberFormat]
+ }
+ if (currency && CURRENCY_LOCALE[currency]) {
+ return CURRENCY_LOCALE[currency]
+ }
+ return fallback
+}
+
+/**
+ * Currencies that conventionally write dates month-first (MM/DD). Everything
+ * else defaults to day-first, which covers the rest of our supported set.
+ */
+const MONTH_FIRST_CURRENCIES = new Set(['USD'])
+
+/**
+ * Resolve the date field order. An explicit `dateFormat` wins; otherwise
+ * ('auto') it derives from the number format, then the currency.
+ */
+export function resolveDateOrder(
+ dateFormat: DateFormat | undefined,
+ numberFormat: NumberFormat | undefined,
+ currency: string | undefined,
+): DateOrder {
+ if (dateFormat === 'dmy' || dateFormat === 'mdy' || dateFormat === 'ymd') return dateFormat
+ // auto → follow the number format's convention, then the currency.
+ if (numberFormat === 'comma_dot') return 'mdy'
+ if (numberFormat === 'dot_comma' || numberFormat === 'space_comma') return 'dmy'
+ return currency && MONTH_FIRST_CURRENCIES.has(currency) ? 'mdy' : 'dmy'
+}
+
+/** Representative English locale per order (numbers carry no language). */
+const ORDER_EN_LOCALE: Record<DateOrder, string> = {
+ dmy: 'en-GB', // 04/06/2026
+ mdy: 'en-US', // 6/4/2026
+ ymd: 'en-CA', // 2026-06-04
+}
+
+/**
+ * Resolve the locale used for *dates*. Keeps the app language (so month names
+ * stay translated) but picks a regional variant whose date order matches the
+ * chosen format. English exposes all three orders (en-US/en-GB/en-CA); pt-BR
+ * and es are day-first natively. When a non-English UI is paired with a
+ * non-native order we fall back to an English proxy so the order is still
+ * honored (a rare combination).
+ *
+ * @param dateFormat Admin date-format setting ('auto' or explicit order).
+ * @param numberFormat Number-format setting — feeds the 'auto' date order.
+ * @param currency Display currency — feeds 'auto' when number is 'auto'.
+ * @param language The resolved UI language ('en', 'pt-BR', 'es', …).
+ */
+export function resolveDateLocale(
+ dateFormat: DateFormat | undefined,
+ numberFormat: NumberFormat | undefined,
+ currency: string | undefined,
+ language: string,
+): string {
+ const order = resolveDateOrder(dateFormat, numberFormat, currency)
+ if (language.startsWith('en')) return ORDER_EN_LOCALE[order]
+ if (order === 'dmy') return language
+ return ORDER_EN_LOCALE[order]
+}
+
/**
* Format a numeric value as currency using Intl.NumberFormat.
*/
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 1b44c128..2b380614 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -335,6 +335,9 @@
"transferTooltip": "Transfers are excluded from report and dashboard totals",
"installmentTooltip": "Installment plan — {{count}} charges totaling {{total}}",
"billOverrideTooltip": "Moved to the bill due {{date}}",
+ "effectiveBillDate": "Effective bill date",
+ "effectiveBillDateHint": "manual, overrides the automatic cycle",
+ "effectiveBillDatePlaceholder": "Bill due date (optional)",
"linkAsTransfer": "Link as transfer",
"linkTransferTitle": "Link as transfer",
"linkTransferDescription": "Mark these two transactions as a single inter-account transfer. They will be excluded from spending and income reports.",
@@ -1234,6 +1237,26 @@
"providerCategoriesTitle": "Categories",
"providerCategories": "Use integration categories",
"providerCategoriesDesc": "When off, synced transactions arrive uncategorized so only your Rules apply.",
+ "numberFormatTitle": "Number format",
+ "numberFormatDesc": "How amounts are displayed across the app for everyone.",
+ "numberFormatAuto": "Automatic",
+ "numberFormatAutoDesc": "Follows each currency's convention, like €1.000,00 or $1,000.00.",
+ "numberFormatCommaDot": "1,000.00",
+ "numberFormatCommaDotDesc": "Comma thousands, dot decimal",
+ "numberFormatDotComma": "1.000,00",
+ "numberFormatDotCommaDesc": "Dot thousands, comma decimal",
+ "numberFormatSpaceComma": "1 000,00",
+ "numberFormatSpaceCommaDesc": "Space thousands, comma decimal",
+ "dateFormatTitle": "Date format",
+ "dateFormatDesc": "How dates are displayed. Month names always follow each user's app language.",
+ "dateFormatAuto": "Automatic",
+ "dateFormatAutoDesc": "Match the number format above (day-first in Europe, month-first in the US).",
+ "dateFormatDmy": "Day / Month / Year",
+ "dateFormatDmyDesc": "Day first, e.g. 04/06/2026.",
+ "dateFormatMdy": "Month / Day / Year",
+ "dateFormatMdyDesc": "Month first, e.g. 06/04/2026.",
+ "dateFormatYmd": "Year / Month / Day",
+ "dateFormatYmdDesc": "ISO order, e.g. 2026-06-04.",
"updated": "Setting updated"
}
},
diff --git a/frontend/src/locales/es.json b/frontend/src/locales/es.json
index 5cb35564..9d626b6e 100644
--- a/frontend/src/locales/es.json
+++ b/frontend/src/locales/es.json
@@ -333,6 +333,9 @@
"transferTooltip": "Las transferencias están excluidas de los informes y totales del panel",
"installmentTooltip": "Plan de cuotas — {{count}} cargos por un total de {{total}}",
"billOverrideTooltip": "Movido a la factura con vencimiento {{date}}",
+ "effectiveBillDate": "Fecha efectiva de la factura",
+ "effectiveBillDateHint": "manual, anula el ciclo automático",
+ "effectiveBillDatePlaceholder": "Vencimiento de la factura (opcional)",
"linkAsTransfer": "Marcar como transferencia",
"linkTransferTitle": "Marcar como transferencia",
"linkTransferDescription": "Marcar estas dos transacciones como una sola transferencia entre cuentas. Se excluirán de los informes de gasto e ingreso.",
@@ -1232,6 +1235,26 @@
"providerCategoriesTitle": "Categorías",
"providerCategories": "Usar categorías de la integración",
"providerCategoriesDesc": "Cuando está desactivado, las transacciones sincronizadas llegan sin categorizar para que solo se apliquen tus Reglas.",
+ "numberFormatTitle": "Formato de número",
+ "numberFormatDesc": "Cómo se muestran los importes en la app para todos.",
+ "numberFormatAuto": "Automático",
+ "numberFormatAutoDesc": "Sigue la convención de cada moneda, como €1.000,00 o $1,000.00.",
+ "numberFormatCommaDot": "1,000.00",
+ "numberFormatCommaDotDesc": "Miles con coma, decimal con punto",
+ "numberFormatDotComma": "1.000,00",
+ "numberFormatDotCommaDesc": "Miles con punto, decimal con coma",
+ "numberFormatSpaceComma": "1 000,00",
+ "numberFormatSpaceCommaDesc": "Miles con espacio, decimal con coma",
+ "dateFormatTitle": "Formato de fecha",
+ "dateFormatDesc": "Cómo se muestran las fechas. Los nombres de los meses siguen el idioma de cada usuario.",
+ "dateFormatAuto": "Automático",
+ "dateFormatAutoDesc": "Sigue el formato de número de arriba (día primero en Europa, mes primero en EE. UU.).",
+ "dateFormatDmy": "Día / Mes / Año",
+ "dateFormatDmyDesc": "Día primero, p. ej. 04/06/2026.",
+ "dateFormatMdy": "Mes / Día / Año",
+ "dateFormatMdyDesc": "Mes primero, p. ej. 06/04/2026.",
+ "dateFormatYmd": "Año / Mes / Día",
+ "dateFormatYmdDesc": "Orden ISO, p. ej. 2026-06-04.",
"updated": "Configuración actualizada"
}
},
diff --git a/frontend/src/locales/pt-BR.json b/frontend/src/locales/pt-BR.json
index 1dc771cc..a9cc9a60 100644
--- a/frontend/src/locales/pt-BR.json
+++ b/frontend/src/locales/pt-BR.json
@@ -335,6 +335,9 @@
"transferTooltip": "Transferências são excluídas dos totais de relatórios e dashboard",
"installmentTooltip": "Compra parcelada — {{count}} parcelas totalizando {{total}}",
"billOverrideTooltip": "Movida para a fatura com vencimento em {{date}}",
+ "effectiveBillDate": "Data efetiva da fatura",
+ "effectiveBillDateHint": "manual, sobrescreve o ciclo automático",
+ "effectiveBillDatePlaceholder": "Vencimento da fatura (opcional)",
"linkAsTransfer": "Vincular como transferência",
"linkTransferTitle": "Vincular como transferência",
"linkTransferDescription": "Marcar estas duas transações como uma única transferência entre contas. Elas serão excluídas dos relatórios de gastos e receitas.",
@@ -1234,6 +1237,26 @@
"providerCategoriesTitle": "Categorias",
"providerCategories": "Usar categorias da integração",
"providerCategoriesDesc": "Quando desativado, as transações sincronizadas chegam sem categoria, apenas suas Regras se aplicam.",
+ "numberFormatTitle": "Formato de número",
+ "numberFormatDesc": "Como os valores são exibidos no app para todos.",
+ "numberFormatAuto": "Automático",
+ "numberFormatAutoDesc": "Segue a convenção de cada moeda, como €1.000,00 ou $1,000.00.",
+ "numberFormatCommaDot": "1,000.00",
+ "numberFormatCommaDotDesc": "Milhar com vírgula, decimal com ponto",
+ "numberFormatDotComma": "1.000,00",
+ "numberFormatDotCommaDesc": "Milhar com ponto, decimal com vírgula",
+ "numberFormatSpaceComma": "1 000,00",
+ "numberFormatSpaceCommaDesc": "Milhar com espaço, decimal com vírgula",
+ "dateFormatTitle": "Formato de data",
+ "dateFormatDesc": "Como as datas são exibidas. Os nomes dos meses sempre seguem o idioma de cada usuário.",
+ "dateFormatAuto": "Automático",
+ "dateFormatAutoDesc": "Acompanha o formato de número acima (dia primeiro na Europa, mês primeiro nos EUA).",
+ "dateFormatDmy": "Dia / Mês / Ano",
+ "dateFormatDmyDesc": "Dia primeiro, ex.: 04/06/2026.",
+ "dateFormatMdy": "Mês / Dia / Ano",
+ "dateFormatMdyDesc": "Mês primeiro, ex.: 06/04/2026.",
+ "dateFormatYmd": "Ano / Mês / Dia",
+ "dateFormatYmdDesc": "Ordem ISO, ex.: 2026-06-04.",
"updated": "Configuração atualizada"
}
},
diff --git a/frontend/src/pages/account-detail.tsx b/frontend/src/pages/account-detail.tsx
index 983982c2..d4e80f13 100644
--- a/frontend/src/pages/account-detail.tsx
+++ b/frontend/src/pages/account-detail.tsx
@@ -2,6 +2,7 @@ import { useState, useMemo, useEffect, useRef } from 'react'
import { getAccountName } from '@/lib/account-utils'
import { useParams, Link } from 'react-router-dom'
import { useTranslation } from 'react-i18next'
+import { useDisplayLocale, useDateLocale } from '@/hooks/use-display-locale'
import { useQuery, useQueries, useMutation, useQueryClient } from '@tanstack/react-query'
import { format, addDays, addMonths, parseISO } from 'date-fns'
import { ptBR, enUS } from 'date-fns/locale'
@@ -236,13 +237,14 @@ function formatDateStr(dateStr: string, locale = 'pt-BR') {
return new Date(dateStr + 'T00:00:00').toLocaleDateString(locale)
}
-function formatFriendlyDate(dateStr: string, i18nLanguage: string) {
- const dateFnsLocale = i18nLanguage === 'pt-BR' ? ptBR : enUS
- const d = parseISO(dateStr + 'T00:00:00')
- // Compact friendly format: pt-BR → "qui, 16 abr" / en → "Thu, Apr 16"
- return i18nLanguage === 'pt-BR'
- ? format(d, 'EEE, d MMM', { locale: dateFnsLocale })
- : format(d, 'EEE, MMM d', { locale: dateFnsLocale })
+function formatFriendlyDate(dateStr: string, dateLocale: string) {
+ // Compact friendly weekday+day+month — words follow the UI language, field
+ // order follows the regional date setting (e.g. "Thu, Apr 16" vs "Thu, 16 Apr").
+ return new Date(dateStr + 'T00:00:00').toLocaleDateString(dateLocale, {
+ weekday: 'short',
+ day: 'numeric',
+ month: 'short',
+ })
}
function daysUntil(dateStr: string): number {
@@ -268,7 +270,8 @@ export default function AccountDetailPage() {
const { user } = useAuth()
const { canWrite } = useWorkspace()
const userCurrency = user?.preferences?.currency_display ?? 'USD'
- const locale = i18n.language === 'en' ? 'en-US' : i18n.language
+ const locale = useDisplayLocale()
+ const dateLocale = useDateLocale()
const queryClient = useQueryClient()
const [dialogOpen, setDialogOpen] = useState(false)
const [editingTx, setEditingTx] = useState<Transaction | null>(null)
@@ -654,25 +657,25 @@ export default function AccountDetailPage() {
const startDate = parseISO(rangeStart + 'T00:00:00')
const baseline = new Date(startDate.getTime() - 86400000)
const baselineKey = format(baseline, 'yyyy-MM-dd')
- series.push({ label: formatDateStr(baselineKey, locale), date: baselineKey, balance: 0 })
+ series.push({ label: formatDateStr(baselineKey, dateLocale), date: baselineKey, balance: 0 })
const cur = new Date(startDate)
const end = new Date(rangeEnd + 'T00:00:00')
let running = 0
while (cur <= end) {
const key = format(cur, 'yyyy-MM-dd')
running += byDay.get(key) ?? 0
- series.push({ label: formatDateStr(key, locale), date: key, balance: running })
+ series.push({ label: formatDateStr(key, dateLocale), date: key, balance: running })
cur.setDate(cur.getDate() + 1)
}
return series
}
if (!balanceHistory) return []
return balanceHistory.map(p => ({
- label: formatDateStr(p.date, locale),
+ label: formatDateStr(p.date, dateLocale),
date: p.date,
balance: usePrimary ? (p.balance_primary ?? p.balance) : p.balance,
}))
- }, [isCreditCard, txData, filterFrom, filterTo, balanceHistory, locale, usePrimary, activeBill])
+ }, [isCreditCard, txData, filterFrom, filterTo, balanceHistory, locale, dateLocale, usePrimary, activeBill])
// Running balance computation for transaction table
const txWithRunningBalance = useMemo((): TxWithBalance[] => {
@@ -1102,7 +1105,7 @@ export default function AccountDetailPage() {
{t('accounts.dueDate')}
</p>
<p className="text-base sm:text-2xl font-bold tabular-nums text-foreground">
- {cycleDueDate ? formatFriendlyDate(cycleDueDate, i18n.language) : '—'}
+ {cycleDueDate ? formatFriendlyDate(cycleDueDate, dateLocale) : '—'}
</p>
{dueSubtitle && (
<p className={`text-[10px] sm:text-xs font-medium mt-0.5 ${dueSubtitleClass}`}>
@@ -1231,9 +1234,9 @@ export default function AccountDetailPage() {
</p>
<p className="text-sm sm:text-base font-semibold tabular-nums text-foreground">
{activeBill
- ? formatDateStr(closeDateForBill(activeBill.due_date, account.statement_close_day), locale)
+ ? formatDateStr(closeDateForBill(activeBill.due_date, account.statement_close_day), dateLocale)
: (account.statement_close_day && filterTo
- ? formatDateStr(format(addDays(parseISO(filterTo), 1), 'yyyy-MM-dd'), locale)
+ ? formatDateStr(format(addDays(parseISO(filterTo), 1), 'yyyy-MM-dd'), dateLocale)
: '—')}
</p>
</div>
@@ -1372,7 +1375,7 @@ export default function AccountDetailPage() {
}}
>
<td className="px-3 sm:px-4 py-3 text-xs text-muted-foreground whitespace-nowrap">
- {formatDateStr(tx.date, locale)}
+ {formatDateStr(tx.date, dateLocale)}
</td>
<td className="px-3 sm:px-4 py-3">
<div>
@@ -1415,10 +1418,10 @@ export default function AccountDetailPage() {
{tx.effective_bill_date && (
<span
className="ml-2 inline-flex items-center gap-1 text-xs text-violet-600 dark:text-violet-400 font-normal bg-violet-50 dark:bg-violet-500/10 border border-violet-200 dark:border-violet-500/30 rounded px-1.5 py-0.5"
- title={t('transactions.billOverrideTooltip', 'Movida para a fatura com vencimento em {{date}}', { date: formatDateStr(tx.effective_bill_date, locale) })}
+ title={t('transactions.billOverrideTooltip', 'Movida para a fatura com vencimento em {{date}}', { date: formatDateStr(tx.effective_bill_date, dateLocale) })}
>
<CalendarClock className="h-3 w-3" />
- {formatDateStr(tx.effective_bill_date, locale)}
+ {formatDateStr(tx.effective_bill_date, dateLocale)}
</span>
)}
{(tx.attachment_count ?? 0) > 0 && (
diff --git a/frontend/src/pages/accounts.tsx b/frontend/src/pages/accounts.tsx
index 8570a49a..ad240fac 100644
--- a/frontend/src/pages/accounts.tsx
+++ b/frontend/src/pages/accounts.tsx
@@ -3,6 +3,7 @@ import { getAccountName } from '@/lib/account-utils'
import { getConnectionName } from '@/lib/connection-utils'
import { Link } from 'react-router-dom'
import { useTranslation } from 'react-i18next'
+import { useDisplayLocale, useDateLocale } from '@/hooks/use-display-locale'
import { useQuery, useMutation, useQueryClient } from '@tanstack/react-query'
import { accounts, connections, currencies } from '@/lib/api'
import { invalidateFinancialQueries } from '@/lib/invalidate-queries'
@@ -70,8 +71,9 @@ function getTypeConfig(type: string) {
}
export default function AccountsPage() {
- const { t, i18n } = useTranslation()
- const locale = i18n.language === 'en' ? 'en-US' : i18n.language
+ const { t } = useTranslation()
+ const locale = useDisplayLocale()
+ const dateLocale = useDateLocale()
const { mask } = usePrivacyMode()
const { user } = useAuth()
const { canWrite } = useWorkspace()
@@ -353,7 +355,7 @@ export default function AccountsPage() {
</div>
{conn.last_sync_at && (
<p className="text-[11px] text-muted-foreground mt-0.5">
- {t('accounts.lastSync')}: {new Date(conn.last_sync_at).toLocaleString(locale)}
+ {t('accounts.lastSync')}: {new Date(conn.last_sync_at).toLocaleString(dateLocale)}
</p>
)}
</div>
diff --git a/frontend/src/pages/admin/settings.tsx b/frontend/src/pages/admin/settings.tsx
index 220b1c45..f6815046 100644
--- a/frontend/src/pages/admin/settings.tsx
+++ b/frontend/src/pages/admin/settings.tsx
@@ -3,6 +3,8 @@ import { useTranslation } from 'react-i18next'
import { useTheme } from 'next-themes'
import { useQuery, useMutation, useQueryClient } from '@tanstack/react-query'
import { admin as adminApi, currencies as currenciesApi } from '@/lib/api'
+import { resolveDisplayLocale, resolveDateLocale, type NumberFormat, type DateFormat } from '@/lib/format'
+import { resolveSupportedLang } from '@/lib/i18n'
import { useAuth } from '@/contexts/auth-context'
import { toast } from 'sonner'
import { Button } from '@/components/ui/button'
@@ -28,11 +30,11 @@ import {
} from '@/components/ui/select'
import { PageHeader } from '@/components/page-header'
import { setThemeBasedOnSystem } from '@/lib/theme-utils'
-import { Search, Plus, Trash2, Shield, ShieldOff, UserCog, Users, Scale, Tag, Palette, Save } from 'lucide-react'
+import { Search, Plus, Trash2, Shield, ShieldOff, UserCog, Users, Scale, Tag, Palette, Save, Hash, CalendarDays } from 'lucide-react'
import type { AdminUser } from '@/types'
export default function AdminSettingsPage() {
- const { t } = useTranslation()
+ const { t, i18n } = useTranslation()
const { user: currentUser } = useAuth()
const queryClient = useQueryClient()
const { resolvedTheme } = useTheme()
@@ -179,6 +181,50 @@ export default function AdminSettingsPage() {
const useProviderCats = providerCatsSetting?.value !== 'false'
+ // Number/date display format: 404 when unset → defaults to "auto" (derive
+ // separators from each user's display currency).
+ const { data: numberFormatSetting } = useQuery({
+ queryKey: ['admin', 'settings', 'number_format'],
+ queryFn: () => adminApi.getSetting('number_format').catch(() => null),
+ retry: false,
+ })
+
+ const numberFormat = numberFormatSetting?.value ?? 'auto'
+
+ const updateNumberFormatMutation = useMutation({
+ mutationFn: (value: string) => adminApi.updateSetting('number_format', value),
+ onSuccess: () => {
+ queryClient.invalidateQueries({ queryKey: ['admin', 'settings', 'number_format'] })
+ queryClient.invalidateQueries({ queryKey: ['admin', 'number-format'] })
+ toast.success(t('admin.settings.updated'))
+ },
+ onError: () => {
+ toast.error(t('common.error'))
+ },
+ })
+
+ // Date format: 404 when unset → defaults to "auto" (order follows the
+ // number format / currency).
+ const { data: dateFormatSetting } = useQuery({
+ queryKey: ['admin', 'settings', 'date_format'],
+ queryFn: () => adminApi.getSetting('date_format').catch(() => null),
+ retry: false,
+ })
+
+ const dateFormat = dateFormatSetting?.value ?? 'auto'
+
+ const updateDateFormatMutation = useMutation({
+ mutationFn: (value: string) => adminApi.updateSetting('date_format', value),
+ onSuccess: () => {
+ queryClient.invalidateQueries({ queryKey: ['admin', 'settings', 'date_format'] })
+ queryClient.invalidateQueries({ queryKey: ['admin', 'date-format'] })
+ toast.success(t('admin.settings.updated'))
+ },
+ onError: () => {
+ toast.error(t('common.error'))
+ },
+ })
+
if (themeColorLightSetting?.value && themeColorLightSetting.value !== lastSyncedLight) {
setLastSyncedLight(themeColorLightSetting.value)
setLocalLight(themeColorLightSetting.value)
@@ -442,6 +488,103 @@ export default function AdminSettingsPage() {
</div>
</div>
+ {/* Number / date format */}
+ <div className="rounded-xl border border-border/60 bg-card overflow-hidden mb-8">
+ <div className="px-5 py-4 border-b border-border/40">
+ <div className="flex items-center gap-2 mb-0.5">
+ <Hash size={15} className="text-muted-foreground" />
+ <h3 className="text-sm font-semibold text-foreground">{t('admin.settings.numberFormatTitle')}</h3>
+ </div>
+ <p className="text-xs text-muted-foreground">{t('admin.settings.numberFormatDesc')}</p>
+ </div>
+ <div className="divide-y divide-border/40">
+ {([
+ { value: 'auto', label: t('admin.settings.numberFormatAuto'), desc: t('admin.settings.numberFormatAutoDesc') },
+ { value: 'comma_dot', label: t('admin.settings.numberFormatCommaDot'), desc: t('admin.settings.numberFormatCommaDotDesc') },
+ { value: 'dot_comma', label: t('admin.settings.numberFormatDotComma'), desc: t('admin.settings.numberFormatDotCommaDesc') },
+ { value: 'space_comma', label: t('admin.settings.numberFormatSpaceComma'), desc: t('admin.settings.numberFormatSpaceCommaDesc') },
+ ] as const).map((opt) => {
+ // Live preview of how this option renders a sample amount, resolved
+ // against the admin's currency + UI language.
+ const adminCurrency = currentUser?.preferences?.currency_display ?? 'USD'
+ const numLocale = resolveDisplayLocale(opt.value as NumberFormat, adminCurrency, i18n.language === 'en' ? 'en-US' : i18n.language)
+ const numExample = new Intl.NumberFormat(numLocale, { minimumFractionDigits: 2, maximumFractionDigits: 2 }).format(1234.56)
+ return (
+ <button
+ key={opt.value}
+ type="button"
+ onClick={() => updateNumberFormatMutation.mutate(opt.value)}
+ disabled={updateNumberFormatMutation.isPending}
+ className="flex items-start gap-3 w-full px-5 py-4 text-left hover:bg-muted/40 transition-colors"
+ >
+ <div className={`mt-0.5 h-4 w-4 rounded-full border-2 shrink-0 ${numberFormat === opt.value ? 'border-primary bg-primary' : 'border-muted-foreground/40'}`}>
+ {numberFormat === opt.value && <div className="h-full w-full rounded-full bg-primary ring-2 ring-background ring-inset" />}
+ </div>
+ <div className="flex-1 min-w-0">
+ <div className="flex items-baseline gap-2 flex-wrap">
+ <p className="text-sm font-medium text-foreground tabular-nums">{opt.label}</p>
+ <span className="text-xs tabular-nums text-muted-foreground">{numExample}</span>
+ </div>
+ {opt.desc && (
+ <p className="text-xs text-muted-foreground mt-0.5">{opt.desc}</p>
+ )}
+ </div>
+ </button>
+ )
+ })}
+ </div>
+ </div>
+
+ {/* Date format */}
+ <div className="rounded-xl border border-border/60 bg-card overflow-hidden mb-8">
+ <div className="px-5 py-4 border-b border-border/40">
+ <div className="flex items-center gap-2 mb-0.5">
+ <CalendarDays size={15} className="text-muted-foreground" />
+ <h3 className="text-sm font-semibold text-foreground">{t('admin.settings.dateFormatTitle')}</h3>
+ </div>
+ <p className="text-xs text-muted-foreground">{t('admin.settings.dateFormatDesc')}</p>
+ </div>
+ <div className="divide-y divide-border/40">
+ {([
+ { value: 'auto', label: t('admin.settings.dateFormatAuto'), desc: t('admin.settings.dateFormatAutoDesc') },
+ { value: 'dmy', label: t('admin.settings.dateFormatDmy'), desc: t('admin.settings.dateFormatDmyDesc') },
+ { value: 'mdy', label: t('admin.settings.dateFormatMdy'), desc: t('admin.settings.dateFormatMdyDesc') },
+ { value: 'ymd', label: t('admin.settings.dateFormatYmd'), desc: t('admin.settings.dateFormatYmdDesc') },
+ ] as const).map((opt) => {
+ // Live preview, resolved against the current number format + UI
+ // language. Sample 4 June makes the day/month order unambiguous.
+ const adminCurrency = currentUser?.preferences?.currency_display ?? 'USD'
+ const dateLocale = resolveDateLocale(opt.value as DateFormat, numberFormat as NumberFormat, adminCurrency, resolveSupportedLang(i18n.resolvedLanguage ?? i18n.language))
+ const numericExample = new Date(2026, 5, 4).toLocaleDateString(dateLocale)
+ const wordedExample = new Date(2026, 5, 4).toLocaleDateString(dateLocale, { day: 'numeric', month: 'short', year: 'numeric' })
+ return (
+ <button
+ key={opt.value}
+ type="button"
+ onClick={() => updateDateFormatMutation.mutate(opt.value)}
+ disabled={updateDateFormatMutation.isPending}
+ className="flex items-start gap-3 w-full px-5 py-4 text-left hover:bg-muted/40 transition-colors"
+ >
+ <div className={`mt-0.5 h-4 w-4 rounded-full border-2 shrink-0 ${dateFormat === opt.value ? 'border-primary bg-primary' : 'border-muted-foreground/40'}`}>
+ {dateFormat === opt.value && <div className="h-full w-full rounded-full bg-primary ring-2 ring-background ring-inset" />}
+ </div>
+ <div className="flex-1 min-w-0">
+ <div className="flex items-baseline gap-2 flex-wrap">
+ <p className="text-sm font-medium text-foreground tabular-nums">{opt.label}</p>
+ <span className="text-xs tabular-nums text-muted-foreground">
+ {numericExample} <span className="opacity-50">·</span> {wordedExample}
+ </span>
+ </div>
+ {opt.desc && (
+ <p className="text-xs text-muted-foreground mt-0.5">{opt.desc}</p>
+ )}
+ </div>
+ </button>
+ )
+ })}
+ </div>
+ </div>
+
{/* Settings section */}
<div className="rounded-xl border border-border/60 bg-card overflow-hidden">
<div className="px-5 py-4 border-b border-border/40">
diff --git a/frontend/src/pages/assets.tsx b/frontend/src/pages/assets.tsx
index ba236319..f4c3f2e7 100644
--- a/frontend/src/pages/assets.tsx
+++ b/frontend/src/pages/assets.tsx
@@ -1,5 +1,6 @@
import { useState, useMemo, useEffect, useRef } from 'react'
import { useTranslation } from 'react-i18next'
+import { useDisplayLocale, useDateLocale } from '@/hooks/use-display-locale'
import { useQuery, useMutation, useQueryClient } from '@tanstack/react-query'
import { useRegisterPageChatContext } from '@/lib/page-chat-context'
import { assets, assetGroups, currencies as currenciesApi } from '@/lib/api'
@@ -169,8 +170,9 @@ const GROWTH_TYPES = ['percentage', 'absolute'] as const
const GROWTH_FREQUENCIES = ['daily', 'weekly', 'monthly', 'yearly'] as const
export default function AssetsPage() {
- const { t, i18n } = useTranslation()
- const locale = i18n.language === 'en' ? 'en-US' : i18n.language
+ const { t } = useTranslation()
+ const locale = useDisplayLocale()
+ const dateLocale = useDateLocale()
const { mask } = usePrivacyMode()
const { user } = useAuth()
const { canWrite } = useWorkspace()
@@ -666,7 +668,7 @@ export default function AssetsPage() {
) : null}
{asset.maturity_date && (
<Badge variant="outline" className="text-[10px] px-1.5 py-0 text-muted-foreground">
- {t('assets.maturesOn', { date: new Date(asset.maturity_date).toLocaleDateString(locale) })}
+ {t('assets.maturesOn', { date: new Date(asset.maturity_date).toLocaleDateString(dateLocale) })}
</Badge>
)}
{asset.valuation_method === 'growth_rule' && asset.growth_rate && (
@@ -740,7 +742,7 @@ export default function AssetsPage() {
</div>
</div>
- {isExpanded && <AssetDetail assetId={asset.id} currency={asset.currency} locale={locale} purchasePrice={asset.purchase_price} purchaseDate={asset.purchase_date} valuationMethod={asset.valuation_method} canWrite={canWrite} />}
+ {isExpanded && <AssetDetail assetId={asset.id} currency={asset.currency} locale={locale} dateLocale={dateLocale} purchasePrice={asset.purchase_price} purchaseDate={asset.purchase_date} valuationMethod={asset.valuation_method} canWrite={canWrite} />}
</div>
)
}
@@ -910,6 +912,7 @@ export default function AssetsPage() {
wallets={sortedWallets}
currency={userCurrency}
locale={locale}
+ dateLocale={dateLocale}
mask={mask}
/>
)}
@@ -1122,7 +1125,7 @@ export default function AssetsPage() {
during create because the quote is inline-live. */}
{editingAsset?.last_price_at && (
<span className="text-[10px] text-muted-foreground mt-0.5">
- {t('assets.lastUpdated', { when: formatRelativeTime(editingAsset.last_price_at, locale) })}
+ {t('assets.lastUpdated', { when: formatRelativeTime(editingAsset.last_price_at, dateLocale) })}
</span>
)}
</div>
@@ -1481,11 +1484,12 @@ export default function AssetsPage() {
const PORTFOLIO_COLORS = ['#6366F1', '#F43F5E', '#F59E0B', '#10B981', '#8B5CF6', '#EC4899', '#06B6D4', '#84CC16']
-function PortfolioChart({ data, wallets, currency, locale: loc, mask }: {
+function PortfolioChart({ data, wallets, currency, locale: loc, dateLocale: dateLoc, mask }: {
data: { assets: { id: string; name: string; type: string; group_id: string | null }[]; trend: Record<string, unknown>[]; total: number }
wallets: AssetGroup[]
currency: string
locale: string
+ dateLocale: string
mask: (v: string) => string
}) {
const { t } = useTranslation()
@@ -1627,7 +1631,7 @@ function PortfolioChart({ data, wallets, currency, locale: loc, mask }: {
tick={{ fontSize: 10, fill: 'var(--muted-foreground)' }}
axisLine={false}
tickLine={false}
- tickFormatter={(v: string) => new Date(v + 'T00:00:00').toLocaleDateString(loc, { month: 'short', year: '2-digit' })}
+ tickFormatter={(v: string) => new Date(v + 'T00:00:00').toLocaleDateString(dateLoc, { month: 'short', year: '2-digit' })}
/>
<YAxis
tick={{ fontSize: 10, fill: 'var(--muted-foreground)' }}
@@ -1651,7 +1655,7 @@ function PortfolioChart({ data, wallets, currency, locale: loc, mask }: {
return (
<div style={{ background: 'var(--card)', color: 'var(--foreground)', border: '1px solid var(--border)', borderRadius: '0.75rem', fontSize: '12px', boxShadow: '0 4px 12px rgba(0,0,0,0.08)', padding: '10px 12px' }}>
<p style={{ fontWeight: 600, marginBottom: 6 }}>
- {new Date(label + 'T00:00:00').toLocaleDateString(loc, { day: 'numeric', month: 'long', year: 'numeric' })}
+ {new Date(label + 'T00:00:00').toLocaleDateString(dateLoc, { day: 'numeric', month: 'long', year: 'numeric' })}
</p>
{items.map(item => (
<div key={item.key} style={{ display: 'flex', justifyContent: 'space-between', gap: 16, marginBottom: 2 }}>
@@ -1702,8 +1706,8 @@ function PortfolioChart({ data, wallets, currency, locale: loc, mask }: {
)
}
-function AssetDetail({ assetId, currency, locale: loc, purchasePrice, purchaseDate, valuationMethod, canWrite }: {
- assetId: string; currency: string; locale: string
+function AssetDetail({ assetId, currency, locale: loc, dateLocale: dateLoc, purchasePrice, purchaseDate, valuationMethod, canWrite }: {
+ assetId: string; currency: string; locale: string; dateLocale: string
purchasePrice: number | null; purchaseDate: string | null
valuationMethod: string
canWrite: boolean
@@ -1811,7 +1815,7 @@ function AssetDetail({ assetId, currency, locale: loc, purchasePrice, purchaseDa
tick={{ fontSize: 10, fill: 'var(--muted-foreground)' }}
axisLine={false}
tickLine={false}
- tickFormatter={(v: string) => new Date(v + 'T00:00:00').toLocaleDateString(loc, { month: 'short', year: '2-digit' })}
+ tickFormatter={(v: string) => new Date(v + 'T00:00:00').toLocaleDateString(dateLoc, { month: 'short', year: '2-digit' })}
/>
<YAxis
tick={{ fontSize: 10, fill: 'var(--muted-foreground)' }}
@@ -1830,7 +1834,7 @@ function AssetDetail({ assetId, currency, locale: loc, purchasePrice, purchaseDa
/>
<RechartsTooltip
formatter={(value: number | undefined) => [mask(formatCurrency(value ?? 0, currency, loc)), t('assets.currentValue')]}
- labelFormatter={(label: unknown) => new Date(String(label) + 'T00:00:00').toLocaleDateString(loc, { day: 'numeric', month: 'long', year: 'numeric' })}
+ labelFormatter={(label: unknown) => new Date(String(label) + 'T00:00:00').toLocaleDateString(dateLoc, { day: 'numeric', month: 'long', year: 'numeric' })}
contentStyle={{
background: 'var(--card)',
color: 'var(--foreground)',
@@ -1923,7 +1927,7 @@ function AssetDetail({ assetId, currency, locale: loc, purchasePrice, purchaseDa
{t(`assets.source${v.source.charAt(0).toUpperCase() + v.source.slice(1)}`)}
</Badge>
<span className="text-[11px] text-muted-foreground tabular-nums">
- {new Date(v.date + 'T00:00:00').toLocaleDateString(loc)}
+ {new Date(v.date + 'T00:00:00').toLocaleDateString(dateLoc)}
</span>
{valuationMethod === 'manual' && v.source === 'manual' && canWrite && (
<button
diff --git a/frontend/src/pages/budgets.tsx b/frontend/src/pages/budgets.tsx
index c5984165..9194a346 100644
--- a/frontend/src/pages/budgets.tsx
+++ b/frontend/src/pages/budgets.tsx
@@ -1,5 +1,6 @@
import React, { useState } from 'react'
import { useTranslation } from 'react-i18next'
+import { useDisplayLocale, useDateLocale } from '@/hooks/use-display-locale'
import { useQuery, useMutation, useQueryClient } from '@tanstack/react-query'
import { categories as categoriesApi, categoryGroups as groupsApi, budgets as budgetsApi } from '@/lib/api'
import { toast } from 'sonner'
@@ -58,7 +59,8 @@ export default function BudgetsPage() {
const { user } = useAuth()
const { canWrite } = useWorkspace()
const userCurrency = user?.preferences?.currency_display ?? 'USD'
- const locale = i18n.language === 'en' ? 'en-US' : i18n.language
+ const locale = useDisplayLocale()
+ const dateLocale = useDateLocale()
const queryClient = useQueryClient()
const [selectedMonth, setSelectedMonth] = useState(currentMonth)
const [monthCalOpen, setMonthCalOpen] = useState(false)
@@ -124,7 +126,7 @@ export default function BudgetsPage() {
)
}
- const monthTitle = new Date(selectedMonth + '-02').toLocaleDateString(locale, { month: 'long', year: 'numeric' }).replace(/^\w/, c => c.toUpperCase())
+ const monthTitle = new Date(selectedMonth + '-02').toLocaleDateString(dateLocale, { month: 'long', year: 'numeric' }).replace(/^\w/, c => c.toUpperCase())
return (
<div>
diff --git a/frontend/src/pages/dashboard.tsx b/frontend/src/pages/dashboard.tsx
index 363b7335..7716f489 100644
--- a/frontend/src/pages/dashboard.tsx
+++ b/frontend/src/pages/dashboard.tsx
@@ -2,6 +2,7 @@ import { useState, useEffect, useMemo } from 'react'
import { getAccountName } from '@/lib/account-utils'
import { currentMonth, shiftMonth, monthLastDay, monthLabel, monthRange } from '@/lib/month-utils'
import { useTranslation } from 'react-i18next'
+import { useDisplayLocale, useDateLocale } from '@/hooks/use-display-locale'
import { useQuery, useMutation, useQueryClient } from '@tanstack/react-query'
import { format } from 'date-fns'
import { ptBR, enUS } from 'date-fns/locale'
@@ -56,7 +57,8 @@ export default function DashboardPage() {
const { user } = useAuth()
const userCurrency = user?.preferences?.currency_display ?? 'USD'
const displayName = user?.preferences?.display_name || ''
- const locale = i18n.language === 'en' ? 'en-US' : i18n.language
+ const locale = useDisplayLocale()
+ const dateLocale = useDateLocale()
const greeting = (() => {
const hour = new Date().getHours()
@@ -74,7 +76,7 @@ export default function DashboardPage() {
const dateFnsLocale = i18n.language === 'pt-BR' ? ptBR : enUS
const { from: monthStart, to: monthEnd } = monthRange(selectedMonth)
const monthParam = monthStart
- const monthLabelStr = monthLabel(selectedMonth, locale)
+ const monthLabelStr = monthLabel(selectedMonth, dateLocale)
const handleMonthChange = (newMonth: string) => {
setSelectedMonth(newMonth)
@@ -377,7 +379,7 @@ export default function DashboardPage() {
{/* Header */}
<PageHeader
section={greeting}
- title={new Date(selectedMonth + '-02').toLocaleDateString(locale, { month: 'long', year: 'numeric' }).replace(/^\w/, c => c.toUpperCase())}
+ title={new Date(selectedMonth + '-02').toLocaleDateString(dateLocale, { month: 'long', year: 'numeric' }).replace(/^\w/, c => c.toUpperCase())}
action={
<div className="flex items-center gap-1">
<button
@@ -391,7 +393,7 @@ export default function DashboardPage() {
className="inline-flex items-center justify-center gap-2 border border-border rounded-lg px-3 py-1.5 text-sm bg-card text-foreground hover:bg-muted/50 transition-all cursor-pointer min-w-[180px]"
>
<CalendarIcon className="size-3.5 text-muted-foreground" />
- {new Date(selectedMonth + '-02').toLocaleDateString(locale, { month: 'long', year: 'numeric' }).replace(/^\w/, c => c.toUpperCase())}
+ {new Date(selectedMonth + '-02').toLocaleDateString(dateLocale, { month: 'long', year: 'numeric' }).replace(/^\w/, c => c.toUpperCase())}
</button>
</PopoverTrigger>
<PopoverContent align="center" className="w-auto p-0">
@@ -678,7 +680,7 @@ export default function DashboardPage() {
<div>
<p className="text-base font-bold text-foreground">{t('dashboard.balanceFlow')}</p>
<p className="text-xs text-muted-foreground mt-0.5">
- {new Date(`${selectedMonth}-01T00:00:00`).toLocaleDateString(locale)} → {new Date(`${selectedMonth}-${String(lastCurrentPoint?.day ?? monthLastDay(selectedMonth)).padStart(2, '0')}T00:00:00`).toLocaleDateString(locale)}
+ {new Date(`${selectedMonth}-01T00:00:00`).toLocaleDateString(dateLocale)} → {new Date(`${selectedMonth}-${String(lastCurrentPoint?.day ?? monthLastDay(selectedMonth)).padStart(2, '0')}T00:00:00`).toLocaleDateString(dateLocale)}
</p>
</div>
{!balanceHistoryLoading && lastCurrentPoint && (
@@ -713,7 +715,7 @@ export default function DashboardPage() {
const day = String(payload[0].payload.day).padStart(2, '0')
const dateStr = `${selectedMonth}-${day}`
setDrillDown({
- title: t('dashboard.drillDownDay', { date: new Date(dateStr + 'T00:00:00').toLocaleDateString(locale) }),
+ title: t('dashboard.drillDownDay', { date: new Date(dateStr + 'T00:00:00').toLocaleDateString(dateLocale) }),
from: dateStr,
to: dateStr,
})
@@ -752,7 +754,7 @@ export default function DashboardPage() {
<Tooltip
formatter={(value, name) => [
value !== null ? (privacyMode ? MASK : formatCurrency(Number(value), userCurrency, locale)) : '\u2014',
- name === 'current' ? monthLabel(selectedMonth, locale).split(' ')[0] : monthLabel(prevMonth, locale).split(' ')[0],
+ name === 'current' ? monthLabel(selectedMonth, dateLocale).split(' ')[0] : monthLabel(prevMonth, dateLocale).split(' ')[0],
]}
labelFormatter={(day) => t('dashboard.day', { day })}
contentStyle={{
@@ -799,7 +801,7 @@ export default function DashboardPage() {
<div className="px-5 pb-4 pt-0 shrink-0">
<p className="text-xs text-muted-foreground">
{t('dashboard.balanceFlowVsPrev', {
- month: monthLabel(prevMonth, locale).split(' ')[0],
+ month: monthLabel(prevMonth, dateLocale).split(' ')[0],
day: footerDay,
amount: mask(formatCurrency(footerPrev, userCurrency, locale)),
delta: `${footerPct >= 0 ? '+' : ''}${footerPct.toFixed(1)}%`,
@@ -966,7 +968,7 @@ export default function DashboardPage() {
<Paperclip size={12} className="text-muted-foreground shrink-0" />
)}
</div>
- <p className="text-xs text-muted-foreground">{formatDate(row.date, locale)}</p>
+ <p className="text-xs text-muted-foreground">{formatDate(row.date, dateLocale)}</p>
</div>
</div>
</TableCell>
diff --git a/frontend/src/pages/goals.tsx b/frontend/src/pages/goals.tsx
index 12e043f4..c840f303 100644
--- a/frontend/src/pages/goals.tsx
+++ b/frontend/src/pages/goals.tsx
@@ -1,6 +1,7 @@
import { createElement, useState } from 'react'
import { getAccountName } from '@/lib/account-utils'
import { useTranslation } from 'react-i18next'
+import { useDisplayLocale } from '@/hooks/use-display-locale'
import { useQuery, useMutation, useQueryClient } from '@tanstack/react-query'
import { goals as goalsApi, accounts as accountsApi, assets as assetsApi, currencies as currenciesApi } from '@/lib/api'
import { toast } from 'sonner'
@@ -102,12 +103,12 @@ function daysUntil(dateStr: string): number {
}
export default function GoalsPage() {
- const { t, i18n } = useTranslation()
+ const { t } = useTranslation()
const { mask } = usePrivacyMode()
const { user } = useAuth()
const { canWrite } = useWorkspace()
const userCurrency = user?.preferences?.currency_display ?? 'USD'
- const locale = i18n.language === 'en' ? 'en-US' : i18n.language
+ const locale = useDisplayLocale()
const queryClient = useQueryClient()
const [dialogOpen, setDialogOpen] = useState(false)
const [editing, setEditing] = useState<Goal | null>(null)
diff --git a/frontend/src/pages/group-detail.tsx b/frontend/src/pages/group-detail.tsx
index fdcbbdd7..2521bcb5 100644
--- a/frontend/src/pages/group-detail.tsx
+++ b/frontend/src/pages/group-detail.tsx
@@ -1,5 +1,6 @@
import { useEffect, useMemo, useState } from 'react'
import { useTranslation } from 'react-i18next'
+import { useDisplayLocale, useDateLocale } from '@/hooks/use-display-locale'
import { useNavigate, useParams } from 'react-router-dom'
import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
import { toast } from 'sonner'
@@ -155,8 +156,9 @@ function KpiCard({
export default function GroupDetailPage() {
const { id } = useParams<{ id: string }>()
const groupId = id ?? ''
- const { t, i18n } = useTranslation()
- const locale = i18n.language === 'en' ? 'en-US' : i18n.language
+ const { t } = useTranslation()
+ const locale = useDisplayLocale()
+ const dateLocale = useDateLocale()
const navigate = useNavigate()
const queryClient = useQueryClient()
const { user } = useAuth()
@@ -532,10 +534,10 @@ export default function GroupDetailPage() {
return Array.from(byMonth.entries())
.sort(([a], [b]) => a.localeCompare(b))
.map(([month, total]) => ({
- month: new Date(month + '-01').toLocaleString(locale, { month: 'short' }),
+ month: new Date(month + '-01').toLocaleString(dateLocale, { month: 'short' }),
total: Number(total.toFixed(2)),
}))
- }, [groupTxs, locale])
+ }, [groupTxs, locale, dateLocale])
// Group spending broken down by category — for the stacked horizontal
// bar. We sum debits only (income/credits aren't "spending"). When a
@@ -889,7 +891,7 @@ export default function GroupDetailPage() {
{tx.description}
</p>
<p className="text-xs text-muted-foreground">
- {new Date(tx.date + 'T00:00:00').toLocaleDateString(locale)}
+ {new Date(tx.date + 'T00:00:00').toLocaleDateString(dateLocale)}
{tx.category?.name ? ` · ${tx.category.name}` : ''}
{tx.splits && tx.splits.length > 0
? ` · ${t('splitGroups.splitWays', { count: tx.splits.length })}`
@@ -937,7 +939,7 @@ export default function GroupDetailPage() {
<span className="font-medium">{memberName_(s.to_member_id)}</span>
</div>
<p className="text-xs text-muted-foreground mt-0.5">
- {new Date(s.date + 'T00:00:00').toLocaleDateString(locale)}
+ {new Date(s.date + 'T00:00:00').toLocaleDateString(dateLocale)}
{s.notes ? ` · ${s.notes}` : ''}
</p>
</div>
diff --git a/frontend/src/pages/import.tsx b/frontend/src/pages/import.tsx
index 401319a5..689aebcb 100644
--- a/frontend/src/pages/import.tsx
+++ b/frontend/src/pages/import.tsx
@@ -1,6 +1,7 @@
import { useState, useRef, useCallback } from 'react'
import { getAccountName } from '@/lib/account-utils'
import { useTranslation } from 'react-i18next'
+import { useDisplayLocale, useDateLocale } from '@/hooks/use-display-locale'
import { useQuery, useMutation, useQueryClient } from '@tanstack/react-query'
import { transactions as transactionsApi, accounts as accountsApi, importLogs as importLogsApi, categories as categoriesApi, categoryGroups as categoryGroupsApi } from '@/lib/api'
import { invalidateFinancialQueries } from '@/lib/invalidate-queries'
@@ -45,11 +46,12 @@ function toReviewTransactions(txns: ImportPreviewTransaction[]): ImportReviewTra
}
export default function ImportPage() {
- const { t, i18n } = useTranslation()
+ const { t } = useTranslation()
const { user } = useAuth()
const { canWrite } = useWorkspace()
const userCurrency = user?.preferences?.currency_display ?? 'USD'
- const locale = i18n.language === 'en' ? 'en-US' : i18n.language
+ const locale = useDisplayLocale()
+ const dateLocale = useDateLocale()
const queryClient = useQueryClient()
const fileInputRef = useRef<HTMLInputElement>(null)
const [previewData, setPreviewData] = useState<{ transactions: ImportPreviewTransaction[]; detected_format: string; csv_columns?: string[]; parse_error?: string | null } | null>(null)
@@ -529,6 +531,7 @@ export default function ImportPage() {
groups={categoryGroupsList}
userCurrency={userCurrency}
locale={locale}
+ dateLocale={dateLocale}
searchQuery={searchQuery}
filterCategoryIds={filterCategoryIds}
filterUncategorized={filterUncategorized}
@@ -595,7 +598,7 @@ export default function ImportPage() {
{importHistory.map((log) => (
<tr key={log.id} className="hover:bg-muted">
<td className="px-3 sm:px-4 py-3 text-xs sm:text-sm text-muted-foreground whitespace-nowrap">
- {new Date(log.created_at).toLocaleString(locale, { dateStyle: 'short', timeStyle: 'short' })}
+ {new Date(log.created_at).toLocaleString(dateLocale, { dateStyle: 'short', timeStyle: 'short' })}
</td>
<td className="px-3 sm:px-4 py-3 font-mono text-xs text-foreground max-w-[120px] sm:max-w-none truncate">{log.filename || '—'}</td>
<td className="px-4 py-3 hidden lg:table-cell">
diff --git a/frontend/src/pages/payees.tsx b/frontend/src/pages/payees.tsx
index 1003179e..8c5d96c2 100644
--- a/frontend/src/pages/payees.tsx
+++ b/frontend/src/pages/payees.tsx
@@ -1,5 +1,6 @@
import { useState } from 'react'
import { useTranslation } from 'react-i18next'
+import { useDisplayLocale, useDateLocale } from '@/hooks/use-display-locale'
import { useQuery, useMutation, useQueryClient } from '@tanstack/react-query'
import { useNavigate } from 'react-router-dom'
import { payees as payeesApi, transactions as transactionsApi } from '@/lib/api'
@@ -36,9 +37,10 @@ function formatCurrency(value: number, currency = 'USD', locale = 'en-US') {
}
export default function PayeesPage() {
- const { t, i18n } = useTranslation()
+ const { t } = useTranslation()
const navigate = useNavigate()
- const locale = i18n.language === 'en' ? 'en-US' : i18n.language
+ const locale = useDisplayLocale()
+ const dateLocale = useDateLocale()
const { mask } = usePrivacyMode()
const { user } = useAuth()
const { canWrite } = useWorkspace()
@@ -339,7 +341,7 @@ export default function PayeesPage() {
<p className="text-xs text-muted-foreground">{t('payees.lastTransaction')}</p>
<p className="text-sm font-medium">
{summaryData.last_transaction_date
- ? new Date(summaryData.last_transaction_date + 'T00:00:00').toLocaleDateString(locale)
+ ? new Date(summaryData.last_transaction_date + 'T00:00:00').toLocaleDateString(dateLocale)
: '—'}
</p>
</div>
@@ -360,7 +362,7 @@ export default function PayeesPage() {
<div className="flex-1 min-w-0">
<p className="text-sm font-medium text-foreground truncate">{tx.description}</p>
<p className="text-xs text-muted-foreground">
- {new Date(tx.date + 'T00:00:00').toLocaleDateString(locale)}
+ {new Date(tx.date + 'T00:00:00').toLocaleDateString(dateLocale)}
{tx.category?.name && <> · {tx.category.name}</>}
</p>
</div>
diff --git a/frontend/src/pages/recurring.tsx b/frontend/src/pages/recurring.tsx
index 50762a6a..56213a59 100644
--- a/frontend/src/pages/recurring.tsx
+++ b/frontend/src/pages/recurring.tsx
@@ -1,6 +1,7 @@
import React, { useState } from 'react'
import { getAccountName } from '@/lib/account-utils'
import { useTranslation } from 'react-i18next'
+import { useDisplayLocale, useDateLocale } from '@/hooks/use-display-locale'
import { useQuery, useMutation, useQueryClient } from '@tanstack/react-query'
import { categories as categoriesApi, categoryGroups as categoryGroupsApi, recurring as recurringApi, accounts as accountsApi, currencies as currenciesApi } from '@/lib/api'
import { invalidateFinancialQueries } from '@/lib/invalidate-queries'
@@ -60,8 +61,9 @@ export default function RecurringPage() {
}
function RecurringTab() {
- const { t, i18n } = useTranslation()
- const locale = i18n.language === 'en' ? 'en-US' : i18n.language
+ const { t } = useTranslation()
+ const locale = useDisplayLocale()
+ const dateLocale = useDateLocale()
const { mask } = usePrivacyMode()
const { user } = useAuth()
const { canWrite } = useWorkspace()
@@ -196,7 +198,7 @@ function RecurringTab() {
</span>
</td>
<td className="py-3 text-xs text-muted-foreground tabular-nums hidden md:table-cell">
- {new Date(rt.next_occurrence + 'T00:00:00').toLocaleDateString(locale)}
+ {new Date(rt.next_occurrence + 'T00:00:00').toLocaleDateString(dateLocale)}
</td>
<td className="py-3 hidden sm:table-cell">
<span className={cn(
diff --git a/frontend/src/pages/reports.tsx b/frontend/src/pages/reports.tsx
index e1a91efc..2b006a2c 100644
--- a/frontend/src/pages/reports.tsx
+++ b/frontend/src/pages/reports.tsx
@@ -1,5 +1,6 @@
import { useState } from 'react'
import { useTranslation } from 'react-i18next'
+import { useDisplayLocale } from '@/hooks/use-display-locale'
import { useQuery } from '@tanstack/react-query'
import {
AreaChart,
@@ -97,11 +98,11 @@ const REPORT_TABS: ReportTab[] = [
]
export default function ReportsPage() {
- const { t, i18n } = useTranslation()
+ const { t } = useTranslation()
const { mask, privacyMode, MASK } = usePrivacyMode()
const { user } = useAuth()
const userCurrency = user?.preferences?.currency_display ?? 'USD'
- const locale = i18n.language === 'en' ? 'en-US' : i18n.language
+ const locale = useDisplayLocale()
const [months, setMonths] = useState(12)
const [interval, setInterval] = useState('monthly')
diff --git a/frontend/src/pages/transactions.tsx b/frontend/src/pages/transactions.tsx
index 805d9b9c..a2d86a34 100644
--- a/frontend/src/pages/transactions.tsx
+++ b/frontend/src/pages/transactions.tsx
@@ -5,6 +5,7 @@ import { currentMonth, monthRange, monthFromRange } from '@/lib/month-utils'
import { MonthStepper } from '@/components/month-stepper'
import { useNavigate, useSearchParams } from 'react-router-dom'
import { useTranslation } from 'react-i18next'
+import { useDisplayLocale, useDateLocale } from '@/hooks/use-display-locale'
import { useQuery, useMutation, useQueryClient } from '@tanstack/react-query'
import { transactions, categories as categoriesApi, categoryGroups as categoryGroupsApi, accounts as accountsApi, recurring, payees as payeesApi, admin, groups as groupsApi, rules as rulesApi } from '@/lib/api'
import { invalidateFinancialQueries } from '@/lib/invalidate-queries'
@@ -69,10 +70,11 @@ function parseHashtags(notes: string | null): string[] {
}
export default function TransactionsPage() {
- const { t, i18n } = useTranslation()
+ const { t } = useTranslation()
const [searchParams] = useSearchParams()
const navigate = useNavigate()
- const locale = i18n.language === 'en' ? 'en-US' : i18n.language
+ const locale = useDisplayLocale()
+ const dateLocale = useDateLocale()
const { mask } = usePrivacyMode()
const { user } = useAuth()
const { canWrite } = useWorkspace()
@@ -928,7 +930,7 @@ export default function TransactionsPage() {
)}
</div>
{showInlineDate && (
- <p className="text-xs text-muted-foreground mt-0.5">{new Date(tx.date + 'T00:00:00').toLocaleDateString(locale)}</p>
+ <p className="text-xs text-muted-foreground mt-0.5">{new Date(tx.date + 'T00:00:00').toLocaleDateString(dateLocale)}</p>
)}
{(showInlineNotes || showInlineTags) && tx.notes && (
<div className="mt-1 space-y-0.5">
@@ -963,7 +965,7 @@ export default function TransactionsPage() {
case 'date':
return (
<TableCell key={col.id} style={widthStyle} className={`${baseClass} text-sm text-muted-foreground tabular-nums`}>
- {new Date(tx.date + 'T00:00:00').toLocaleDateString(locale)}
+ {new Date(tx.date + 'T00:00:00').toLocaleDateString(dateLocale)}
</TableCell>
)
case 'description':
@@ -1086,7 +1088,7 @@ export default function TransactionsPage() {
<MonthStepper
value={steppedMonth}
onChange={handleMonthChange}
- locale={i18n.language === 'en' ? 'en-US' : i18n.language}
+ locale={dateLocale}
prevLabel={t('transactions.monthPrevious')}
nextLabel={t('transactions.monthNext')}
/>
diff --git a/frontend/src/pages/workspace-settings.tsx b/frontend/src/pages/workspace-settings.tsx
index 057cae84..ded825a0 100644
--- a/frontend/src/pages/workspace-settings.tsx
+++ b/frontend/src/pages/workspace-settings.tsx
@@ -1,6 +1,7 @@
import { useEffect, useState } from 'react'
import { useNavigate } from 'react-router-dom'
import { useTranslation } from 'react-i18next'
+import { useDateLocale } from '@/hooks/use-display-locale'
import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
import { toast } from 'sonner'
import { auth as authApi, currencies as currenciesApi, workspaces as workspacesApi } from '@/lib/api'
@@ -71,8 +72,9 @@ const DEFAULT_WORKSPACE_COLOR = '#6366F1'
const DEFAULT_WORKSPACE_ICON = 'briefcase'
export default function WorkspaceSettingsPage() {
- const { t, i18n } = useTranslation()
+ const { t } = useTranslation()
const navigate = useNavigate()
+ const localeForFormat = useDateLocale()
const { current, canManage, workspaces: allWorkspaces, refresh, switchWorkspace } = useWorkspace()
const { user: currentUser, updateUser } = useAuth()
const queryClient = useQueryClient()
@@ -244,7 +246,6 @@ export default function WorkspaceSettingsPage() {
const stats = statsQuery.data ?? { members: 1, accounts: 0, transactions: 0 }
const isManaged = !!current.managed_by_user_id
const isManagerSelf = isManaged && current.managed_by_user_id === currentUser?.id
- const localeForFormat = i18n.language === 'pt-BR' ? 'pt-BR' : 'en-US'
return (
<div className="container max-w-5xl py-8 space-y-6">