style: fixes.

Author: xiCO2k

src/index.ts

@@ -174,24 +174,18 @@ export class I18n {
   loadFallbackLanguage(): void {
     if (!isServer) {
       this.resolveLangAsync(this.options.resolve, this.options.fallbackLang).then(({ default: messages }) => {
-        for (const [key, value] of Object.entries(messages)) {
-          this.fallbackMessages[key] = value
-        }
-        const lang = this.options.fallbackLang
-        const data: LanguageInterface = { lang, messages }
-        I18n.loaded.push(data)
+        this.applyFallbackLanguage(this.options.fallbackLang, messages)
+
         this.load()
       })
-    } else {
-      const { default: messages } = this.resolveLang(this.options.resolve, this.options.fallbackLang)
-      for (const [key, value] of Object.entries(messages)) {
-        this.fallbackMessages[key] = value
-      }
-      const lang = this.options.fallbackLang
-      const data: LanguageInterface = { lang, messages }
-      I18n.loaded.push(data)
-      this.loadLanguage(this.getActiveLanguage())
+
+      return
     }
+
+    const { default: messages } = this.resolveLang(this.options.resolve, this.options.fallbackLang)
+
+    this.applyFallbackLanguage(this.options.fallbackLang, messages)
+    this.loadLanguage(this.getActiveLanguage())
   }
 
   /**
@@ -318,6 +312,17 @@ export class I18n {
     return this.setLanguage(data)
   }
 
+  applyFallbackLanguage(lang: string, messages: { [key: string]: string }): void {
+    for (const [key, value] of Object.entries(messages)) {
+      this.fallbackMessages[key] = value
+    }
+
+    I18n.loaded.push({
+      lang: this.options.fallbackLang,
+      messages
+    })
+  }
+
   /**
    * Sets the language messages to the activeMessages.
    */

src/loader.ts

@@ -128,18 +128,17 @@ export const reset = (folderPath) => {
 export const readThroughDir = (dir) => {
   const data = {}
 
-  fs.readdirSync(dir)
-    .forEach((file) => {
-      const absoluteFile = dir + path.sep + file
+  fs.readdirSync(dir).forEach((file) => {
+    const absoluteFile = dir + path.sep + file
 
-      if (fs.statSync(absoluteFile).isDirectory()) {
-        const subFolderFileKey = file.replace(/\.\w+$/, '')
+    if (fs.statSync(absoluteFile).isDirectory()) {
+      const subFolderFileKey = file.replace(/\.\w+$/, '')
 
-        data[subFolderFileKey] = readThroughDir(absoluteFile)
-      } else {
-        data[file.replace(/\.\w+$/, '')] = parse(fs.readFileSync(absoluteFile).toString())
-      }
-    })
+      data[subFolderFileKey] = readThroughDir(absoluteFile)
+    } else {
+      data[file.replace(/\.\w+$/, '')] = parse(fs.readFileSync(absoluteFile).toString())
+    }
+  })
 
   return data
-}
+}