[xprototype#4/fix] Fix problem with magic reloader of i18n

wilcorrea-forks · Mar 28, 2019 · b6d2c6b · b6d2c6b
1 parent 51acf72
commit b6d2c6b
Show file tree

Hide file tree

Showing 4 changed files with 57 additions and 58 deletions.
diff --git a/src/app/Prototype/Base.js b/src/app/Prototype/Base.js
@@ -1,5 +1,6 @@
 /* eslint-disable no-underscore-dangle */
 import components from 'src/config/app/components'
+import { apply } from 'src/app/Util'
 
 /**
  * @typedef {Base}
@@ -74,6 +75,11 @@ export default class Base {
    */
   static mixins = []
 
+  /**
+   * @type {boolean}
+   */
+  i18n = true
+
   /**
    * @param {Object} options
    * @returns {this}
@@ -91,7 +97,10 @@ export default class Base {
     this.__actions = {}
     this.__sections = {}
 
+    this.__loaded = {}
+
     this.init()
+    this.locale()
 
     if (this.defaults && typeof this.defaults === 'function') {
       this.defaults()
@@ -111,6 +120,29 @@ export default class Base {
     this.constructor.mixins.forEach(mixin => this.mixin(mixin))
   }
 
+  /**
+   */
+  locale () {
+    if (!this.i18n) {
+      return
+    }
+    this.namespace = this.constructor.domain.replace(/\//, '.')
+    const map = (piece) => piece.charAt(0).toUpperCase() + piece.substring(1)
+    const domain = this.namespace.split('.').map(map).join('/')
+
+    const locale = window.app.i18n.locale
+    const path = `src/domains/${domain}/${locale}`
+    if (this.__loaded[path]) {
+      return
+    }
+    this.__loaded[path] = true
+
+    const messages = require(`src/domains/${domain}/${locale}`)
+    const translations = apply({}, `domains.${this.namespace}`, messages.default)
+
+    window.app.i18n.mergeLocaleMessage(locale, translations)
+  }
+
   /**
    * @param {Object} mixin
    */

diff --git a/src/app/Prototype/Prototype.js b/src/app/Prototype/Prototype.js
@@ -1,7 +1,6 @@
 /* eslint-disable no-underscore-dangle */
 import Skeleton from './Skeleton'
 import { lang } from 'src/app/Util/Lang'
-import { apply } from 'src/app/Util'
 
 import Field from 'src/app/Prototype/Prototype/Field'
 import FieldForm from 'src/app/Prototype/Prototype/FieldForm'
@@ -18,28 +17,6 @@ export default class Prototype extends Skeleton {
    */
   static mixins = [Field, FieldForm, FieldIs, FieldTable, Action]
 
-  /**
-   * @type {boolean}
-   */
-  i18n = true
-
-  /**
-   * @param {Function} callback
-   */
-  locale (callback = undefined) {
-    this.namespace = this.domain.replace(/\//, '.')
-    const map = (piece) => piece.charAt(0).toUpperCase() + piece.substring(1)
-    const domain = this.namespace.split('.').map(map).join('/')
-    const locale = this.$i18n.locale
-
-    import(/* webpackChunkName: "lang-[request]" */ `src/domains/${domain}/${locale}`)
-      .then((messages) => {
-        const translations = apply({}, `domains.${this.namespace}`, messages.default)
-        this.$i18n.mergeLocaleMessage(locale, translations)
-      })
-      .finally(callback)
-  }
-
   /**
    * @param {String|Array} key
    * @param {string} [fallback]
@@ -167,46 +144,36 @@ export default class Prototype extends Skeleton {
     const prototype = this
 
     this.hook('created:default', function () {
-      /**
-       */
-      const run = () => {
-        // Call component setup method
-        if (this.setup && typeof this.setup === 'function') {
-          this.setup()
-        }
-
-        // Call global prototype configure
-        prototype.configure.call(this)
+      // Call component setup method
+      if (this.setup && typeof this.setup === 'function') {
+        this.setup()
+      }
 
-        // Call configure of each field
-        this.configure()
+      // Call global prototype configure
+      prototype.configure.call(this)
 
-        if (this.scope === 'index') {
-          // Call configure to index scope
-          return prototype.configureIndex.call(this)
-        }
+      // Call configure of each field
+      this.configure()
 
-        if (this.scope === 'update') {
-          // Call configure to update scope
-          return prototype.configureEdit.call(this)
-        }
+      if (this.scope === 'index') {
+        // Call configure to index scope
+        return prototype.configureIndex.call(this)
+      }
 
-        if (this.scope === 'read') {
-          // Call configure to read scope
-          return prototype.configureView.call(this)
-        }
+      if (this.scope === 'update') {
+        // Call configure to update scope
+        return prototype.configureEdit.call(this)
+      }
 
-        if (this.scope === 'create') {
-          // Call configure to create scope
-          return prototype.configureAdd.call(this)
-        }
+      if (this.scope === 'read') {
+        // Call configure to read scope
+        return prototype.configureView.call(this)
       }
-      // load i18n async
-      if (prototype.i18n) {
-        prototype.locale.call(this, run)
-        return
+
+      if (this.scope === 'create') {
+        // Call configure to create scope
+        return prototype.configureAdd.call(this)
       }
-      run()
     })
 
     this.action('add')

diff --git a/src/domains/Example/Test/Prototype/TestWithHooks.js b/src/domains/Example/Test/Prototype/TestWithHooks.js
@@ -42,7 +42,7 @@ export default class TestWithHooks extends Test {
       .actionIcon('send')
       .actionColor('yellow')
       .actionOrder(2)
-      .actionLabel(this.$lang(`domains.${TestWithHooks.domain}.actions.goToTest`))
+      .actionLabel(this.$lang(`domains.example.test.actions.goToTest`))
       .actionOn('click', function ({ $event, context }) {
         this.$log('~> $event', $event)
         this.$log('~> context', context)

diff --git a/src/i18n/en-us/prototype/index.js b/src/i18n/en-us/prototype/index.js
@@ -21,7 +21,7 @@ export default {
       success: 'Record created successfully'
     },
     update: {
-      success: 'Record update successfully'
+      success: 'Record updated successfully'
     }
   },
   action: {