Skip to content

Commit 63a244a

Browse files
authored
Merge pull request DeusData#1313 from lukiod/fix/accept-language-q-ranking
fix(graph-ui): rank Accept-Language by q instead of substring match
2 parents a8baa5f + e5c3200 commit 63a244a

2 files changed

Lines changed: 41 additions & 2 deletions

File tree

‎graph-ui/src/lib/i18n.test.ts‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,31 @@ describe("i18n", () => {
77
expect(detectLanguage("de-DE,de;q=0.9")).toBe("en");
88
});
99

10+
it("ranks Accept-Language by q rather than by presence", () => {
11+
// A bilingual visitor who prefers English but lists Chinese as a fallback.
12+
expect(detectLanguage("en-US,en;q=0.9,zh;q=0.5")).toBe("en");
13+
expect(detectLanguage("en,zh;q=0.1")).toBe("en");
14+
// Chinese still wins when it is actually preferred.
15+
expect(detectLanguage("zh;q=0.9,en;q=0.5")).toBe("zh");
16+
});
17+
18+
it("treats q=0 as unacceptable", () => {
19+
expect(detectLanguage("zh;q=0, en")).toBe("en");
20+
expect(detectLanguage("zh;q=0")).toBe("en");
21+
});
22+
23+
it("matches the language subtag, not a substring", () => {
24+
expect(detectLanguage("en-GB")).toBe("en");
25+
expect(detectLanguage("zh-Hant-TW")).toBe("zh");
26+
});
27+
28+
it("honours the override and handles empty input", () => {
29+
expect(detectLanguage("zh-CN", "en")).toBe("en");
30+
expect(detectLanguage("en-US", "zh")).toBe("zh");
31+
expect(detectLanguage(null)).toBe("en");
32+
expect(detectLanguage("")).toBe("en");
33+
});
34+
1035
it("keeps UI chrome messages in the catalog", () => {
1136
expect(messages.zh.tabs.projects).toBe("项目");
1237
expect(messages.zh.index.newIndex).toBe("新建索引");

‎graph-ui/src/lib/i18n.ts‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,8 +152,22 @@ export type UiMessages = (typeof messages)[UiLanguage];
152152
export function detectLanguage(acceptLanguage?: string | null, override?: string | null): UiLanguage {
153153
if (override === "zh" || override === "en") return override;
154154
if (!acceptLanguage) return "en";
155-
const normalized = acceptLanguage.toLowerCase();
156-
return normalized.includes("zh-cn") || normalized.includes("zh") ? "zh" : "en";
155+
156+
// Ranked by q, not by whether "zh" appears anywhere. A substring test served
157+
// Chinese for "en-US,en;q=0.9,zh;q=0.5", where English is clearly preferred,
158+
// and for "zh;q=0, en", where q=0 means Chinese is unacceptable.
159+
const best = acceptLanguage
160+
.split(",")
161+
.map((part) => {
162+
const [tag, ...params] = part.trim().split(";");
163+
const q = params.map((p) => /^\s*q\s*=\s*([\d.]+)\s*$/i.exec(p)).find(Boolean);
164+
return { tag: tag.trim().toLowerCase(), q: q ? Number(q[1]) : 1 };
165+
})
166+
.filter(({ tag, q }) => tag && Number.isFinite(q) && q > 0)
167+
.sort((a, b) => b.q - a.q)
168+
.find(({ tag }) => tag.split("-")[0] === "zh" || tag.split("-")[0] === "en");
169+
170+
return best?.tag.startsWith("zh") ? "zh" : "en";
157171
}
158172

159173
let cachedLanguage: UiLanguage = "en";

0 commit comments

Comments
 (0)