Merge branch 'dev' of github.com:kazupon/vue-i18n into dev

decls/i18n.js

@@ -104,5 +104,5 @@ declare interface I18n {
 };
 
 declare interface Formatter {
-  interpolate (message: string, values: any): Array<any>
+  interpolate (message: string, values?: any): Array<any>
 };

src/format.js

@@ -10,6 +10,9 @@ export default class BaseFormatter {
   }
 
   interpolate (message: string, values: any): Array<any> {
+    if (!values) {
+      return [message]
+    }
     let tokens: Array<Token> = this._caches[message]
     if (!tokens) {
       tokens = parse(message)

src/index.js

@@ -210,7 +210,7 @@ export default class VueI18n {
       ret = this._link(locale, message, ret, host, interpolateMode, values)
     }
 
-    return !values ? ret : this._render(ret, interpolateMode, values)
+    return this._render(ret, interpolateMode, values)
   }
 
   _link (

test/unit/format_custom.test.js

@@ -17,6 +17,22 @@ describe('custom formatter', () => {
       })
       i18n.t('message.hello', 'ja', { name: 'joe' })
     })
+
+    it('should interpolate messages without values', done => {
+      class CustomFormatter {
+        interpolate (message, values) {
+          assert(values === null)
+          done()
+        }
+      }
+      const formatter = new CustomFormatter()
+      const i18n = new VueI18n({
+        locale: 'en',
+        messages,
+        formatter
+      })
+      i18n.t('message.hello')
+    })
   })
 
   describe('via vue instance calling', () => {

types/index.d.ts

@@ -46,7 +46,7 @@ declare namespace VueI18n {
   type NumberFormatResult = string;
 
   interface Formatter {
-    interpolate(message: string, values: Values): any[];
+    interpolate(message: string, values?: Values): any[];
   }
 
   type MissingHandler = (locale: Locale, key: Path, vm?: Vue) => void;