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

(examples/with-i18n-next-intl): fixes warning #25928

Merged
merged 7 commits into from
Jul 19, 2021
Merged

(examples/with-i18n-next-intl): fixes warning #25928

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f6cb4cb
(example/with-i18n-next-intl): add other option in translation strings
Jun 9, 2021
0dc0563
(example/with-i18n-next-intl): fix useRouter import
Jun 9, 2021
8347f77
(example/with-i18n-next-intl): remove unused variable
Jun 9, 2021
e67da28
Merge branch 'canary' into fix/example-with-i18n-next-intl-missing-other
Jun 12, 2021
03d807d
Merge branch 'canary' into fix/example-with-i18n-next-intl-missing-other
Jun 14, 2021
f173179
Merge branch 'canary' into fix/example-with-i18n-next-intl-missing-other
Jun 17, 2021
2f4664b
Merge branch 'canary' into fix/example-with-i18n-next-intl-missing-other
ijjk Jul 19, 2021
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
11 changes: 6 additions & 5 deletions examples/with-i18n-next-intl/components/Navigation.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
import { useTranslations } from 'next-intl'
import { useRouter } from 'next/dist/client/router'
import { useRouter } from 'next/router'
import Link from 'next/link'

export default function Navigation() {
const t = useTranslations('Navigation')

const { locale, locales, route } = useRouter()
const otherLocale = locales?.find((cur) => cur !== locale)

Expand All @@ -18,9 +17,11 @@ export default function Navigation() {
<a>{t('about')}</a>
</Link>
</div>
<Link href={route} locale={otherLocale}>
<a>{t('switchLocale', { locale: otherLocale })}</a>
</Link>
{otherLocale && (
<Link href={route} locale={otherLocale}>
<a>{t('switchLocale', { locale: otherLocale })}</a>
</Link>
)}
</div>
)
}
2 changes: 1 addition & 1 deletion examples/with-i18n-next-intl/messages/shared/de.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
"Navigation": {
"index": "Start",
"about": "Über",
"switchLocale": "Zu {locale, select, de {Deutsch} en {Englisch}} wechseln"
"switchLocale": "Zu {locale, select, de {Deutsch} en {Englisch} other {}} wechseln"
}
}
2 changes: 1 addition & 1 deletion examples/with-i18n-next-intl/messages/shared/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
"Navigation": {
"index": "Home",
"about": "About",
"switchLocale": "Switch to {locale, select, de {German} en {English}}"
"switchLocale": "Switch to {locale, select, de {German} en {English} other {}}"
}
}
2 changes: 1 addition & 1 deletion examples/with-i18n-next-intl/pages/_app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { NextIntlProvider } from 'next-intl'

export default function App({ Component, messages, pageProps }) {
export default function App({ Component, pageProps }) {
return (
<NextIntlProvider
// To achieve consistent date, time and number formatting
Expand Down