Skip to content

Lightweight server monitoring with historical data, docker stats, and alerts.

fix(hub): use app language for number formatting (#2621)

Sven van Ginkeld3161e0212b0
diff --git a/internal/site/src/components/routes/system/smart-table.tsx b/internal/site/src/components/routes/system/smart-table.tsx
index 9bc047d3f..cf62a0c27 100644
--- a/internal/site/src/components/routes/system/smart-table.tsx
+++ b/internal/site/src/components/routes/system/smart-table.tsx
@@ -46,6 +46,7 @@ import {
secondsToString,
hourWithSeconds,
formatShortDate,
+ formatNumber,
} from "@/lib/utils"
import { Trans } from "@lingui/react/macro"
import { useStore } from "@nanostores/react"
@@ -229,7 +230,7 @@ export const createColumns = (
if (cycles == null) {
return <div className="text-muted-foreground ms-1">N/A</div>
}
- return <span className="ms-1">{cycles.toLocaleString()}</span>
+ return <span className="ms-1">{formatNumber(cycles)}</span>
},
},
{
diff --git a/internal/site/src/components/ui/chart.tsx b/internal/site/src/components/ui/chart.tsx
index 8bfe85980..d9a8599e5 100644
--- a/internal/site/src/components/ui/chart.tsx
+++ b/internal/site/src/components/ui/chart.tsx
@@ -1,7 +1,7 @@
import { useLingui } from "@lingui/react/macro"
import * as React from "react"
import * as RechartsPrimitive from "recharts"
-import { chartTimeData, cn } from "@/lib/utils"
+import { chartTimeData, cn, formatNumber } from "@/lib/utils"
import type { ChartTimes } from "@/types"
import { Separator } from "./separator"
import type { AxisDomain } from "recharts/types/util/types"
@@ -200,7 +200,7 @@ const ChartTooltipContent = React.forwardRef<
return content(totalItem, totalKey)
}
- return `${totalValue.toLocaleString()}${unit ?? ""}`
+ return `${formatNumber(totalValue)}${unit ?? ""}`
}, [color, content, formatter, nameKey, payload, showTotal, totalName, unit])
const tooltipLabel = React.useMemo(() => {
@@ -300,7 +300,8 @@ const ChartTooltipContent = React.forwardRef<
<span className="font-medium text-foreground">
{content && typeof content === "function"
? content(item, key)
- : item.value.toLocaleString() + (unit ? unit : "")}
+ : (typeof item.value === "number" ? formatNumber(item.value) : String(item.value)) +
+ (unit ? unit : "")}
</span>
)}
</div>
diff --git a/internal/site/src/lib/utils.ts b/internal/site/src/lib/utils.ts
index a85bed083..4cd328228 100644
--- a/internal/site/src/lib/utils.ts
+++ b/internal/site/src/lib/utils.ts
@@ -1,3 +1,4 @@
+import { i18n } from "@lingui/core"
import { plural, t } from "@lingui/core/macro"
import { type ClassValue, clsx } from "clsx"
import { listenKeys } from "nanostores"
@@ -181,19 +182,32 @@ export function toFixedFloat(num: number, digits: number) {
return parseFloat((digits === 0 ? Math.ceil(num) : num).toFixed(digits))
}
-const decimalFormatters: Map<number, Intl.NumberFormat> = new Map()
+/** Locale used for number formatting: the app's selected language, not the browser's */
+function numberLocale() {
+ return i18n.locale || undefined
+}
+
+/** Format number using the app's selected language (e.g. decimal and grouping separators) */
+export function formatNumber(num: number) {
+ return num.toLocaleString(numberLocale(), { numberingSystem: "latn" })
+}
+
+const decimalFormatters: Map<string, Intl.NumberFormat> = new Map()
/** Format number to x decimal places, maintaining trailing zeros */
export function decimalString(num: number, digits = 2) {
if (digits === 0) {
return Math.ceil(num).toString()
}
- let formatter = decimalFormatters.get(digits)
+ const locale = numberLocale()
+ const key = `${locale}:${digits}`
+ let formatter = decimalFormatters.get(key)
if (!formatter) {
- formatter = new Intl.NumberFormat(undefined, {
+ formatter = new Intl.NumberFormat(locale, {
minimumFractionDigits: digits,
maximumFractionDigits: digits,
+ numberingSystem: "latn",
})
- decimalFormatters.set(digits, formatter)
+ decimalFormatters.set(key, formatter)
}
return formatter.format(num)
}
@@ -553,7 +567,7 @@ export function matchesFilterGroups(searchString: string, groups: string[][]): b
/** Format seconds to hours, minutes, or seconds */
export function secondsToString(seconds: number, unit: "hour" | "minute" | "day"): string {
const count = Math.floor(seconds / (unit === "hour" ? 3600 : unit === "minute" ? 60 : 86400))
- const countString = count.toLocaleString()
+ const countString = formatNumber(count)
switch (unit) {
case "minute":
return plural(count, {