improvement: vue-i18n-loader bridge mode (#1392)

kazupon · Sep 30, 2021 · 09e4d79 · 09e4d79
1 parent 74629fc
commit 09e4d79
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 6 deletions.
diff --git a/src/mixin.js b/src/mixin.js
@@ -21,15 +21,16 @@ export default function defineMixin (bridge: boolean = false) {
     : { // regulary 
     beforeCreate (): void {
       const options: any = this.$options
-      options.i18n = options.i18n || (options.__i18n ? {} : null)
+      options.i18n = options.i18n || ((options.__i18nBridge || options.__i18n) ? {} : null)
 
       if (options.i18n) {
         if (options.i18n instanceof VueI18n) {
           // init locale messages via custom blocks
-          if (options.__i18n) {
+          if ((options.__i18nBridge || options.__i18n)) {
             try {
               let localeMessages = options.i18n && options.i18n.messages ? options.i18n.messages : {}
-              options.__i18n.forEach(resource => {
+              const __i18n = options.__i18nBridge || options.__i18n
+              __i18n.forEach(resource => {
                 localeMessages = merge(localeMessages, JSON.parse(resource))
               })
               Object.keys(localeMessages).forEach((locale: Locale) => {
@@ -60,10 +61,11 @@ export default function defineMixin (bridge: boolean = false) {
           }
 
           // init locale messages via custom blocks
-          if (options.__i18n) {
+          if ((options.__i18nBridge || options.__i18n)) {
             try {
               let localeMessages = options.i18n && options.i18n.messages ? options.i18n.messages : {}
-              options.__i18n.forEach(resource => {
+              const __i18n = options.__i18nBridge || options.__i18n
+              __i18n.forEach(resource => {
                 localeMessages = merge(localeMessages, JSON.parse(resource))
               })
               options.i18n.messages = localeMessages
@@ -105,7 +107,7 @@ export default function defineMixin (bridge: boolean = false) {
 
     beforeMount (): void {
       const options: any = this.$options
-      options.i18n = options.i18n || (options.__i18n ? {} : null)
+      options.i18n = options.i18n || ((options.__i18nBridge || options.__i18n) ? {} : null)
 
       if (options.i18n) {
         if (options.i18n instanceof VueI18n) {

diff --git a/test/unit/custom_blocks.test.js b/test/unit/custom_blocks.test.js
@@ -107,4 +107,35 @@ describe('custom blocks', () => {
       }).then(done)
     })
   })
+
+  describe('bridge mode', () => {
+    it('should be translated', done => {
+      const el = document.createElement('div')
+      const vm = new Vue({
+        i18n,
+        components: {
+          child: {
+            __i18nBridge: [JSON.stringify({
+              en: { who: 'child' },
+              ja: { who: '子' }
+            })],
+            render (h) {
+              return h('div', {}, [
+                h('p', { ref: 'who' }, [this.$t('who')])
+              ])
+            }
+          }
+        },
+        render (h) {
+          return h('div', {}, [h('child', { ref: 'child' })])
+        }
+      }).$mount(el)
+      Vue.nextTick().then(() => {
+        assert.strictEqual(vm.$refs.child.$refs.who.textContent, '子')
+        i18n.locale = 'en'
+      }).then(() => {
+        assert.strictEqual(vm.$refs.child.$refs.who.textContent, 'child')
+      }).then(done)
+    })
+  })
 })