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: react-i18next, added better support for namespace overrides, corrected e2e-tests #871

Merged
merged 8 commits into from
Apr 24, 2023
Merged

fix: react-i18next, added better support for namespace overrides, corrected e2e-tests #871

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
390850a
feat: fix react-i18next, support scope override, e2e-test fixed
Swiftwork Dec 20, 2022
de31023
fix: key incorrectly stripping out namespace
Swiftwork Jan 5, 2023
981777f
fix: take namespace delimiter into account when extracting keys
Swiftwork Jan 6, 2023
76cbc17
Update examples/by-frameworks/react-i18next/src/App.jsx
kibertoad Apr 24, 2023
96ee4c0
Update src/frameworks/react-i18next.ts
kibertoad Apr 24, 2023
94e60b9
Merge remote-tracking branch 'upstream/main' into fix/react-i18next-f…
Swiftwork Apr 24, 2023
2d4388d
test: updated snapshot for react i18next
Swiftwork Apr 24, 2023
2d89a6c
style: fixed incorrect spelling for dotted
Swiftwork Apr 24, 2023
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
3 changes: 1 addition & 2 deletions examples/by-frameworks/react-i18next/.vscode/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
{
"i18n-ally.localesPaths": "public/locales",
"i18n-ally.enabledFrameworks": [
"react",
"i18next",
"react-i18next",
"general"
],
"i18n-ally.namespace": true,
Expand Down
30 changes: 26 additions & 4 deletions examples/by-frameworks/react-i18next/src/App.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,10 @@ import './App.css'
class LegacyWelcomeClass extends Component {
render() {
const { t } = this.props
const intl = useIntl()
return (
<div>
<h2>Plain Text</h2>
<h2>{t('translation.title')}</h2>
<h2>{intl.formatPlural({ id: 'translation.title' })}</h2>
<h2>{intl.formatMessage({ id: 'translation.title' })}</h2>
</div>
)
}
Expand Down Expand Up @@ -52,7 +49,7 @@ function Page() {
</div>
<div>{t('translation.description.part2')}</div>
{/* plain <Trans>, #423 */}
<Trans>translation.description.part2</Trans>
<Trans i18nKey="translation.description.part2">Fallback text</Trans>
</div>
)
}
Expand All @@ -78,3 +75,28 @@ function Page3() {
// explicit namespace
t('translation:title')
}

// hook with scope in options
function Page4() {
const { t } = useTranslation('pages/home')

t('title')

// explicit namespace
t('title', { ns: 'translation' })
}


// component with scope in props
function Page5() {
const { t } = useTranslation('pages/home');

return (
<div className="App">
<Trans t={t} i18nKey="title"></Trans>
{/* explicit namespace */}
<Trans t={t} i18nKey="title" ns="translation"></Trans>
</div>
)
}

Loading