Fix 1181: Missing namespaces if they are not in the defaultLanguage (but exist in the fallbackLng) #1197

Nikoms · 2021-05-13T15:28:24Z

Fix for #1181

Tell me if I need to modify things 🤓

In createConfig.test.ts, I had to add a as unknown for fallbackLng (line 64). Don't know why, because it's a valid value.

Cheers!

vercel · 2021-05-13T15:28:28Z

This pull request is being automatically deployed with Vercel (learn more).
To see the status of your deployment, click below or on the icon next to each commit.

🔍 Inspect: https://vercel.com/isaachinman/next-i18next/4Q5Q3ff2bBG7GgEgxxzcksomhzFE
✅ Preview: https://next-i18next-git-fork-nikoms-fix-1181-isaachinman.vercel.app

Nikoms · 2021-05-13T16:10:51Z

I'm working on the code to make it pass on codeclimate and multi-build 😁

I don't know if all remarks of codeclimate are justified, (Similar blocks for expected variable in tests) but I'll do my best :)

…ackLng

Nikoms · 2021-05-13T23:14:40Z

Done 😘

isaachinman · 2021-05-14T12:16:33Z

src/config/createConfig.test.ts

+      })
+
+      it('gets namespaces from current language + fallback (as object) when ns is not provided', ()=>{
+        const fallbackLng = {default: ['fr'], 'en-US': ['en']} as unknown


Suggested change

const fallbackLng = {default: ['fr'], 'en-US': ['en']} as unknown

const fallbackLng = { default: ['fr'], 'en-US': ['en'] } as unknown

Do you think that these rules could be added in the linter?

isaachinman · 2021-05-14T12:17:15Z

src/config/createConfig.ts

-          )
-        combinedConfig.ns = getAllNamespaces(path.resolve(process.cwd(), `${serverLocalePath}/${lng}`))
+      if (!combinedConfig.ns && typeof lng !== 'undefined') {
+        const unique = (list:string[]) => Array.from(new Set<string>(list))


Suggested change

const unique = (list:string[]) => Array.from(new Set<string>(list))

const unique = (list: string[]) => Array.from(new Set<string>(list))

isaachinman · 2021-05-14T12:18:26Z

src/config/createConfig.ts

+            .reduce(
+              (flattenNamespaces, namespaces) =>
+                [...flattenNamespaces,...namespaces],
+              []
+            )


Is there a way to achieve this without using reduce?

isaachinman · 2021-05-14T12:18:48Z

src/config/createConfig.ts

+          if (typeof fallbackLng === 'string')
+            return unique([lng, fallbackLng])
+
+          if (Array.isArray(fallbackLng))
+            return unique([lng, ...fallbackLng])
+


Let's use curly braces for any if statements.

isaachinman · 2021-05-14T12:19:16Z

src/config/createConfig.ts

+          if (typeof fallbackLng === 'object') {
+            const flattenedFallbacks = Object
+              .values(fallbackLng)
+              .reduce(((all, fallbackLngs) => [...all,...fallbackLngs]),[])


Suggested change

.reduce(((all, fallbackLngs) => [...all,...fallbackLngs]),[])

.reduce(((all, fallbackLngs) => [ ...all, ...fallbackLngs ]),[])

isaachinman · 2021-05-14T12:19:25Z

src/config/createConfig.ts

+            const flattenedFallbacks = Object
+              .values(fallbackLng)
+              .reduce(((all, fallbackLngs) => [...all,...fallbackLngs]),[])
+            return unique([lng, ...flattenedFallbacks])


Suggested change

return unique([lng, ...flattenedFallbacks])

return unique([ lng, ...flattenedFallbacks ])

isaachinman · 2021-05-14T12:20:45Z

src/serverSideTranslations.ts


 const DEFAULT_CONFIG_PATH = './next-i18next.config.js'

+const getFallBackLocales = (fallbackLng: false | FallbackLng) => {


Suggested change

const getFallBackLocales = (fallbackLng: false | FallbackLng) => {

const getFallbackLocales = (fallbackLng: false | FallbackLng) => {

isaachinman · 2021-05-14T12:21:07Z

src/serverSideTranslations.ts

+  if (typeof fallbackLng === 'object') {
+    return Object
+      .values(fallbackLng)
+      .reduce((all, locales) => [...all, ...locales],[])


Again, can we use a different method than reduce?

Did a loop. There is array.flat() but it's not available in node 10 :(

isaachinman · 2021-05-14T12:21:23Z

src/serverSideTranslations.ts

+  if (Array.isArray(fallbackLng)) {
+    return fallbackLng
+  }
+  if (typeof fallbackLng === 'object') {


Won't this condition also enter for null?

You are right, but I wonder if the fallbackLng can have the null value. I'll add an extra condition :)

isaachinman · 2021-05-14T12:21:51Z

src/serverSideTranslations.ts

+      .reduce(
+        (allNamespaces, namespaces) => [...allNamespaces,...namespaces],
+        []


Again, possible to use something other than reduce?

of course :)

Nikoms · 2021-05-14T13:26:44Z

Done everything 🥳 Cyclomatic complexity to 5 is a challenge 😁

Nikoms · 2021-05-21T15:16:22Z

Hi @isaachinman , do I have to do something more for this PR?

isaachinman · 2021-05-21T15:30:17Z

Nope, looks reasonable to me! Thanks for all your hard work @Nikoms!

Nikoms · 2021-05-22T12:30:05Z

Thank youuu, I'll wait for the "official" new version. I believe 8.3.1 ?

vercel bot deployed to Preview May 13, 2021 15:28 View deployment

vercel bot deployed to Preview May 13, 2021 15:29 View deployment

vercel bot deployed to Preview May 13, 2021 15:31 View deployment

vercel bot deployed to Preview May 13, 2021 15:52 View deployment

vercel bot deployed to Preview May 13, 2021 15:56 View deployment

vercel bot deployed to Preview May 13, 2021 16:01 View deployment

vercel bot deployed to Preview May 13, 2021 16:17 View deployment

vercel bot deployed to Preview May 13, 2021 22:27 View deployment

vercel bot deployed to Preview May 13, 2021 22:30 View deployment

vercel bot deployed to Preview May 13, 2021 22:38 View deployment

vercel bot had a problem deploying to Preview May 13, 2021 22:50 Failure

vercel bot had a problem deploying to Preview May 13, 2021 22:52 Failure

vercel bot deployed to Preview May 13, 2021 22:59 View deployment

vercel bot deployed to Preview May 13, 2021 23:01 View deployment

vercel bot deployed to Preview May 13, 2021 23:05 View deployment

fix(1181): Get namespaces from current locale/all locales + all fallb…

37831e3

…ackLng

Nikoms force-pushed the fix-1181 branch from 0790c15 to 37831e3 Compare May 13, 2021 23:09

vercel bot deployed to Preview May 13, 2021 23:09 View deployment

isaachinman reviewed May 14, 2021

View reviewed changes

fix(1181): review

b0b9ccb

vercel bot deployed to Preview May 14, 2021 13:01 View deployment

fix(1181): review

a3ec88e

vercel bot deployed to Preview May 14, 2021 13:03 View deployment

fix(1181): try this do have less "complexity" in codeclimate

3e68ab6

vercel bot deployed to Preview May 14, 2021 13:05 View deployment

fix(1181): rollback

c2772df

vercel bot deployed to Preview May 14, 2021 13:07 View deployment

fix(1181): test null first

c2c03c3

vercel bot deployed to Preview May 14, 2021 13:10 View deployment

fix(1181): rollback

562d314

vercel bot deployed to Preview May 14, 2021 13:13 View deployment

fix(1181): try this do have less "complexity" in codeclimate

e882e65

vercel bot deployed to Preview May 14, 2021 13:18 View deployment

fix(1181): Move flatNamespaces to the top

dd65400

vercel bot deployed to Preview May 14, 2021 13:20 View deployment

isaachinman mentioned this pull request May 18, 2021

Multi Fallback Language #1210

Closed

Merge branch 'master' into fix-1181

10166e4

vercel bot deployed to Preview May 19, 2021 12:38 View deployment

isaachinman approved these changes May 21, 2021

View reviewed changes

isaachinman merged commit 7474c93 into i18next:master May 21, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix 1181: Missing namespaces if they are not in the defaultLanguage (but exist in the fallbackLng) #1197

Fix 1181: Missing namespaces if they are not in the defaultLanguage (but exist in the fallbackLng) #1197

Nikoms commented May 13, 2021 •

edited

Loading

vercel bot commented May 13, 2021 •

edited

Loading

Nikoms commented May 13, 2021

Nikoms commented May 13, 2021

isaachinman May 14, 2021

Nikoms May 14, 2021

isaachinman May 14, 2021

isaachinman May 14, 2021

isaachinman May 14, 2021

isaachinman May 14, 2021

isaachinman May 14, 2021

isaachinman May 14, 2021

isaachinman May 14, 2021

Nikoms May 14, 2021

isaachinman May 14, 2021

Nikoms May 14, 2021

isaachinman May 14, 2021

Nikoms May 14, 2021

Nikoms commented May 14, 2021

Nikoms commented May 21, 2021

isaachinman commented May 21, 2021

Nikoms commented May 22, 2021

	const fallbackLng = {default: ['fr'], 'en-US': ['en']} as unknown
	const fallbackLng = { default: ['fr'], 'en-US': ['en'] } as unknown

	const unique = (list:string[]) => Array.from(new Set<string>(list))
	const unique = (list: string[]) => Array.from(new Set<string>(list))

	.reduce(((all, fallbackLngs) => [...all,...fallbackLngs]),[])
	.reduce(((all, fallbackLngs) => [ ...all, ...fallbackLngs ]),[])

	return unique([lng, ...flattenedFallbacks])
	return unique([ lng, ...flattenedFallbacks ])


		const DEFAULT_CONFIG_PATH = './next-i18next.config.js'

		const getFallBackLocales = (fallbackLng: false \| FallbackLng) => {

Fix 1181: Missing namespaces if they are not in the defaultLanguage (but exist in the fallbackLng) #1197

Fix 1181: Missing namespaces if they are not in the defaultLanguage (but exist in the fallbackLng) #1197

Conversation

Nikoms commented May 13, 2021 • edited Loading

vercel bot commented May 13, 2021 • edited Loading

Nikoms commented May 13, 2021

Nikoms commented May 13, 2021

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Nikoms commented May 14, 2021

Nikoms commented May 21, 2021

isaachinman commented May 21, 2021

Nikoms commented May 22, 2021

Nikoms commented May 13, 2021 •

edited

Loading

vercel bot commented May 13, 2021 •

edited

Loading