@ecopex/ecopex-framework 1.0.12 → 1.0.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ecopex/ecopex-framework",
-  "version": "1.0.12",
+  "version": "1.0.13",
   "description": "Javascript Framework for API and Admin Panel",
   "main": "index.js",
   "scripts": {

package/routes/auto/handler.js

@@ -542,7 +542,7 @@ const checkUnique = async (value = null, field_name = null, tableName = null) =>
 const sqlErrorHandler = (error, request, reply) => {
   return reply.status(500).send({
     status: false,
-    message: i18n.t('sql.' + error.code.toLowerCase(), request.headers.locale || 'en', {...request.body, ...request.query, ...request.params})
+    message: i18n.t('sql.' + error.code.toLowerCase(), {...request.body, ...request.query, ...request.params})
   });
 }
 

package/utils/i18n.js

@@ -1,5 +1,6 @@
 const fs = require('fs');
 const path = require('path');
+const { config } = require('../stores/config');
 
 /**
  * Internationalization utility for multi-language support
@@ -7,8 +8,10 @@ const path = require('path');
 class I18n {
   constructor() {
     this.locales = {};
-    this.defaultLocale = 'en';
-    this.supportedLocales = ['en', 'tr', 'es'];
+    this.defaultLocale = config.default_language || 'en';
+    this.supportedLocales = config.supported_languages || ['en'];
+    this.localesPath = path.join(__dirname, '../locales');
+    this.localesBackend = path.join('./locales');
     this.loadLocales();
   }
 
@@ -16,10 +19,8 @@ class I18n {
    * Load all locale files
    */
   loadLocales() {
-    const localesPath = path.join(__dirname, '../locales');
-    
     for (const locale of this.supportedLocales) {
-      const localePath = path.join(localesPath, locale);
+      const localePath = path.join(this.localesPath, locale);
       if (fs.existsSync(localePath)) {
         this.locales[locale] = {};
         
@@ -34,7 +35,24 @@ class I18n {
           }
         }
       }
+
+      const localesBackend = path.join(this.localesBackend, locale);
+      if (fs.existsSync(localesBackend)) {
+        const files = fs.readdirSync(localesBackend);
+        for (const file of files) {
+          if (file.endsWith('.json')) {
+            const filePath = path.join(localesBackend, file);
+            const content = JSON.parse(fs.readFileSync(filePath, 'utf8'));
+            const key = file.replace('.json', '');
+            if(!this.locales[locale][key]) {
+              this.locales[locale][key] = {};
+            }
+            this.locales[locale][key] = { ...this.locales[locale][key], ...content };
+          }
+        }
+      }
     }
+
   }
 
   /**
@@ -47,25 +65,40 @@ class I18n {
   t(key, locale = this.defaultLocale, params = {}) {
     const keys = key.split('.');
     let translation = this.locales[locale] || this.locales[this.defaultLocale];
-    
-    // Navigate through nested keys
-    for (const k of keys) {
-      if (translation && translation[k]) {
-        translation = translation[k];
-      } else {
-        // Fallback to default locale
-        translation = this.locales[this.defaultLocale];
-        for (const k of keys) {
-          if (translation && translation[k]) {
-            translation = translation[k];
+    const fileName = keys.length > 0 ? keys[0] : 'index';
+
+    if(!translation[fileName]) {
+      translation[fileName] = {};
+    }
+
+    if(keys.length > 1) {
+      for(const k of keys.slice(1)) {
+        if(translation[fileName] && translation[fileName][k] !== undefined) {
+          translation = translation[fileName][k];
+        } else {
+          translation = this.locales[this.defaultLocale];
+          if(translation[fileName] && translation[fileName][k] !== undefined) {
+            translation = translation[fileName][k];
           } else {
-            return key; // Return key if translation not found
+            this.writeFile(key, locale, params);
+            return key;
           }
         }
-        break;
+      }
+    } else {
+      if(translation[fileName] && translation[fileName][keys[0]] !== undefined) {
+        translation = translation[fileName][keys[0]];
+      } else {
+        translation = this.locales[this.defaultLocale];
+        if(translation[fileName] && translation[fileName][keys[0]] !== undefined) {
+          translation = translation[fileName][keys[0]];
+        } else {
+          this.writeFile(key, locale, params);
+          return key;
+        }
       }
     }
-
+    
     // Replace parameters in the translation
     if (typeof translation === 'string') {
       return this.replaceParams(translation, params);
@@ -74,6 +107,27 @@ class I18n {
     return key;
   }
 
+  writeFile(key, locale, params) {
+    const keys = key.split('.');
+    const fileName = keys.length > 1 ? keys[0] : 'index'
+
+    if(!this.locales[locale]) {
+      this.locales[locale] = {};
+    }
+
+    let translations = this.locales[locale][fileName] || {};
+
+    const paramsString = Object.entries(params).map(([key, value]) => `{ ${key} }`).join(', ');
+    
+    if(keys.slice(1).length > 0) {
+      translations[keys.slice(1).join('.')] = (paramsString ? paramsString : '');
+    } else {
+      translations[keys[0]] = (paramsString ? paramsString : '');
+    }
+    
+    fs.writeFileSync(path.join(this.localesBackend, locale, `${fileName}.json`), JSON.stringify(translations, null, 4));
+  }
+
   /**
    * Replace parameters in translation string
    * @param {string} str - String with parameters
@@ -160,7 +214,7 @@ class I18n {
       enum: params?.allowedValues ? params.allowedValues.join(', ') : ''
     };
 
-    return this.t(errorKey, locale, errorParams);
+    return this.t(errorKey, errorParams);
   }
 
   /**

package/utils/middleware.js

@@ -15,7 +15,7 @@ class Middleware {
       
       // Add locale to request object
       request.locale = locale;
-      request.t = (key, params = {}) => i18n.t(key, locale, params);
+      request.t = (key, params = {}) => i18n.t(key, params, locale);
       
       // Add locale to reply headers
       reply.header('Content-Language', locale);
@@ -30,8 +30,6 @@ class Middleware {
       if(config.development) {
         console.log(error);
       }
-      
-      const locale = request.locale || i18n.detectLanguage(request);
 
       if(error.data?.sqlMessage) {
         return sqlErrorHandler(error, request, reply);
@@ -43,13 +41,13 @@ class Middleware {
           const field_name = err.instancePath?.replace('/', '') || err.dataPath?.replace('/', '') || err.params?.missingProperty || 'field'
           return {
             field: field_name,
-            message: i18n.t('validation.' + err.keyword, locale, { field: i18n.t('validation.fields.' + field_name, locale) })
+            message: i18n.t('validation.' + err.keyword, { field: i18n.t('validation.fields.' + field_name) })
           }
         });
 
         return reply.status(400).send({
           status: false,
-          message: i18n.t('validation.errors.validation', locale),
+          message: i18n.t('validation.errors.validation'),
           details: validationErrors,
           code: 400
         });
@@ -145,7 +143,7 @@ class Middleware {
 const sqlErrorHandler = (error, request, reply) => {
   return reply.status(500).send({
     status: false,
-    message: i18n.t('sql.' + error.data.code.toLowerCase(), request.headers.locale || 'en', {...request.body, ...request.query, ...request.params})
+    message: i18n.t('sql.' + error.data.code.toLowerCase(), {...request.body, ...request.query, ...request.params})
   });
 }