-
-
Notifications
You must be signed in to change notification settings - Fork 2.5k
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.
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
feat(i18n): domain with lookup table #9112
Merged
Merged
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
951ad8a
feat(i18n): domain with lookup table
ematipico 4d1f42c
make logic simpler
ematipico 0737f40
fix validation error
ematipico c441b32
fix test case
ematipico c2c292e
chore: add more cases
ematipico f244a0d
chore: address comments
ematipico 28f5a7c
test assertion
ematipico File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
19 changes: 19 additions & 0 deletions
19
packages/astro/test/fixtures/i18n-routing-subdomain/astro.config.mjs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
import { defineConfig} from "astro/config"; | ||
|
||
export default defineConfig({ | ||
trailingSlash: "never", | ||
experimental: { | ||
i18n: { | ||
defaultLocale: 'en', | ||
locales: [ | ||
'en', 'pt', 'it' | ||
], | ||
domains: { | ||
pt: "https://example.pt" | ||
}, | ||
routingStrategy: "domain" | ||
}, | ||
|
||
}, | ||
base: "/new-site" | ||
}) |
8 changes: 8 additions & 0 deletions
8
packages/astro/test/fixtures/i18n-routing-subdomain/package.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
{ | ||
"name": "@test/i18n-routing-subdomain", | ||
"version": "0.0.0", | ||
"private": true, | ||
"dependencies": { | ||
"astro": "workspace:*" | ||
} | ||
} |
18 changes: 18 additions & 0 deletions
18
packages/astro/test/fixtures/i18n-routing-subdomain/src/pages/en/blog/[id].astro
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
--- | ||
export function getStaticPaths() { | ||
return [ | ||
{params: {id: '1'}, props: { content: "Hello world" }}, | ||
{params: {id: '2'}, props: { content: "Eat Something" }}, | ||
{params: {id: '3'}, props: { content: "How are you?" }}, | ||
]; | ||
} | ||
const { content } = Astro.props; | ||
--- | ||
<html> | ||
<head> | ||
<title>Astro</title> | ||
</head> | ||
<body> | ||
{content} | ||
</body> | ||
</html> |
8 changes: 8 additions & 0 deletions
8
packages/astro/test/fixtures/i18n-routing-subdomain/src/pages/en/index.astro
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
<html> | ||
<head> | ||
<title>Astro</title> | ||
</head> | ||
<body> | ||
Hello | ||
</body> | ||
</html> |
8 changes: 8 additions & 0 deletions
8
packages/astro/test/fixtures/i18n-routing-subdomain/src/pages/en/start.astro
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
<html> | ||
<head> | ||
<title>Astro</title> | ||
</head> | ||
<body> | ||
Start | ||
</body> | ||
</html> |
18 changes: 18 additions & 0 deletions
18
packages/astro/test/fixtures/i18n-routing-subdomain/src/pages/pt/blog/[id].astro
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
--- | ||
export function getStaticPaths() { | ||
return [ | ||
{params: {id: '1'}, props: { content: "Hola mundo" }}, | ||
{params: {id: '2'}, props: { content: "Eat Something" }}, | ||
{params: {id: '3'}, props: { content: "How are you?" }}, | ||
]; | ||
} | ||
const { content } = Astro.props; | ||
--- | ||
<html> | ||
<head> | ||
<title>Astro</title> | ||
</head> | ||
<body> | ||
{content} | ||
</body> | ||
</html> |
8 changes: 8 additions & 0 deletions
8
packages/astro/test/fixtures/i18n-routing-subdomain/src/pages/pt/start.astro
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
<html> | ||
<head> | ||
<title>Astro</title> | ||
</head> | ||
<body> | ||
Oi essa e start | ||
</body> | ||
</html> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -9,7 +9,8 @@ export default defineConfig({ | |
], | ||
domains: { | ||
it: "https://it.example.com" | ||
} | ||
}, | ||
routingStrategy: "domain" | ||
} | ||
}, | ||
}) |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I have some questions about how this works to be sure I understand:
routingStrategy: "domain"
, what happens to the URLs for yourdefaultLocale
? Does it depend on whether you're using a/[defaultLocale]/
folder structure? Does it make any assumptions by default?/locale/
folders, that the URLs will be prefixed if you don't specifically add them todomains
? So, it's possible for a site to have a mixture of e.g.example.com/fr/
andes.example.com
?domains
ignored ifroutingStrategy
is set to one of the two other options? Could it cause problems to havedomains
configured if you do NOT havedomain
set as your routing strategy?domains
androutingStrategy
matter in thei18n
configuration? Could someone run into trouble if these are not in the proper order?routingStrategy
is outside of the object containing the other config options. In the docs, we show it as inside this object. Can you confirm which should be correct?Thanks!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
src/pages/[locale]
. The same goes for thedefaultLocale
. If the default locale isn't mapped to a domain, there aren't any assumptions. Although we are still evaluating the behaviour ofdefaultLocale
, so it's possible we will change it soon.i18n.domains
androutingStategy: "prefix-always"
, Astro will throw a validation nerror.routingStategy
is inside thei18n
, same goes fordomains
. Are you referring to something else?