vue-i18n - npm Package Compare versions

Comparing version 4.3.1 to 4.4.0

CHANGELOG.md

@@ -0,1 +1,11 @@
+<a name="4.4.0"></a>
+# [4.4.0](https://github.com/kazupon/vue-i18n/compare/v4.3.1...v4.4.0) (2016-08-29)
+
+
+### :star: New Features
+
+* add linked translations ([#50](https://github.com/kazupon/vue-i18n/issues/50)) by [@mmochetti](https://github.com/mmochetti) ([f7ae073](https://github.com/kazupon/vue-i18n/commit/f7ae073))
+
+
+
 <a name="4.3.1"></a>
@@ -2,0 +12,0 @@ ## [4.3.1](https://github.com/kazupon/vue-i18n/compare/v4.3.0...v4.3.1) (2016-08-26)

dist/vue-i18n.common.js

 /*!
- * vue-i18n v4.3.1
+ * vue-i18n v4.4.0
  * (c) 2016 kazuya kawaguchi
@@ -718,2 +718,19 @@ * Released under the MIT License.
 
+    // Check for the existance of links within the translated string
+    if (val.indexOf('@:') >= 0) {
+      // Match all the links within the local
+      // We are going to replace each of
+      // them with its translation
+      var matches = val.match(/(@:[\w|\.]+)/g);
+      for (var idx in matches) {
+        var link = matches[idx];
+        // Remove the leading @:
+        var linkPlaceholder = link.substr(2);
+        // Translate the link
+        var translatedstring = interpolate(locale, linkPlaceholder, args);
+        // Replace the link with the translated string
+        val = val.replace(link, translatedstring);
+      }
+    }
+
     return args ? format(val, args) : val;
@@ -915,3 +932,3 @@ }
 
-plugin.version = '4.3.1';
+plugin.version = '4.4.0';
 
@@ -918,0 +935,0 @@ if (typeof window !== 'undefined' && window.Vue) {

dist/vue-i18n.js

 /*!
- * vue-i18n v4.3.1
+ * vue-i18n v4.4.0
  * (c) 2016 kazuya kawaguchi
@@ -722,2 +722,19 @@ * Released under the MIT License.
 
+      // Check for the existance of links within the translated string
+      if (val.indexOf('@:') >= 0) {
+        // Match all the links within the local
+        // We are going to replace each of
+        // them with its translation
+        var matches = val.match(/(@:[\w|\.]+)/g);
+        for (var idx in matches) {
+          var link = matches[idx];
+          // Remove the leading @:
+          var linkPlaceholder = link.substr(2);
+          // Translate the link
+          var translatedstring = interpolate(locale, linkPlaceholder, args);
+          // Replace the link with the translated string
+          val = val.replace(link, translatedstring);
+        }
+      }
+
       return args ? format(val, args) : val;
@@ -919,3 +936,3 @@ }
 
-  plugin.version = '4.3.1';
+  plugin.version = '4.4.0';
 
@@ -922,0 +939,0 @@ if (typeof window !== 'undefined' && window.Vue) {

dist/vue-i18n.min.js

 /*!
- * vue-i18n v4.3.1
+ * vue-i18n v4.4.0
  * (c) 2016 kazuya kawaguchi
  * Released under the MIT License.
  */
-!function(n,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t():"function"==typeof define&&define.amd?define(t):n.VueI18n=t()}(this,function(){"use strict";function n(n,t){window.console&&(console.warn("[vue-i18n] "+n),t&&console.warn(t.stack))}function t(t){t.locale=function(t,r,o){return void 0===r?_[t]:void(null===r?(_[t]=void 0,delete _[t]):e(t,r,function(e){e?(_[t]=e,o&&o()):n("failed set `"+t+"` locale")}))}}function e(n,t,e){var o=this;"object"===("undefined"==typeof t?"undefined":w["typeof"](t))?e(t):!function(){var n=t.call(o);"function"==typeof n?n.resolved?e(n.resolved):n.requested?n.pendingCallbacks.push(e):!function(){n.requested=!0;var t=n.pendingCallbacks=[e];n(function(e){n.resolved=e;for(var r=0,o=t.length;o>r;r++)t[r](e)},function(){e()})}():r(n)&&n.then(function(n){e(n)},function(){e()})["catch"](function(n){console.error(n),e()})}()}function r(n){return n&&"function"==typeof n.then}function o(n,t,e){function r(n){if(e>1)n.$forceUpdate();else for(var t=n._watchers.length;t--;)n._watchers[t].update(!0)}var o=n.prototype._init;n.prototype._init=function(n){var e=this;o.call(this,n),this.$parent||(this.$lang=t,this._langUnwatch=this.$lang.$watch("lang",function(n,t){r(e)}))};var i=n.prototype._destroy;n.prototype._destroy=function(){!this.$parent&&this._langUnwatch&&(this._langUnwatch(),this._langUnwatch=null,this.$lang=null),i.apply(this,arguments)}}function i(n){if(!m){var t=n.$watch("__watcher__",function(n){});m=n._watchers[0].constructor,t()}return m}function u(n){return A||(A=n._data.__ob__.dep.constructor),A}function a(n,t,e){function r(n,t){var e=new a(t,n,null,{lazy:!0});return function(){return e.dirty&&e.evaluate(),c.target&&e.depend(),e.value}}var o=n.util.bind,a=i(t),c=u(t);Object.defineProperty(n.config,"lang",{enumerable:!0,configurable:!0,get:r(function(){return t.lang},t),set:o(function(n){t.lang=n},t)}),$=e,Object.defineProperty(n.config,"fallbackLang",{enumerable:!0,configurable:!0,get:function(){return $},set:function(n){$=n}})}function c(n){function t(n){for(var t=arguments.length,r=Array(t>1?t-1:0),o=1;t>o;o++)r[o-1]=arguments[o];return 1===r.length&&"object"===w["typeof"](r[0])&&(r=r[0]),r&&r.hasOwnProperty||(r={}),n.replace(j,function(t,o,i,u){var a=void 0;return"{"===n[u-1]&&"}"===n[u+t.length]?i:(a=e(r,i)?r[i]:null,null===a||void 0===a?"":a)})}var e=n.util.hasOwn;return t}function f(n){return D.test(n)}function l(n){var t=n.charCodeAt(0),e=n.charCodeAt(n.length-1);return t!==e||34!==t&&39!==t?n:n.slice(1,-1)}function s(n){if(void 0===n)return"eof";var t=n.charCodeAt(0);switch(t){case 91:case 93:case 46:case 34:case 39:case 48:return n;case 95:case 36:return"ident";case 32:case 9:case 10:case 13:case 160:case 65279:case 8232:case 8233:return"ws"}return t>=97&&122>=t||t>=65&&90>=t?"ident":t>=49&&57>=t?"number":"else"}function d(n){var t=n.trim();return"0"===n.charAt(0)&&isNaN(n)?!1:f(t)?l(t):"*"+t}function v(n){function t(){var t=n[r+1];return o===z&&"'"===t||o===L&&'"'===t?(r++,a="\\"+t,h[k](),!0):void 0}var e=[],r=-1,o=S,i=0,u=void 0,a=void 0,c=void 0,f=void 0,l=void 0,v=void 0,p=void 0,h=[];for(h[C]=function(){void 0!==c&&(e.push(c),c=void 0)},h[k]=function(){void 0===c?c=a:c+=a},h[U]=function(){h[k](),i++},h[P]=function(){if(i>0)i--,o=x,h[k]();else{if(i=0,c=d(c),c===!1)return!1;h[C]()}};null!=o;)if(r++,u=n[r],"\\"!==u||!t()){if(f=s(u),p=B[o],l=p[f]||p["else"]||Z,l===Z)return;if(o=l[0],v=h[l[1]],v&&(a=l[2],a=void 0===a?u:a,v()===!1))return;if(o===I)return e.raw=n,e}}function p(n){var t=O[n];return t||(t=v(n),t&&(O[n]=t)),t}function h(n){function t(n){if(null===n||void 0===n)return!0;if(Array.isArray(n)){if(n.length>0)return!1;if(0===n.length)return!0}else if(i(n))for(var t in n)if(u(n,t))return!1;return!0}function e(n,e){if(!o(n))return null;var r=p(e);if(t(r))return null;for(var i=r.length,u=null,a=n,c=0;i>c;){var f=a[r[c]];if(void 0===f){a=null;break}a=f,c++}return u=a}var r=n.util,o=r.isObject,i=r.isPlainObject,u=r.hasOwn;return e}function y(n){function t(){for(var t=arguments.length,e=Array(t),r=0;t>r;r++)e[r]=arguments[r];var o=n.config.lang,i=n.config.fallbackLang;return 1===e.length?l(e[0])||Array.isArray(e[0])?e=e[0]:"string"==typeof e[0]&&(o=e[0]):2===e.length&&("string"==typeof e[0]&&(o=e[0]),(l(e[1])||Array.isArray(e[1]))&&(e=e[1])),{lang:o,fallback:i,params:e}}function e(n,t,e){if(!n)return null;var r=v(n,t)||n[t];return r?e?d(r,e):r:null}function r(n,t,r,o,i){var u=null;return(u=e(n(t),o,i))?u:(u=e(n(r),o,i),u?u:null)}function o(n){return n}function i(t){return n.locale(t)}function u(n){return this.$options.locales[n]}function a(n,t){if(!n&&"string"!=typeof n)return null;var e=n.split("|");return t-=1,e[t]?e[t].trim():n}var f=n.util,l=f.isObject,s=f.bind,d=c(n),v=h(n);return n.t=function(n){for(var e=arguments.length,u=Array(e>1?e-1:0),a=1;e>a;a++)u[a-1]=arguments[a];if(!n)return"";var c=t.apply(void 0,u),f=c.lang,l=c.fallback,s=c.params;return r(i,f,l,n,s)||o(n)},n.tc=function(t,e){for(var r=arguments.length,o=Array(r>2?r-2:0),i=2;r>i;i++)o[i-2]=arguments[i];return e||(e=1),a(n.t.apply(n,[t].concat(o)),e)},n.prototype.$t=function(n){if(!n)return"";for(var e=arguments.length,a=Array(e>1?e-1:0),c=1;e>c;c++)a[c-1]=arguments[c];var f=t.apply(void 0,a),l=f.lang,d=f.fallback,v=f.params,p=null;return this.$options.locales&&(p=r(s(u,this),l,d,n,v))?p:r(i,l,d,n,v)||o(n)},n.prototype.$tc=function(n,t){if("number"!=typeof t&&"undefined"!=typeof t)return n;t||(t=1);for(var e=arguments.length,r=Array(e>2?e-2:0),o=2;e>o;o++)r[o-2]=arguments[o];return a(this.$t.apply(this,[n].concat(r)),t)},n}function g(n){var e=(arguments.length<=1||void 0===arguments[1]?{}:arguments[1],n.version&&Number(n.version.split(".")[0])||-1),r="en";b(n,r),t(n),o(n,E,e),a(n,E,r),y(n)}function b(n,t){var e=n.config.silent;n.config.silent=!0,E||(E=new n({data:{lang:t}})),n.config.silent=e}var w={};w["typeof"]="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(n){return typeof n}:function(n){return n&&"function"==typeof Symbol&&n.constructor===Symbol?"symbol":typeof n};var _=Object.create(null),m=void 0,A=void 0,$=void 0,j=/(%|)\{([0-9a-zA-Z_]+)\}/g,O=Object.create(null),k=0,C=1,U=2,P=3,S=0,N=1,V=2,q=3,x=4,z=5,L=6,I=7,Z=8,B=[];B[S]={ws:[S],ident:[q,k],"[":[x],eof:[I]},B[N]={ws:[N],".":[V],"[":[x],eof:[I]},B[V]={ws:[V],ident:[q,k]},B[q]={ident:[q,k],0:[q,k],number:[q,k],ws:[N,C],".":[V,C],"[":[x,C],eof:[I,C]},B[x]={"'":[z,k],'"':[L,k],"[":[x,U],"]":[N,P],eof:Z,"else":[x,k]},B[z]={"'":[x,k],eof:Z,"else":[z,k]},B[L]={'"':[x,k],eof:Z,"else":[L,k]};var D=/^\s?(true|false|-?[\d\.]+|'[^']*'|"[^"]*")\s?$/,E=void 0;return g.version="4.3.1","undefined"!=typeof window&&window.Vue&&window.Vue.use(g),g});
+!function(n,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t():"function"==typeof define&&define.amd?define(t):n.VueI18n=t()}(this,function(){"use strict";function n(n,t){window.console&&(console.warn("[vue-i18n] "+n),t&&console.warn(t.stack))}function t(t){t.locale=function(t,r,o){return void 0===r?m[t]:void(null===r?(m[t]=void 0,delete m[t]):e(t,r,function(e){e?(m[t]=e,o&&o()):n("failed set `"+t+"` locale")}))}}function e(n,t,e){var o=this;"object"===("undefined"==typeof t?"undefined":w["typeof"](t))?e(t):!function(){var n=t.call(o);"function"==typeof n?n.resolved?e(n.resolved):n.requested?n.pendingCallbacks.push(e):!function(){n.requested=!0;var t=n.pendingCallbacks=[e];n(function(e){n.resolved=e;for(var r=0,o=t.length;o>r;r++)t[r](e)},function(){e()})}():r(n)&&n.then(function(n){e(n)},function(){e()})["catch"](function(n){console.error(n),e()})}()}function r(n){return n&&"function"==typeof n.then}function o(n,t,e){function r(n){if(e>1)n.$forceUpdate();else for(var t=n._watchers.length;t--;)n._watchers[t].update(!0)}var o=n.prototype._init;n.prototype._init=function(n){var e=this;o.call(this,n),this.$parent||(this.$lang=t,this._langUnwatch=this.$lang.$watch("lang",function(n,t){r(e)}))};var i=n.prototype._destroy;n.prototype._destroy=function(){!this.$parent&&this._langUnwatch&&(this._langUnwatch(),this._langUnwatch=null,this.$lang=null),i.apply(this,arguments)}}function i(n){if(!_){var t=n.$watch("__watcher__",function(n){});_=n._watchers[0].constructor,t()}return _}function u(n){return A||(A=n._data.__ob__.dep.constructor),A}function a(n,t,e){function r(n,t){var e=new a(t,n,null,{lazy:!0});return function(){return e.dirty&&e.evaluate(),f.target&&e.depend(),e.value}}var o=n.util.bind,a=i(t),f=u(t);Object.defineProperty(n.config,"lang",{enumerable:!0,configurable:!0,get:r(function(){return t.lang},t),set:o(function(n){t.lang=n},t)}),$=e,Object.defineProperty(n.config,"fallbackLang",{enumerable:!0,configurable:!0,get:function(){return $},set:function(n){$=n}})}function f(n){function t(n){for(var t=arguments.length,r=Array(t>1?t-1:0),o=1;t>o;o++)r[o-1]=arguments[o];return 1===r.length&&"object"===w["typeof"](r[0])&&(r=r[0]),r&&r.hasOwnProperty||(r={}),n.replace(O,function(t,o,i,u){var a=void 0;return"{"===n[u-1]&&"}"===n[u+t.length]?i:(a=e(r,i)?r[i]:null,null===a||void 0===a?"":a)})}var e=n.util.hasOwn;return t}function c(n){return D.test(n)}function l(n){var t=n.charCodeAt(0),e=n.charCodeAt(n.length-1);return t!==e||34!==t&&39!==t?n:n.slice(1,-1)}function s(n){if(void 0===n)return"eof";var t=n.charCodeAt(0);switch(t){case 91:case 93:case 46:case 34:case 39:case 48:return n;case 95:case 36:return"ident";case 32:case 9:case 10:case 13:case 160:case 65279:case 8232:case 8233:return"ws"}return t>=97&&122>=t||t>=65&&90>=t?"ident":t>=49&&57>=t?"number":"else"}function v(n){var t=n.trim();return"0"===n.charAt(0)&&isNaN(n)?!1:c(t)?l(t):"*"+t}function d(n){function t(){var t=n[r+1];return o===z&&"'"===t||o===L&&'"'===t?(r++,a="\\"+t,h[k](),!0):void 0}var e=[],r=-1,o=S,i=0,u=void 0,a=void 0,f=void 0,c=void 0,l=void 0,d=void 0,p=void 0,h=[];for(h[C]=function(){void 0!==f&&(e.push(f),f=void 0)},h[k]=function(){void 0===f?f=a:f+=a},h[U]=function(){h[k](),i++},h[P]=function(){if(i>0)i--,o=q,h[k]();else{if(i=0,f=v(f),f===!1)return!1;h[C]()}};null!=o;)if(r++,u=n[r],"\\"!==u||!t()){if(c=s(u),p=B[o],l=p[c]||p["else"]||Z,l===Z)return;if(o=l[0],d=h[l[1]],d&&(a=l[2],a=void 0===a?u:a,d()===!1))return;if(o===I)return e.raw=n,e}}function p(n){var t=j[n];return t||(t=d(n),t&&(j[n]=t)),t}function h(n){function t(n){if(null===n||void 0===n)return!0;if(Array.isArray(n)){if(n.length>0)return!1;if(0===n.length)return!0}else if(i(n))for(var t in n)if(u(n,t))return!1;return!0}function e(n,e){if(!o(n))return null;var r=p(e);if(t(r))return null;for(var i=r.length,u=null,a=n,f=0;i>f;){var c=a[r[f]];if(void 0===c){a=null;break}a=c,f++}return u=a}var r=n.util,o=r.isObject,i=r.isPlainObject,u=r.hasOwn;return e}function y(n){function t(){for(var t=arguments.length,e=Array(t),r=0;t>r;r++)e[r]=arguments[r];var o=n.config.lang,i=n.config.fallbackLang;return 1===e.length?l(e[0])||Array.isArray(e[0])?e=e[0]:"string"==typeof e[0]&&(o=e[0]):2===e.length&&("string"==typeof e[0]&&(o=e[0]),(l(e[1])||Array.isArray(e[1]))&&(e=e[1])),{lang:o,fallback:i,params:e}}function e(n,t,r){if(!n)return null;var o=d(n,t)||n[t];if(!o)return null;if(o.indexOf("@:")>=0){var i=o.match(/(@:[\w|\.]+)/g);for(var u in i){var a=i[u],f=a.substr(2),c=e(n,f,r);o=o.replace(a,c)}}return r?v(o,r):o}function r(n,t,r,o,i){var u=null;return(u=e(n(t),o,i))?u:(u=e(n(r),o,i),u?u:null)}function o(n){return n}function i(t){return n.locale(t)}function u(n){return this.$options.locales[n]}function a(n,t){if(!n&&"string"!=typeof n)return null;var e=n.split("|");return t-=1,e[t]?e[t].trim():n}var c=n.util,l=c.isObject,s=c.bind,v=f(n),d=h(n);return n.t=function(n){for(var e=arguments.length,u=Array(e>1?e-1:0),a=1;e>a;a++)u[a-1]=arguments[a];if(!n)return"";var f=t.apply(void 0,u),c=f.lang,l=f.fallback,s=f.params;return r(i,c,l,n,s)||o(n)},n.tc=function(t,e){for(var r=arguments.length,o=Array(r>2?r-2:0),i=2;r>i;i++)o[i-2]=arguments[i];return e||(e=1),a(n.t.apply(n,[t].concat(o)),e)},n.prototype.$t=function(n){if(!n)return"";for(var e=arguments.length,a=Array(e>1?e-1:0),f=1;e>f;f++)a[f-1]=arguments[f];var c=t.apply(void 0,a),l=c.lang,v=c.fallback,d=c.params,p=null;return this.$options.locales&&(p=r(s(u,this),l,v,n,d))?p:r(i,l,v,n,d)||o(n)},n.prototype.$tc=function(n,t){if("number"!=typeof t&&"undefined"!=typeof t)return n;t||(t=1);for(var e=arguments.length,r=Array(e>2?e-2:0),o=2;e>o;o++)r[o-2]=arguments[o];return a(this.$t.apply(this,[n].concat(r)),t)},n}function g(n){var e=(arguments.length<=1||void 0===arguments[1]?{}:arguments[1],n.version&&Number(n.version.split(".")[0])||-1),r="en";b(n,r),t(n),o(n,E,e),a(n,E,r),y(n)}function b(n,t){var e=n.config.silent;n.config.silent=!0,E||(E=new n({data:{lang:t}})),n.config.silent=e}var w={};w["typeof"]="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(n){return typeof n}:function(n){return n&&"function"==typeof Symbol&&n.constructor===Symbol?"symbol":typeof n};var m=Object.create(null),_=void 0,A=void 0,$=void 0,O=/(%|)\{([0-9a-zA-Z_]+)\}/g,j=Object.create(null),k=0,C=1,U=2,P=3,S=0,x=1,N=2,V=3,q=4,z=5,L=6,I=7,Z=8,B=[];B[S]={ws:[S],ident:[V,k],"[":[q],eof:[I]},B[x]={ws:[x],".":[N],"[":[q],eof:[I]},B[N]={ws:[N],ident:[V,k]},B[V]={ident:[V,k],0:[V,k],number:[V,k],ws:[x,C],".":[N,C],"[":[q,C],eof:[I,C]},B[q]={"'":[z,k],'"':[L,k],"[":[q,U],"]":[x,P],eof:Z,"else":[q,k]},B[z]={"'":[q,k],eof:Z,"else":[z,k]},B[L]={'"':[q,k],eof:Z,"else":[L,k]};var D=/^\s?(true|false|-?[\d\.]+|'[^']*'|"[^"]*")\s?$/,E=void 0;return g.version="4.4.0","undefined"!=typeof window&&window.Vue&&window.Vue.use(g),g});

package.json

 {
   "name": "vue-i18n",
   "description": "Internationalization plugin for Vue.js",
-  "version": "4.3.1",
+  "version": "4.4.0",
   "author": {
@@ -6,0 +6,0 @@ "name": "kazuya kawaguchi",

src/extend.js

@@ -43,5 +43,22 @@ import warn from './warn'
 
-    const val = getValue(locale, key) || locale[key]
+    let val = getValue(locale, key) || locale[key]
     if (!val) { return null }
 
+    // Check for the existance of links within the translated string
+    if (val.indexOf('@:') >= 0) {
+      // Match all the links within the local
+      // We are going to replace each of
+      // them with its translation
+      const matches = val.match(/(@:[\w|\.]+)/g)
+      for (const idx in matches) {
+        const link = matches[idx]
+        // Remove the leading @:
+        const linkPlaceholder = link.substr(2)
+        // Translate the link
+        const translatedstring = interpolate(locale, linkPlaceholder, args)
+        // Replace the link with the translated string
+        val = val.replace(link, translatedstring)
+      }
+    }
+
     return args ? format(val, args) : val
@@ -48,0 +65,0 @@ }

src/index.js

@@ -50,3 +50,3 @@ import warn from './warn'
 
-plugin.version = '4.3.1'
+plugin.version = '4.4.0'
 
@@ -53,0 +53,0 @@ export default plugin

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

78089

increased by3.21%

Lines of code

2300

increased by2.13%

Published versions last two months

5

increased by25%

No dependency changes