From ec2b91b03f121cfd4275590ca9c52d3b10489e51 Mon Sep 17 00:00:00 2001 From: kazuya kawaguchi Date: Fri, 27 Nov 2015 03:00:38 +0900 Subject: [PATCH] release 2.3.0 --- CHANGELOG.md | 14 ++++++ dist/vue-i18n.js | 100 +++++++++++++++++++++++++++++++++++++++---- dist/vue-i18n.min.js | 4 +- package.json | 2 +- 4 files changed, 109 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d288514db..e229c77f0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,17 @@ + +# [2.3.0](https://github.com/kazupon/vue-i18n/compare/v2.2.0...v2.3.0) (2015-11-26) + + +### Bug Fixes + +* **index:** cannot work at Vue 1.0.10 later ([6fd543e](https://github.com/kazupon/vue-i18n/commit/6fd543e)), closes [#9](https://github.com/kazupon/vue-i18n/issues/9) + +### Features + +* **index:** support automatically install for standalone ([ada2673](https://github.com/kazupon/vue-i18n/commit/ada2673)) + + + # v2.2.0 / 2015-09-16 * Re-implemetation with ES6 (babel) diff --git a/dist/vue-i18n.js b/dist/vue-i18n.js index 8e2931c31..0e9435778 100644 --- a/dist/vue-i18n.js +++ b/dist/vue-i18n.js @@ -1,5 +1,5 @@ /*! - * vue-i18n v2.2.0 + * vue-i18n v2.3.0 * (c) 2015 kazuya kawaguchi * Released under the MIT License. */ @@ -64,6 +64,7 @@ return /******/ (function(modules) { // webpackBootstrap Object.defineProperty(exports, '__esModule', { value: true }); + exports['default'] = install; function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; } @@ -72,18 +73,18 @@ return /******/ (function(modules) { // webpackBootstrap var _extend2 = _interopRequireDefault(_extend); /** - * plugin + * install * * @param {Object} Vue * @param {Object} opts */ - exports['default'] = function (Vue) { + function install(Vue) { var opts = arguments.length <= 1 || arguments[1] === undefined ? { lang: 'en', locales: {} } : arguments[1]; defineConfig(Vue.config, opts.lang); (0, _extend2['default'])(Vue, opts.locales); - }; + } /** * defineConfig @@ -105,6 +106,14 @@ return /******/ (function(modules) { // webpackBootstrap } }); } + + /** + * install automaticlly + */ + + if (typeof window !== 'undefined' && window.Vue) { + window.Vue.use(install); + } module.exports = exports['default']; /***/ }, @@ -123,6 +132,10 @@ return /******/ (function(modules) { // webpackBootstrap var _format2 = _interopRequireDefault(_format); + var _compare = __webpack_require__(3); + + var _compare2 = _interopRequireDefault(_compare); + /** * extend * @@ -132,13 +145,13 @@ return /******/ (function(modules) { // webpackBootstrap */ exports['default'] = function (Vue, locales) { - var path = Vue.parsers.path; + var getPath = Vue.version && (0, _compare2['default'])('1.0.8', Vue.version) === -1 ? Vue.parsers.path.getPath : Vue.parsers.path.get; var util = Vue.util; - function getVal(path, key, lang, args) { + function getVal(key, lang, args) { var value = key; try { - var val = path.get(locales[lang], key) || locales[lang][key]; + var val = getPath(locales[lang], key) || locales[lang][key]; value = (args ? (0, _format2['default'])(val, args) : val) || key; } catch (e) { value = key; @@ -179,7 +192,7 @@ return /******/ (function(modules) { // webpackBootstrap } } - return getVal(path, key, language, args); + return getVal(key, language, args); }; return Vue; @@ -243,6 +256,77 @@ return /******/ (function(modules) { // webpackBootstrap module.exports = exports['default']; +/***/ }, +/* 3 */ +/***/ function(module, exports) { + + /** + * Version compare + * - Inspired: + * https://github.com/omichelsen/compare-versions + */ + + 'use strict'; + + Object.defineProperty(exports, '__esModule', { + value: true + }); + var PATCH_PATTERN = /-([\w-.]+)/; + + function split(v) { + var temp = v.split('.'); + var arr = temp.splice(0, 2); + arr.push(temp.join('.')); + return arr; + } + + /** + * compare + * + * @param {String} v1 + * @param {String} v2 + * @return {Number} + */ + + exports['default'] = function (v1, v2) { + var s1 = split(v1); + var s2 = split(v2); + + for (var i = 0; i < 3; i++) { + var n1 = parseInt(s1[i] || 0, 10); + var n2 = parseInt(s2[i] || 0, 10); + + if (n1 > n2) { + return 1; + } + if (n2 > n1) { + return -1; + } + } + + if ((s1[2] + s2[2] + '').indexOf('-') > -1) { + var p1 = (PATCH_PATTERN.exec(s1[2]) || [''])[0]; + var p2 = (PATCH_PATTERN.exec(s2[2]) || [''])[0]; + + if (p1 === '') { + return 1; + } + if (p2 === '') { + return -1; + } + if (p1 > p2) { + return 1; + } + if (p2 > p1) { + return -1; + } + } + + return 0; + }; + + module.exports = exports['default']; + /***/ } /******/ ]) }); diff --git a/dist/vue-i18n.min.js b/dist/vue-i18n.min.js index 01fc43d40..f179d02cd 100644 --- a/dist/vue-i18n.min.js +++ b/dist/vue-i18n.min.js @@ -1,6 +1,6 @@ /*! - * vue-i18n v2.2.0 + * vue-i18n v2.3.0 * (c) 2015 kazuya kawaguchi * Released under the MIT License. */ -!function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t():"function"==typeof define&&define.amd?define([],t):"object"==typeof exports?exports["vue-i18n"]=t():e["vue-i18n"]=t()}(this,function(){return function(e){function t(n){if(r[n])return r[n].exports;var o=r[n]={exports:{},id:n,loaded:!1};return e[n].call(o.exports,o,o.exports,t),o.loaded=!0,o.exports}var r={};return t.m=e,t.c=r,t.p="",t(0)}([function(e,t,r){"use strict";function n(e){return e&&e.__esModule?e:{"default":e}}function o(e,t){Object.defineProperty(e,"lang",{get:function(){return t},set:function(e){t=e}})}Object.defineProperty(t,"__esModule",{value:!0});var u=r(1),a=n(u);t["default"]=function(e){var t=arguments.length<=1||void 0===arguments[1]?{lang:"en",locales:{}}:arguments[1];o(e.config,t.lang),a["default"](e,t.locales)},e.exports=t["default"]},function(e,t,r){"use strict";function n(e){return e&&e.__esModule?e:{"default":e}}Object.defineProperty(t,"__esModule",{value:!0});var o=r(2),u=n(o);t["default"]=function(e,t){function r(e,r,n,o){var a=r;try{var f=e.get(t[n],r)||t[n][r];a=(o?u["default"](f,o):f)||r}catch(i){a=r}return a}var n=e.parsers.path,o=e.util;return e.prototype.$t=function(t){for(var u=arguments.length,a=Array(u>1?u-1:0),f=1;u>f;f++)a[f-1]=arguments[f];if(!t)return"";var i=e.config.lang;return 1===a.length?o.isObject(a[0])||o.isArray(a[0])?a=a[0]:"string"==typeof a[0]&&(i=a[0]):2===a.length&&("string"==typeof a[0]&&(i=a[0]),(o.isObject(a[1])||o.isArray(a[1]))&&(a=a[1])),r(n,t,i,a)},e},e.exports=t["default"]},function(e,t){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r=/\{([0-9a-zA-Z]+)\}/g;t["default"]=function(e){for(var t=arguments.length,n=Array(t>1?t-1:0),o=1;t>o;o++)n[o-1]=arguments[o];return 1===n.length&&"object"==typeof n[0]&&(n=n[0]),n&&n.hasOwnProperty||(n={}),e.replace(r,function(t,r,o){var u=void 0;return"{"===e[o-1]&&"}"===e[o+t.length]?r:(u=n.hasOwnProperty(r)?n[r]:null,null===u||void 0===u?"":u)})},e.exports=t["default"]}])}); \ No newline at end of file +!function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t():"function"==typeof define&&define.amd?define([],t):"object"==typeof exports?exports["vue-i18n"]=t():e["vue-i18n"]=t()}(this,function(){return function(e){function t(n){if(r[n])return r[n].exports;var u=r[n]={exports:{},id:n,loaded:!1};return e[n].call(u.exports,u,u.exports,t),u.loaded=!0,u.exports}var r={};return t.m=e,t.c=r,t.p="",t(0)}([function(e,t,r){"use strict";function n(e){return e&&e.__esModule?e:{"default":e}}function u(e){var t=arguments.length<=1||void 0===arguments[1]?{lang:"en",locales:{}}:arguments[1];o(e.config,t.lang),(0,a["default"])(e,t.locales)}function o(e,t){Object.defineProperty(e,"lang",{get:function(){return t},set:function(e){t=e}})}Object.defineProperty(t,"__esModule",{value:!0}),t["default"]=u;var i=r(1),a=n(i);"undefined"!=typeof window&&window.Vue&&window.Vue.use(u),e.exports=t["default"]},function(e,t,r){"use strict";function n(e){return e&&e.__esModule?e:{"default":e}}Object.defineProperty(t,"__esModule",{value:!0});var u=r(2),o=n(u),i=r(3),a=n(i);t["default"]=function(e,t){function r(e,r,u){var i=e;try{var a=n(t[r],e)||t[r][e];i=(u?(0,o["default"])(a,u):a)||e}catch(f){i=e}return i}var n=e.version&&-1===(0,a["default"])("1.0.8",e.version)?e.parsers.path.getPath:e.parsers.path.get,u=e.util;return e.prototype.$t=function(t){for(var n=arguments.length,o=Array(n>1?n-1:0),i=1;n>i;i++)o[i-1]=arguments[i];if(!t)return"";var a=e.config.lang;return 1===o.length?u.isObject(o[0])||u.isArray(o[0])?o=o[0]:"string"==typeof o[0]&&(a=o[0]):2===o.length&&("string"==typeof o[0]&&(a=o[0]),(u.isObject(o[1])||u.isArray(o[1]))&&(o=o[1])),r(t,a,o)},e},e.exports=t["default"]},function(e,t){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r=/\{([0-9a-zA-Z]+)\}/g;t["default"]=function(e){for(var t=arguments.length,n=Array(t>1?t-1:0),u=1;t>u;u++)n[u-1]=arguments[u];return 1===n.length&&"object"==typeof n[0]&&(n=n[0]),n&&n.hasOwnProperty||(n={}),e.replace(r,function(t,r,u){var o=void 0;return"{"===e[u-1]&&"}"===e[u+t.length]?r:(o=n.hasOwnProperty(r)?n[r]:null,null===o||void 0===o?"":o)})},e.exports=t["default"]},function(e,t){"use strict";function r(e){var t=e.split("."),r=t.splice(0,2);return r.push(t.join(".")),r}Object.defineProperty(t,"__esModule",{value:!0});var n=/-([\w-.]+)/;t["default"]=function(e,t){for(var u=r(e),o=r(t),i=0;3>i;i++){var a=parseInt(u[i]||0,10),f=parseInt(o[i]||0,10);if(a>f)return 1;if(f>a)return-1}if((u[2]+o[2]+"").indexOf("-")>-1){var s=(n.exec(u[2])||[""])[0],l=(n.exec(o[2])||[""])[0];if(""===s)return 1;if(""===l)return-1;if(s>l)return 1;if(l>s)return-1}return 0},e.exports=t["default"]}])}); \ No newline at end of file diff --git a/package.json b/package.json index 8a286e8e1..604960dff 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "vue-i18n", "description": "Internationalization plugin for Vue.js", - "version": "2.2.0", + "version": "2.3.0", "author": { "name": "kazuya kawaguchi", "email": "kawakazu80@gmail.com"