Merge pull request #1 from filipko99/FIX-NOT-3407

FIX-NOT-3407: changed fallbackLng to preload

Author: LubomirIgonda1

demo/src/app.ts

@@ -6,7 +6,7 @@ import router from './api'
 import errorMiddleware from './middlewares/errorMiddleware'
 
 const i18NextConfig = {
-    preload: ['sk'],
+    preload: ['en', 'sk'],
     fallbackLng: ['en', 'sk'],
     ns: ['translation', 'error', 'success', 'email', 'joi'],
     defaultNS: 'translation',

demo/src/middlewares/schemaMiddleware.ts

@@ -6,7 +6,7 @@ import joiErrorMessages from "./../../locales/joiErrorMessages";
 
 // In common projects is exported like const i18NextConfig: any = config.get('i18next')
 const i18NextConfig = {
-	fallbackLng: ['en', 'sk']
+	preload: ['en', 'sk']
 }
 
 // It's necessary to check if joiErrorMessages were found
@@ -15,7 +15,7 @@ if (!joiErrorMessages) {
 	console.log('WARNING: joiErrorMessages not found.\nTry to check weather you are importing correct file and he was generated'.yellow)
 } else {
 	Object.keys(joiErrorMessages).forEach((lang) => {
-		if (!i18NextConfig.fallbackLng.includes(lang)) {
+		if (!i18NextConfig.preload.includes(lang)) {
 			console.log(
 				`WARNING: Missing language key: ${lang} in joiErrorMessages.ts\nRunning script for Joi error messages generating may fix this problem`.yellow
 			)

lib/index.js

@@ -50,14 +50,16 @@ try {
 catch {
     console.log(`WARNING: i18next is missing in config module`.yellow);
 }
-const languages = i18NextConfig?.fallbackLng || ['en', 'sk'];
+const languages = i18NextConfig?.preload || ['en', 'sk'];
 if (languages.length < 1) {
-    console.log(`WARNING: 'i18next.fallbackLng' was not found in module 'config'.\nWARNING: Please try to define some, otherwise will be used default: en, sk`.yellow);
+    console.log(`WARNING: 'i18next.preload' was not found in module 'config'.\nWARNING: Please try to define some, otherwise will be used default: en, sk`.yellow);
 }
 const init = async () => {
+    var _a;
     const messagePromises = files.map(async (typeName) => {
+        var _a;
         // Import dynamically one by one all type files from joi/lib/types
-        const type = await Promise.resolve().then(() => __importStar(require(`joi/lib/types/${typeName}`)));
+        const type = await (_a = `joi/lib/types/${typeName}`, Promise.resolve().then(() => __importStar(require(_a))));
         // Check if Joi type has error messages of this type and save them
         // By default each type should have error messages
         const prototype = Object.getPrototypeOf(type?.default);
@@ -71,7 +73,7 @@ const init = async () => {
     const messages = await Promise.all(messagePromises);
     const result = {};
     // Importing actual data otherwise use an empty object
-    const actualData = fs_1.default.existsSync(savePath) ? (await Promise.resolve().then(() => __importStar(require(savePath)))).default : {};
+    const actualData = fs_1.default.existsSync(savePath) ? (await (_a = savePath, Promise.resolve().then(() => __importStar(require(_a))))).default : {};
     let newErrorMessagesCount = 0;
     // Get all possible messages. If some are generated, replace them with existing ones
     languages.forEach((lang) => {

src/index.ts

@@ -26,10 +26,10 @@ try {
 } catch {
 	console.log(`WARNING: i18next is missing in config module`.yellow)
 }
-const languages: string[] = i18NextConfig?.fallbackLng || ['en', 'sk']
+const languages: string[] = i18NextConfig?.preload || ['en', 'sk']
 
 if (languages.length < 1) {
-	console.log(`WARNING: 'i18next.fallbackLng' was not found in module 'config'.\nWARNING: Please try to define some, otherwise will be used default: en, sk`.yellow)
+	console.log(`WARNING: 'i18next.preload' was not found in module 'config'.\nWARNING: Please try to define some, otherwise will be used default: en, sk`.yellow)
 }
 
 const init = async () => {