🐛 bug(sfc): fix cannot parse custom block locale messages

Close #173
kazupon · Jun 10, 2017 · 32eb3a7 · 32eb3a7
1 parent 60ba19d
commit 32eb3a7
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 4 deletions.
diff --git a/src/index.js b/src/index.js
@@ -324,15 +324,15 @@ export default class VueI18n {
   }
 
   getLocaleMessage (locale: Locale): LocaleMessageObject {
-    return looseClone(this._vm.messages[locale])
+    return looseClone(this._vm.messages[locale] || {})
   }
 
   setLocaleMessage (locale: Locale, message: LocaleMessageObject): void {
     this._vm.messages[locale] = message
   }
 
   mergeLocaleMessage (locale: Locale, message: LocaleMessageObject): void {
-    this._vm.messages[locale] = Vue.util.extend(this.getLocaleMessage(locale), message)
+    this._vm.messages[locale] = Vue.util.extend(this._vm.messages[locale] || {}, message)
   }
 
   getDateTimeFormat (locale: Locale): DateTimeFormat {

diff --git a/src/mixin.js b/src/mixin.js
@@ -19,7 +19,7 @@ export default {
             })
           } catch (e) {
             if (process.env.NODE_ENV !== 'production') {
-              warn(`Cannot parse locale messages via custom blocks.`)
+              warn(`Cannot parse locale messages via custom blocks.`, e)
             }
           }
         }
@@ -38,7 +38,7 @@ export default {
             options.i18n.messages = JSON.parse(options.__i18n)
           } catch (e) {
             if (process.env.NODE_ENV !== 'production') {
-              warn(`Cannot parse locale messages via custom blocks.`)
+              warn(`Cannot parse locale messages via custom blocks.`, e)
             }
           }
         }

diff --git a/test/unit/issues.test.js b/test/unit/issues.test.js
@@ -113,4 +113,23 @@ describe('issues', () => {
       }).then(done)
     })
   })
+
+  describe('#173', () => {
+    it('should be translated', done => {
+      const Component = Vue.extend({
+        __i18n: JSON.stringify({
+          en: { custom: 'custom block!' }
+        }),
+        render (h) {
+          return h('p', { ref: 'custom' }, [this.$t('custom')])
+        }
+      })
+      const vm = new Component({
+        i18n: new VueI18n({ locale: 'en' })
+      }).$mount()
+      nextTick(() => {
+        assert.equal(vm.$refs.custom.textContent, 'custom block!')
+      }).then(done)
+    })
+  })
 })