vue-i18n 7.1.2 → 7.3.2

package/CHANGELOG.md

@@ -1,3 +1,48 @@
+<a name="7.3.2"></a>
+## [7.3.2](https://github.com/kazupon/vue-i18n/compare/v7.3.1...v7.3.2) (2017-10-19)
+
+
+### :zap: Improvements
+
+* **typescript:** fix import problem of vue2.5 because of the types update ([#238](https://github.com/kazupon/vue-i18n/issues/238)) by [@peterchealse](https://github.com/peterchealse) ([cb98347](https://github.com/kazupon/vue-i18n/commit/cb98347)), closes [#238](https://github.com/kazupon/vue-i18n/issues/238)
+
+
+
+<a name="7.3.1"></a>
+## [7.3.1](https://github.com/kazupon/vue-i18n/compare/v7.3.0...v7.3.1) (2017-10-04)
+
+
+### :bug: Bug Fixes
+
+* **directive:** fix cannot locale reactivity ([e1fc12e](https://github.com/kazupon/vue-i18n/commit/e1fc12e)), closes [#227](https://github.com/kazupon/vue-i18n/issues/227)
+
+
+
+<a name="7.3.0"></a>
+# [7.3.0](https://github.com/kazupon/vue-i18n/compare/v7.2.0...v7.3.0) (2017-09-22)
+
+
+### :star: New Features
+
+* **directives:** support v-t custom directive (welcome back!) ([af9a2e7](https://github.com/kazupon/vue-i18n/commit/af9a2e7))
+
+
+### :up: Updates
+
+* **typing:** fix flowtype ([fa06f44](https://github.com/kazupon/vue-i18n/commit/fa06f44))
+
+
+
+<a name="7.2.0"></a>
+# [7.2.0](https://github.com/kazupon/vue-i18n/compare/v7.1.2...v7.2.0) (2017-08-28)
+
+
+### :star: New Features
+
+* **interpolation:** list formatting refactor and places/place feature ([#218](https://github.com/kazupon/vue-i18n/issues/218)) by [@myst729](https://github.com/myst729) ([0f0f3ff](https://github.com/kazupon/vue-i18n/commit/0f0f3ff))
+
+
+
 <a name="7.1.2"></a>
 ## [7.1.2](https://github.com/kazupon/vue-i18n/compare/v7.1.1...v7.1.2) (2017-08-25)
 

package/README.md

@@ -1,4 +1,4 @@
-# vue-i18n
+# :globe_with_meridians: vue-i18n
 
 [![Build Status](https://circleci.com/gh/kazupon/vue-i18n/tree/dev.svg?style=shield)](https://circleci.com/gh/kazupon/vue-i18n/tree/dev)
 [![Coverage Status](https://codecov.io/gh/kazupon/vue-i18n/branch/dev/graph/badge.svg)](https://codecov.io/gh/kazupon/vue-i18n)

package/decls/i18n.js

@@ -90,7 +90,7 @@ declare interface I18n {
   setLocaleMessage (locale: Locale, message: LocaleMessageObject): void,
   mergeLocaleMessage (locale: Locale, message: LocaleMessageObject): void,
   t (key: Path, ...values: any): TranslateResult,
-  i (key: Path, ...values: any): TranslateResult,
+  i (key: Path, locale: Locale, values: Object): TranslateResult,
   tc (key: Path, choice?: number, ...values: any): TranslateResult,
   te (key: Path, locale?: Locale): boolean,
   getDateTimeFormat (locale: Locale): DateTimeFormat,

package/dist/vue-i18n.common.js

@@ -1,5 +1,5 @@
 /*!
- * vue-i18n v7.1.2 
+ * vue-i18n v7.3.2 
  * (c) 2017 kazuya kawaguchi
  * Released under the MIT License.
  */
@@ -126,6 +126,39 @@ function merge (target) {
   return output
 }
 
+function looseEqual (a, b) {
+  if (a === b) { return true }
+  var isObjectA = isObject(a);
+  var isObjectB = isObject(b);
+  if (isObjectA && isObjectB) {
+    try {
+      var isArrayA = Array.isArray(a);
+      var isArrayB = Array.isArray(b);
+      if (isArrayA && isArrayB) {
+        return a.length === b.length && a.every(function (e, i) {
+          return looseEqual(e, b[i])
+        })
+      } else if (!isArrayA && !isArrayB) {
+        var keysA = Object.keys(a);
+        var keysB = Object.keys(b);
+        return keysA.length === keysB.length && keysA.every(function (key) {
+          return looseEqual(a[key], b[key])
+        })
+      } else {
+        /* istanbul ignore next */
+        return false
+      }
+    } catch (e) {
+      /* istanbul ignore next */
+      return false
+    }
+  } else if (!isObjectA && !isObjectB) {
+    return String(a) === String(b)
+  } else {
+    return false
+  }
+}
+
 var canUseDateTimeFormat =
   typeof Intl !== 'undefined' && typeof Intl.DateTimeFormat !== 'undefined';
 
@@ -289,6 +322,9 @@ var component = {
     },
     locale: {
       type: String
+    },
+    places: {
+      type: [Array, Object]
     }
   },
   render: function render (h, ref) {
@@ -298,6 +334,11 @@ var component = {
     var parent = ref.parent;
 
     var i18n = parent.$i18n;
+
+    children = (children || []).filter(function (child) {
+      return child.tag || (child.text = child.text.trim())
+    });
+
     if (!i18n) {
       if (process.env.NODE_ENV !== 'production') {
         warn('Cannot find VueI18n instance!');
@@ -308,18 +349,131 @@ var component = {
     var path = props.path;
     var locale = props.locale;
 
-    var params = [];
-    locale && params.push(locale);
-    children.forEach(function (child) {
-      if (child.tag || child.text.trim()) {
-        params.push(child);
+    var params = {};
+    var places = props.places || {};
+
+    var hasPlaces = Array.isArray(places)
+      ? places.length > 0
+      : Object.keys(places).length > 0;
+
+    var everyPlace = children.every(function (child) {
+      if (child.data && child.data.attrs) {
+        var place = child.data.attrs.place;
+        return (typeof place !== 'undefined') && place !== ''
       }
     });
 
-    return h(props.tag, data, i18n.i.apply(i18n, [ path ].concat( params )))
+    if (hasPlaces && children.length > 0 && !everyPlace) {
+      warn('If places prop is set, all child elements must have place prop set.');
+    }
+
+    if (Array.isArray(places)) {
+      places.forEach(function (el, i) {
+        params[i] = el;
+      });
+    } else {
+      Object.keys(places).forEach(function (key) {
+        params[key] = places[key];
+      });
+    }
+
+    children.forEach(function (child, i) {
+      var key = everyPlace
+        ? ("" + (child.data.attrs.place))
+        : ("" + i);
+      params[key] = child;
+    });
+
+    return h(props.tag, data, i18n.i(path, locale, params))
   }
 };
 
+/*  */
+
+function bind (el, binding, vnode) {
+  if (!assert(el, vnode)) { return }
+
+  t$1(el, binding, vnode);
+}
+
+function update (el, binding, vnode, oldVNode) {
+  if (!assert(el, vnode)) { return }
+
+  if (localeEqual(el, vnode) && looseEqual(binding.value, binding.oldValue)) { return }
+
+  t$1(el, binding, vnode);
+}
+
+function assert (el, vnode) {
+  var vm = vnode.context;
+  if (!vm) {
+    warn('not exist Vue instance in VNode context');
+    return false
+  }
+
+  if (!vm.$i18n) {
+    warn('not exist VueI18n instance in Vue instance');
+    return false
+  }
+
+  return true
+}
+
+function localeEqual (el, vnode) {
+  var vm = vnode.context;
+  return el._locale === vm.$i18n.locale
+}
+
+function t$1 (el, binding, vnode) {
+  var value = binding.value;
+
+  var ref = parseValue(value);
+  var path = ref.path;
+  var locale = ref.locale;
+  var args = ref.args;
+  if (!path && !locale && !args) {
+    warn('not support value type');
+    return
+  }
+
+  if (!path) {
+    warn('required `path` in v-t directive');
+    return
+  }
+
+  var vm = vnode.context;
+  el._vt = el.textContent = (ref$1 = vm.$i18n).t.apply(ref$1, [ path ].concat( makeParams(locale, args) ));
+  el._locale = vm.$i18n.locale;
+  var ref$1;
+}
+
+function parseValue (value) {
+  var path;
+  var locale;
+  var args;
+
+  if (typeof value === 'string') {
+    path = value;
+  } else if (isPlainObject(value)) {
+    path = value.path;
+    locale = value.locale;
+    args = value.args;
+  }
+
+  return { path: path, locale: locale, args: args }
+}
+
+function makeParams (locale, args) {
+  var params = [];
+
+  locale && params.push(locale);
+  if (args && (Array.isArray(args) || isPlainObject(args))) {
+    params.push(args);
+  }
+
+  return params
+}
+
 var Vue;
 
 function install (_Vue) {
@@ -345,6 +499,7 @@ function install (_Vue) {
 
   extend(Vue);
   Vue.mixin(mixin);
+  Vue.directive('t', { bind: bind, update: update });
   Vue.component(component.name, component);
 
   // use object-based merge strategy
@@ -429,13 +584,7 @@ function compile (tokens, values) {
         compiled.push(token.value);
         break
       case 'list':
-        if (mode === 'list') {
-          compiled.push(values[parseInt(token.value, 10)]);
-        } else {
-          if (process.env.NODE_ENV !== 'production') {
-            warn(("Type of token '" + (token.type) + "' and format of value '" + mode + "' don't match!"));
-          }
-        }
+        compiled.push(values[parseInt(token.value, 10)]);
         break
       case 'named':
         if (mode === 'named') {
@@ -1070,10 +1219,7 @@ VueI18n.prototype.t = function t (key) {
     var ref;
 };
 
-VueI18n.prototype._i = function _i (key, locale, messages, host) {
-    var values = [], len = arguments.length - 4;
-    while ( len-- > 0 ) values[ len ] = arguments[ len + 4 ];
-
+VueI18n.prototype._i = function _i (key, locale, messages, host, values) {
   var ret =
     this._translate(messages, locale, this.fallbackLocale, key, host, 'raw', values);
   if (this._isFallbackRoot(ret)) {
@@ -1081,47 +1227,34 @@ VueI18n.prototype._i = function _i (key, locale, messages, host) {
       warn(("Fall back to interpolate the keypath '" + key + "' with root locale."));
     }
     if (!this._root) { throw Error('unexpected error') }
-    return (ref = this._root).i.apply(ref, [ key ].concat( values ))
+    return this._root.i(key, locale, values)
   } else {
     return this._warnDefault(locale, key, ret, host)
   }
-    var ref;
 };
 
-VueI18n.prototype.i = function i (key) {
-    var values = [], len = arguments.length - 1;
-    while ( len-- > 0 ) values[ len ] = arguments[ len + 1 ];
-
+VueI18n.prototype.i = function i (key, locale, values) {
   /* istanbul ignore if */
   if (!key) { return '' }
 
-  var locale = this.locale;
-  var index = 0;
-  if (typeof values[0] === 'string') {
-    locale = values[0];
-    index = 1;
+  if (typeof locale !== 'string') {
+    locale = this.locale;
   }
 
-  var params = [];
-  for (var i = index; i < values.length; i++) {
-    params.push(values[i]);
-    }
-
-    return (ref = this)._i.apply(ref, [ key, locale, this._getMessages(), null ].concat( params ))
-    var ref;
+  return this._i(key, locale, this._getMessages(), null, values)
 };
 
 VueI18n.prototype._tc = function _tc (
   key,
   _locale,
   messages,
-  host,
-  choice
+    host,
+    choice
 ) {
     var values = [], len = arguments.length - 5;
     while ( len-- > 0 ) values[ len ] = arguments[ len + 5 ];
 
-  if (!key) { return '' }
+    if (!key) { return '' }
   if (choice === undefined) {
     choice = 1;
   }
@@ -1157,7 +1290,7 @@ VueI18n.prototype.setLocaleMessage = function setLocaleMessage (locale, message)
   this._vm.messages[locale] = message;
 };
 
-VueI18n.prototype.mergeLocaleMessage = function mergeLocaleMessage (locale, message) {
+  VueI18n.prototype.mergeLocaleMessage = function mergeLocaleMessage (locale, message) {
   this._vm.messages[locale] = Vue.util.extend(this._vm.messages[locale] || {}, message);
 };
 
@@ -1243,16 +1376,16 @@ VueI18n.prototype.d = function d (value) {
     } else if (isObject(args[0])) {
       if (args[0].locale) {
         locale = args[0].locale;
-        }
-        if (args[0].key) {
+      }
+      if (args[0].key) {
         key = args[0].key;
       }
     }
   } else if (args.length === 2) {
-      if (typeof args[0] === 'string') {
-      key = args[0];
-    }
-    if (typeof args[1] === 'string') {
+    if (typeof args[0] === 'string') {
+        key = args[0];
+      }
+      if (typeof args[1] === 'string') {
       locale = args[1];
     }
   }
@@ -1353,10 +1486,10 @@ VueI18n.prototype.n = function n (value) {
     }
     if (typeof args[1] === 'string') {
       locale = args[1];
-      }
     }
+  }
 
-    return this._n(value, locale, key)
+  return this._n(value, locale, key)
 };
 
 Object.defineProperties( VueI18n.prototype, prototypeAccessors );
@@ -1366,7 +1499,7 @@ VueI18n.availabilities = {
   numberFormat: canUseNumberFormat
 };
 VueI18n.install = install;
-VueI18n.version = '7.1.2';
+VueI18n.version = '7.3.2';
 
 /* istanbul ignore if */
 if (typeof window !== 'undefined' && window.Vue) {