AnimeFunsion/modular-avatar
1
0
Fork 0
mirror of https://github.com/bdunderscore/modular-avatar.git synced 2025-01-01 20:25:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

docs: fix accept-language handling

Browse Source
This commit is contained in:
bd_ 2023-10-11 20:26:54 +09:00
parent bd1bb55569
commit 8dd46c5576
3 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs-site~/package.json
View File

@ -11,6 +11,6 @@
"publish": "wrangler publish" "publish": "wrangler publish"
}, },
"dependencies": { "dependencies": {
"accept-language": "^3.0.18" "intl-parse-accept-language": "^1.0.0"
} }
} }

24
docs-site~/src/index.js
View File

@ -3,7 +3,7 @@ import {
mapRequestToAsset, mapRequestToAsset,
} from "@cloudflare/kv-asset-handler"; } from "@cloudflare/kv-asset-handler";
import acceptLanguage from 'accept-language'; import { parseAcceptLanguage } from 'intl-parse-accept-language';
/** /**
* The DEBUG flag will do two things that help during development: * The DEBUG flag will do two things that help during development:
@ -20,8 +20,6 @@ addEventListener("fetch", (event) => {
const STRIP_SUFFIX_RE = new RegExp('^(/.+)(?:/(?:index\.html)?|\.html)$'); const STRIP_SUFFIX_RE = new RegExp('^(/.+)(?:/(?:index\.html)?|\.html)$');
acceptLanguage.languages(['en-US', 'ja-JP']);
async function handleEvent(event) { async function handleEvent(event) {
let options = {}; let options = {};
@ -46,11 +44,21 @@ async function handleEvent(event) {
const strip_match = STRIP_SUFFIX_RE.exec(path); const strip_match = STRIP_SUFFIX_RE.exec(path);
if (url.searchParams.get("lang") === 'auto') { if (url.searchParams.get("lang") === 'auto') {
let resolvedLanguage = acceptLanguage.get(event.request.headers.get('Accept-Language')); const languages = parseAcceptLanguage(event.request.headers.get('Accept-Language'));
if (resolvedLanguage === null) {
resolvedLanguage = 'en-US'; let resolvedLanguage = 'en';
} else { if (languages !== null) {
resolvedLanguage = resolvedLanguage.split('-')[0]; for (const language of languages) {
if (language === 'ja' || language === 'ja-JP') {
resolvedLanguage = 'ja';
break;
}
if (language === 'en' || language.startsWith('en-')) {
resolvedLanguage = 'en';
break;
}
}
} }
let destination; let destination;

8
docs-site~/yarn.lock
View File

@ -978,6 +978,13 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"intl-parse-accept-language@npm:^1.0.0":
version: 1.0.0
resolution: "intl-parse-accept-language@npm:1.0.0"
checksum: c1dcc0f520cb85be391f1cf4b5f691ab19183e5d8e8f5277c0d2210a78a6d01ee907b9bb70f7425c4a8d5a9ed86f8b18a8d53f089025772d89f5cbe39282f266
languageName: node
linkType: hard
"ip@npm:^2.0.0": "ip@npm:^2.0.0":
version: 2.0.0 version: 2.0.0
resolution: "ip@npm:2.0.0" resolution: "ip@npm:2.0.0"
@ -1778,6 +1785,7 @@ __metadata:
dependencies: dependencies:
"@cloudflare/kv-asset-handler": ^0.2.0 "@cloudflare/kv-asset-handler": ^0.2.0
accept-language: ^3.0.18 accept-language: ^3.0.18
intl-parse-accept-language: ^1.0.0
wrangler: ^3.11.0 wrangler: ^3.11.0
languageName: unknown languageName: unknown
linkType: soft linkType: soft