Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(i18n): pass search params to fallback #12547

Merged
merged 5 commits into from
Dec 5, 2024
Merged

fix(i18n): pass search params to fallback #12547

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
23a040f
fix(i18n): pass search params to fallback
mtwilliams-code Nov 28, 2024
5f730bb
test(i18n): add test for search param fix
mtwilliams-code Dec 2, 2024
13c47ef
Merge branch 'main' into fix-i18n-search
mtwilliams-code Dec 2, 2024
a0b65cc
Merge branch 'main' into fix-i18n-search
mtwilliams-code Dec 3, 2024
3e42275
test(i18n): resolve mantainer comments
mtwilliams-code Dec 4, 2024
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
5 changes: 5 additions & 0 deletions .changeset/kind-mayflies-argue.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'astro': patch
---

Fixes a bug where URL search parameters weren't passed when using the i18n `fallback` feature.
4 changes: 2 additions & 2 deletions packages/astro/src/i18n/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,9 +375,9 @@ export function redirectToFallback({
}

if (fallbackType === 'rewrite') {
return await context.rewrite(newPathname);
return await context.rewrite(newPathname + context.url.search);
} else {
return context.redirect(newPathname);
return context.redirect(newPathname + context.url.search);
}
}
}
Expand Down
2 changes: 2 additions & 0 deletions packages/astro/test/fixtures/i18n-routing-fallback/src/pages/pt/start.astro
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
---
const currentLocale = Astro.currentLocale;
const search = Astro.url.search.toString()
---

<html>
Expand All @@ -8,5 +9,6 @@ const currentLocale = Astro.currentLocale;
</head>
<body>
Oi essa e start: {currentLocale}
Search: {search}
</body>
</html>
4 changes: 4 additions & 0 deletions packages/astro/test/fixtures/i18n-routing-fallback/src/pages/start.astro
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
---
const search = Astro.url.search
---
<html>
<head>
<title>Astro</title>
</head>
<body>
Start
Search: {search}
</body>
</html>
18 changes: 17 additions & 1 deletion packages/astro/test/i18n-routing.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import * as cheerio from 'cheerio';
import * as assert from 'node:assert/strict';
import { after, afterEach, before, describe, it } from 'node:test';
import * as cheerio from 'cheerio';
import testAdapter from './test-adapter.js';
import { loadFixture } from './test-utils.js';

Expand Down Expand Up @@ -1582,6 +1582,22 @@ describe('[SSR] i18n routing', () => {
assert.equal(response.status, 404);
});

it('should pass search to render when using requested locale', async () => {
let request = new Request('http://example.com/new-site/pt/start?search=1');
let response = await app.render(request);
assert.equal(response.status, 200);
const text = await response.text();
assert.match(text, /Oi essa e start/);
assert.match(text, /search=1/);
});

it('should include search on the redirect when using fallback', async () => {
let request = new Request('http://example.com/new-site/it/start?search=1');
let response = await app.render(request);
assert.equal(response.status, 302);
assert.equal(response.headers.get('location'), '/new-site/start?search=1');
});

describe('with routing strategy [pathname-prefix-always]', () => {
before(async () => {
fixture = await loadFixture({
Expand Down
Loading