Infrastructure/astro
0
Fork 0
mirror of https://github.com/withastro/astro.git synced 2024-12-30 22:03:56 -05:00
Code Issues Activity

fix: correctly return 404.astro in i18n (#12764)

Browse source
This commit is contained in:
Emanuele Stoppa 2024-12-19 11:22:25 +00:00 committed by GitHub
parent 45005a581d
commit 4353fc5ccf
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
packages/astro/src/i18n/middleware.ts
View file

@ -31,7 +31,7 @@ export function createI18nMiddleware(
const _requestHasLocale = requestHasLocale(payload.locales);
const _redirectToFallback = redirectToFallback(payload);
const prefixAlways = (context: APIContext): Response | undefined => {
const prefixAlways = (context: APIContext, response: Response): Response | undefined => {
const url = context.url;
if (url.pathname === base + '/' || url.pathname === base) {
return _redirectToDefaultLocale(context);
@ -39,7 +39,7 @@ export function createI18nMiddleware(
// Astro can't know where the default locale is supposed to be, so it returns a 404.
else if (!_requestHasLocale(context)) {
return _noFoundForNonLocaleRoute(context);
return _noFoundForNonLocaleRoute(context, response);
}
return undefined;
@ -124,7 +124,7 @@ export function createI18nMiddleware(
}
case 'pathname-prefix-always': {
const result = prefixAlways(context);
const result = prefixAlways(context, response);
if (result) {
return result;
}
@ -132,7 +132,7 @@ export function createI18nMiddleware(
}
case 'domains-prefix-always': {
if (localeHasntDomain(i18n, currentLocale)) {
const result = prefixAlways(context);
const result = prefixAlways(context, response);
if (result) {
return result;
}

11
packages/astro/test/i18n-routing.test.js
View file

@ -152,11 +152,22 @@ describe('[DEV] i18n routing', () => {
it("should NOT render the default locale if there isn't a fallback and the route is missing", async () => {
const response = await fixture.fetch('/it/start');
assert.equal(response.status, 404);
const html = await response.text();
assert.match(html, /Can't find the page you're looking for./);
});
it("should render a 404 because the route `fr` isn't included in the list of locales of the configuration", async () => {
const response = await fixture.fetch('/fr/start');
assert.equal(response.status, 404);
const html = await response.text();
assert.match(html, /Can't find the page you're looking for./);
});
it('should render the custom 404.astro when navigating non-existing routes ', async () => {
const response = await fixture.fetch('/does-not-exist');
assert.equal(response.status, 404);
const html = await response.text();
assert.match(html, /Can't find the page you're looking for./);
});
});