Merge pull request #88 from Majkie/main

fix: Nested translations aren't translated

Author: xiCO2k

src/index.ts

@@ -337,6 +337,8 @@ export class I18n {
    * Get the translation for the given key and watch for any changes.
    */
   wTrans(key: string, replacements: ReplacementsInterface = {}): ComputedRef<string> {
+    key = key.replace(/\//g, '.')
+
     if (!this.activeMessages[key]) {
       const hasChildItems = this.activeMessages[`${key}.0`] !== undefined
 

src/loader.ts

@@ -35,32 +35,9 @@ export const parseAll = (folderPath: string): { name: string; path: string }[] =
 
   const data = []
   for (const folder of folders) {
-    const lang = {}
+    const langFolderPath = folderPath + path.sep + folder
 
-    fs.readdirSync(folderPath + path.sep + folder)
-      .sort()
-      .forEach((langFolderItem) => {
-        const langFolderPath = folderPath + path.sep + folder
-        const langFolderItemPath = langFolderPath + path.sep + langFolderItem
-
-        if (fs.statSync(langFolderItemPath).isDirectory()) {
-          // Lang sub folder
-          const subFolderFileKey = langFolderItem.replace(/\.\w+$/, '')
-          lang[subFolderFileKey] = {}
-
-          fs.readdirSync(langFolderItemPath)
-            .filter((file) => !fs.statSync(langFolderItemPath + path.sep + file).isDirectory())
-            .sort()
-            .forEach((file) => {
-              lang[subFolderFileKey][file.replace(/\.\w+$/, '')] = parse(
-                fs.readFileSync(langFolderItemPath + path.sep + file).toString()
-              )
-            })
-        } else {
-          // Lang file
-          lang[langFolderItem.replace(/\.\w+$/, '')] = parse(fs.readFileSync(langFolderItemPath).toString())
-        }
-      })
+    const lang = readThroughDir(langFolderPath)
 
     data.push({
       folder,
@@ -147,3 +124,22 @@ export const reset = (folderPath) => {
       fs.unlinkSync(folderPath + file)
     })
 }
+
+export const readThroughDir = (dir) => {
+  const data = {}
+
+  fs.readdirSync(dir)
+    .forEach((file) => {
+      const absoluteFile = dir + path.sep + file
+
+      if (fs.statSync(absoluteFile).isDirectory()) {
+        const subFolderFileKey = file.replace(/\.\w+$/, '')
+
+        data[subFolderFileKey] = readThroughDir(absoluteFile)
+      } else {
+        data[file.replace(/\.\w+$/, '')] = parse(fs.readFileSync(absoluteFile).toString())
+      }
+    })
+
+  return data
+}

test/fixtures/lang/en/nested/cars/car.php

@@ -0,0 +1,10 @@
+<?php
+
+return [
+    'is_electric' => 'Electric',
+    'foo' => [
+        'level1' => [
+            'level2' => 'barpt',
+        ]
+    ]
+];

test/fixtures/lang/pt/nested/cars/car.php

@@ -0,0 +1,10 @@
+<?php
+
+return [
+    'is_electric' => 'É elétrico?',
+    'foo' => [
+        'level1' => [
+            'level2' => 'barpt',
+        ]
+    ]
+];

test/loader.test.ts

@@ -30,6 +30,14 @@ it('includes .php lang file in subdirectory in .json', () => {
     expect(langEn['domain.car.foo.level1.level2']).toBe('barpt');
 });
 
+it('includes .php lang file in nested subdirectory in .json', () => {
+    const files = parseAll(__dirname + '/fixtures/lang/');
+    const langEn = JSON.parse(fs.readFileSync(files[0].path).toString())
+
+    expect(langEn['nested.cars.car.is_electric']).toBe('Electric');
+    expect(langEn['nested.cars.car.foo.level1.level2']).toBe('barpt');
+})
+
 it('transforms .php lang to .json', () => {
     const lang = parse(fs.readFileSync(__dirname + '/fixtures/lang/en/auth.php').toString());
 

test/translate.test.ts

@@ -191,3 +191,10 @@ it('translates a possible nested item, and if not exists check on the root level
   await global.mountPlugin(undefined, 'pt');
   expect(trans('foo.bar')).toBe('baz');
 });
+
+it('translates a nested file item while using "/" and "." at the same time as a delimiter', async () => {
+  await global.mountPlugin()
+
+  expect(trans('nested/cars/car.is_electric')).toBe('É elétrico?');
+  expect(trans('nested/cars/car.foo.level1.level2')).toBe('barpt');
+})