Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion fluent-langneg/src/locale.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@ export class LocaleWrapper extends Intl.Locale {
if (tag.length > lsrTagLength) {
let unicodeExtStart: number | undefined = tag.search(/-[a-zA-Z]-/);
if (unicodeExtStart === -1) unicodeExtStart = undefined;
this.variants = tag.substring(lsrTagLength + 1, unicodeExtStart);
this.variants = tag
.substring(lsrTagLength + 1, unicodeExtStart)
.toLowerCase();
}
}
}
Expand Down
49 changes: 49 additions & 0 deletions fluent-langneg/test/langneg_test.js
Original file line number Diff line number Diff line change
Expand Up @@ -172,3 +172,52 @@ suite("Language Negotiation", () => {
}
}
});

suite("Language variant case", () => {
for (const strategy of ["matching", "lookup"]) {
const options = {
strategy,
defaultLocale: strategy === "lookup" ? "fr" : undefined,
};

test(`${strategy} - lowercase variants`, () => {
assert.deepStrictEqual(
negotiateLanguages(
["en-oxendict"],
["en-US-fonipa", "en-US-oxendict"],
options
),
["en-US-oxendict"]
);
});

test(`${strategy} - uppercase available variant`, () => {
assert.deepStrictEqual(
negotiateLanguages(
["en-oxendict"],
["en-US-fonipa", "en-US-OXENDICT"],
options
),
["en-US-OXENDICT"]
);
});

test(`${strategy} - uppercase requested variant`, () => {
assert.deepStrictEqual(
negotiateLanguages(
["en-OXENDICT"],
["en-US-fonipa", "en-US-oxendict"],
options
),
["en-US-oxendict"]
);
});

test(`${strategy} - keeps ignoring an invalid non-ASCII variant`, () => {
assert.deepStrictEqual(
negotiateLanguages(["en"], ["en-Kelvin"], options),
strategy === "lookup" ? ["fr"] : []
);
});
}
});