diff --git a/fluent-langneg/src/accepted_languages.ts b/fluent-langneg/src/accepted_languages.ts index 2a232ad3..117809f2 100644 --- a/fluent-langneg/src/accepted_languages.ts +++ b/fluent-langneg/src/accepted_languages.ts @@ -9,8 +9,12 @@ export function acceptedLanguages(acceptLanguageHeader = ""): string[] { const langsWithQ: Array<{ lang: string; q: number; index: number }> = []; for (const token of acceptLanguageHeader.matchAll(entryRegexp)) { + const lang = token[1].trim(); + if (lang === "") { + continue; + } const q = token[2] ? parseFloat(token[2]) || 0 : 1; - langsWithQ.push({ lang: token[1].trim(), q, index: token.index }); + langsWithQ.push({ lang, q, index: token.index }); } // order by q descending, keeping the header order for equal weights diff --git a/fluent-langneg/test/headers_test.js b/fluent-langneg/test/headers_test.js index e54e4620..4e93a3a3 100644 --- a/fluent-langneg/test/headers_test.js +++ b/fluent-langneg/test/headers_test.js @@ -48,6 +48,24 @@ suite("parse headers", () => { ); }); + test("with whitespace-only entries", () => { + assert.deepStrictEqual(acceptedLanguages("en-US, ,\t, fr"), [ + "en-US", + "fr", + ]); + }); + + test("with only whitespace entries", () => { + assert.deepStrictEqual(acceptedLanguages(" ,\t, "), []); + }); + + test("with whitespace entries and quality values", () => { + assert.deepStrictEqual( + acceptedLanguages("en;q=0.8, , fr;q=0.9,\t, de;q=0.7"), + ["fr", "en", "de"] + ); + }); + test("edge cases", () => { const args = [null, NaN, Infinity, [], {}];