fix(i18n): localise mobile application salary display

This commit is contained in:
cesnimda
2026-11-10 13:24:10 +01:00
parent 1ce93ca0e3
commit af33e45542
5 changed files with 59 additions and 9 deletions
+1 -1
View File
@@ -768,7 +768,7 @@ export default function JobTable({ refreshToken, pageSize, onPageSizeChange, col
</Box>
<Box>
<Typography variant="overline" sx={{ color: "text.secondary" }}>{t("addJobModalSalary")}</Typography>
<Typography variant="body2" sx={{ fontWeight: 600, fontVariantNumeric: "tabular-nums" }}>{formatSalary(job) ?? "-"}</Typography>
<Typography variant="body2" sx={{ fontWeight: 600, fontVariantNumeric: "tabular-nums" }}>{formatSalary(job, language, t) ?? "-"}</Typography>
</Box>
</Box>
@@ -146,6 +146,42 @@ test("Bokmål display localizes standard statuses without changing API values or
await waitFor(() => expect(mockedApi.patch).toHaveBeenCalledWith("/jobapplications/42/status", { status: "Offer" }));
});
test("mobile salary follows UI language and preserves imported periods and free text", async () => {
const previous = Object.getOwnPropertyDescriptor(window, "matchMedia");
Object.defineProperty(window, "matchMedia", { configurable: true, value: (query: string) => ({
matches: query === "(max-width:767.95px)", media: query, addEventListener: jest.fn(), removeEventListener: jest.fn(),
}) });
const items = [
{ ...job, salaryMin: 800000.5, salaryMax: 900000, salaryCurrency: "NOK", salaryPeriod: "year" },
{ ...job, id: 43, jobTitle: "Second role", salaryMin: 0, salaryPeriod: "constructor" },
{ ...job, id: 44, jobTitle: "Third role", salary: "Lønn etter avtale" },
];
mockedApi.get.mockImplementation((url: string) => Promise.resolve({
data: url === "/companies" ? [job.company] : url === "/jobapplications" ? { items, total: items.length, page: 1, pageSize: 15 } : [],
} as any));
try {
show();
await screen.findByText(job.jobTitle);
const normalize = (value: string | null) => value?.replace(/\s/g, " ");
const salary = (locale: string, period: string) => {
const fmt = new Intl.NumberFormat(locale);
return normalize(`${fmt.format(800000.5)}–${fmt.format(900000)} NOK/${period}`);
};
const card = (title: string) => screen.getByRole("link", { name: new RegExp(title, "i") });
expect(normalize(card(job.jobTitle).textContent)).toContain(salary("en", translations.en.salaryPeriodYear));
const params = lastParams();
await act(async () => { window.dispatchEvent(new StorageEvent("storage", { key: "uiLanguage", newValue: "nb" })); });
expect(normalize(card(job.jobTitle).textContent)).toContain(salary("nb-NO", translations.nb.salaryPeriodYear));
expect(within(card("Second role")).getByText("0/constructor")).toBeVisible();
expect(within(card("Third role")).getByText("Lønn etter avtale")).toBeVisible();
expect(lastParams()).toEqual(params);
expect(mockedApi.put).not.toHaveBeenCalled();
} finally {
if (previous) Object.defineProperty(window, "matchMedia", previous);
else Reflect.deleteProperty(window, "matchMedia");
}
});
test("partial bulk failure refreshes successful rows and retains only failed visible IDs", async () => {
const other = { ...job, id: 43, jobTitle: "Second role" };
mockedApi.get.mockImplementation((url: string) => Promise.resolve({ data: url === "/companies" ? [job.company] : url === "/jobapplications" ? { items: [job, other], total: 2, page: 1, pageSize: 15 } : [] } as any));
+11 -8
View File
@@ -1,21 +1,24 @@
import { JobApplication } from "./types";
import type { TranslationKey, UiLanguage } from "./i18n/translations";
import type { JobApplication } from "./types";
type SalaryFields = Pick<JobApplication, "salary" | "salaryMin" | "salaryMax" | "salaryCurrency" | "salaryPeriod">;
const PERIOD_SUFFIX: Record<string, string> = { year: "yr", month: "mo", hour: "hr" };
/** Structured salary when present ("60 000–70 000 NOK/yr"), otherwise the free-text field. */
export function formatSalary(job: SalaryFields): string | null {
/** Localised structured salary, otherwise the original free-text field. */
export function formatSalary(job: SalaryFields, language: UiLanguage, t: (key: TranslationKey) => string): string | null {
const { salaryMin, salaryMax, salaryCurrency, salaryPeriod } = job;
if (salaryMin == null && salaryMax == null) {
return job.salary?.trim() || null;
}
const fmt = (value: number) => value.toLocaleString();
const fmt = (value: number) => value.toLocaleString(language === "nb" ? "nb-NO" : "en");
const range = salaryMin != null && salaryMax != null && salaryMin !== salaryMax
? `${fmt(salaryMin)}–${fmt(salaryMax)}`
: fmt((salaryMin ?? salaryMax) as number);
const currency = salaryCurrency ? ` ${salaryCurrency}` : "";
const period = salaryPeriod ? `/${PERIOD_SUFFIX[salaryPeriod] ?? salaryPeriod}` : "";
return `${range}${currency}${period}`;
const period = salaryPeriod?.toLowerCase();
const periodLabel = period === "year" ? t("salaryPeriodYear")
: period === "month" ? t("salaryPeriodMonth")
: period === "hour" ? t("salaryPeriodHour")
: salaryPeriod;
return `${range}${currency}${periodLabel ? `/${periodLabel}` : ""}`;
}