Bug: loadLocaleFrom() fails Node

Details: --- *
crs1138 · Aug 16, 2023 · f8f7fb4 · f8f7fb4
1 parent 01a4084
commit f8f7fb4
Show file tree

Hide file tree

Showing 13 changed files with 49 additions and 2 deletions.
diff --git a/...with-app-directory/locales/ca/common.json → ...s/with-app-directory/honza/ca/common.json b/...with-app-directory/locales/ca/common.json → ...s/with-app-directory/honza/ca/common.json
diff --git a/...s/with-app-directory/locales/ca/home.json → ...les/with-app-directory/honza/ca/home.json b/...s/with-app-directory/locales/ca/home.json → ...les/with-app-directory/honza/ca/home.json
diff --git a/examples/with-app-directory/honza/cs/common.json b/examples/with-app-directory/honza/cs/common.json
@@ -0,0 +1,6 @@
+{
+ "title": "next-translate knihovna",
+ "second-page": "Druhá <0>stránka</0>",
+ "loading": "Nahrávám...",
+ "layout-title": "Titulek rozložení"
+}
diff --git a/examples/with-app-directory/honza/cs/home.json b/examples/with-app-directory/honza/cs/home.json
@@ -0,0 +1,3 @@
+{
+ "client-only": "Pouze client-side"
+}
diff --git a/...with-app-directory/locales/en/common.json → ...s/with-app-directory/honza/en/common.json b/...with-app-directory/locales/en/common.json → ...s/with-app-directory/honza/en/common.json
diff --git a/...s/with-app-directory/locales/en/home.json → ...les/with-app-directory/honza/en/home.json b/...s/with-app-directory/locales/en/home.json → ...les/with-app-directory/honza/en/home.json
diff --git a/...with-app-directory/locales/es/common.json → ...s/with-app-directory/honza/es/common.json b/...with-app-directory/locales/es/common.json → ...s/with-app-directory/honza/es/common.json
diff --git a/...s/with-app-directory/locales/es/home.json → ...les/with-app-directory/honza/es/home.json b/...s/with-app-directory/locales/es/home.json → ...les/with-app-directory/honza/es/home.json
diff --git a/examples/with-app-directory/i18n.js b/examples/with-app-directory/i18n.js
@@ -1,9 +1,18 @@
 module.exports = {
- locales: ['en', 'ca', 'es'],
+ locales: ['en', 'ca', 'es', 'cs'],
  defaultLocale: 'en',
  pages: {
  '*': ['common'],
  '/[lang]': ['home'],
  '/[lang]/second-page': ['home'],
+ '/[lang]/[slug]': ['home'],
+ },
+ loadLocaleFrom: (locale, namespace) => {
+ const i18nLocale = `./honza/${locale}/${namespace}.json`
+ console.log('i18n.js > loadLocaleFrom() :::', { i18nLocale })
+
+ return import(i18nLocale)
+ .then((m) => m.default)
+ .catch((e) => console.error(e))
  },
 }
diff --git a/examples/with-app-directory/src/app/[lang]/[slug]/page.tsx b/examples/with-app-directory/src/app/[lang]/[slug]/page.tsx
@@ -0,0 +1,16 @@
+import Link from 'next/link'
+import useTranslation from 'next-translate/useTranslation'
+import Trans from 'next-translate/Trans'
+
+export default function Page() {
+ const { t, lang } = useTranslation('common')
+ return (
+ <>
+ <h2>{t`title`}</h2>
+ <Trans i18nKey="common:second-page" components={[<b />]} />
+ <div>
+ <Link href={`/${lang}`}>⬅️</Link>
+ </div>
+ </>
+ )
+}
diff --git a/examples/with-app-directory/src/app/[lang]/layout.tsx b/examples/with-app-directory/src/app/[lang]/layout.tsx
@@ -2,18 +2,25 @@ import useTranslation from 'next-translate/useTranslation'
 import i18n from '../../../i18n'
 import { redirect } from 'next/navigation'
 
+export async function generateStaticParams() {
+ return [{ lang: 'en' }, { lang: 'es' }, { lang: 'ca' }, { lang: 'cs' }]
+}
+
 export default function RootLayout({
  children,
+ params,
 }: {
  children: React.ReactNode
+ params?: any
 }) {
  const { t, lang } = useTranslation('common')
+ console.log({ lang })
 
  // Redirect to default locale if lang is not supported. /second-page -> /en/second-page
  if (!i18n.locales.includes(lang)) redirect(`/${i18n.defaultLocale}/${lang}`)
 
  return (
- <html lang={lang}>
+ <html lang={params.lang}>
  <head />
  <body>
  <h1>{t`layout-title`}</h1>

diff --git a/examples/with-app-directory/src/app/[lang]/page.tsx b/examples/with-app-directory/src/app/[lang]/page.tsx
@@ -7,6 +7,7 @@ export default async function Page() {
  await sleep(500) // simulate slow page load to show loading page
 
  const { t, lang } = useTranslation('common')
+ console.log({ lang })
 
  return (
  <>
@@ -26,6 +27,10 @@ export default async function Page() {
  <Link href="/ca">Català</Link>
  </div>
 
+ <div>
+ <Link href="/cs">Česky</Link>
+ </div>
+
  <div>
  <Link href={`/${lang}/second-page`}>➡️</Link>
  </div>

diff --git a/examples/with-app-directory/src/app/[lang]/second-page/page.tsx b/examples/with-app-directory/src/app/[lang]/second-page/page.tsx
@@ -10,6 +10,7 @@ export default function Page() {
  <Trans i18nKey="common:second-page" components={[<b />]} />
  <div>
  <Link href={`/${lang}`}>⬅️</Link>
+ Hi
  </div>
  </>
  )