From cff90be66ab8227759142806e15b1800c7afbc1d Mon Sep 17 00:00:00 2001 From: Musterknabe Date: Tue, 24 Mar 2015 15:03:52 +0100 Subject: [PATCH 1/2] Fixed regression --- src/translate.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/translate.js b/src/translate.js index 4033539..6d09c5e 100644 --- a/src/translate.js +++ b/src/translate.js @@ -115,10 +115,10 @@ if (translation === null) { translation = debug ? '@@' + translationKey + '@@' : translationKey; - } - if (debug) { - console.log('Translation for "' + translationKey + '" not found.'); + if (debug) { + console.log('Translation for "' + translationKey + '" not found.'); + } } return translation; From 71ed1b9d6523a0c15880207dc0bec836ebba304f Mon Sep 17 00:00:00 2001 From: Musterknabe Date: Tue, 24 Mar 2015 15:05:01 +0100 Subject: [PATCH 2/2] Bumped version / added builds --- build/translate.js | 8 ++++---- build/translate.min.js | 4 ++-- package.json | 2 +- src/translate.js | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/build/translate.js b/build/translate.js index 4033539..b35bd23 100644 --- a/build/translate.js +++ b/build/translate.js @@ -1,7 +1,7 @@ /** * Microlib for translations with support for placeholders and multiple plural forms. * - * v1.0.0 + * v1.0.1 * * Usage: * var messages = { @@ -115,10 +115,10 @@ if (translation === null) { translation = debug ? '@@' + translationKey + '@@' : translationKey; - } - if (debug) { - console.log('Translation for "' + translationKey + '" not found.'); + if (debug) { + console.log('Translation for "' + translationKey + '" not found.'); + } } return translation; diff --git a/build/translate.min.js b/build/translate.min.js index 6a2ecdc..a2ba891 100644 --- a/build/translate.min.js +++ b/build/translate.min.js @@ -1,6 +1,6 @@ -/*! translate.js - v1.0.0 - 2015-03-23 +/*! translate.js - v1.0.1 - 2015-03-24 * https://github.com/musterknabe/translate.js * Copyright (c) 2015 Jonas Girnatis * Licensed under MIT license */ -!function(){"use strict";var a=function(a){return!isNaN(parseFloat(a))&&isFinite(a)},b=function(a){return"object"==typeof a&&null!==a},c=function(a){return"[object String]"===Object.prototype.toString.call(a)};window.libTranslate={getTranslationFunction:function(d,e){function f(a){if(d[a])return d[a];var b=a.split(j),c=b[0],e=b[1];return d[c]&&d[c][e]?d[c][e]:null}function g(a,c){if(b(a)){if(0===Object.keys(a).length)return i&&console.log("[Translation] No plural forms found."),null;a[c]?a=a[c]:a.n?a=a.n:(i&&console.log('[Translation] No plural forms found for count:"'+c+'" in',a),a=a[Object.keys(a).reverse()[0]])}return a}function h(a,b){return c(a)?a.replace(/\{(\w*)\}/g,function(a,c){return b.hasOwnProperty(c)?b.hasOwnProperty(c)?b[c]:c:(i&&console.log('Could not find replacement "'+c+'" in provided replacements object:',b),"{"+c+"}")}):a}e=b(e)?e:{};var i=e.debug,j=e.namespaceSplitter||"::";return function(c){var d=b(arguments[1])?arguments[1]:b(arguments[2])?arguments[2]:{},e=a(arguments[1])?arguments[1]:a(arguments[2])?arguments[2]:null,j=f(c);return null!==e&&(d.n=d.n?d.n:e,j=g(j,e)),j=h(j,d),null===j&&(j=i?"@@"+c+"@@":c),i&&console.log('Translation for "'+c+'" not found.'),j}}}}(); \ No newline at end of file +!function(){"use strict";var a=function(a){return!isNaN(parseFloat(a))&&isFinite(a)},b=function(a){return"object"==typeof a&&null!==a},c=function(a){return"[object String]"===Object.prototype.toString.call(a)};window.libTranslate={getTranslationFunction:function(d,e){function f(a){if(d[a])return d[a];var b=a.split(j),c=b[0],e=b[1];return d[c]&&d[c][e]?d[c][e]:null}function g(a,c){if(b(a)){if(0===Object.keys(a).length)return i&&console.log("[Translation] No plural forms found."),null;a[c]?a=a[c]:a.n?a=a.n:(i&&console.log('[Translation] No plural forms found for count:"'+c+'" in',a),a=a[Object.keys(a).reverse()[0]])}return a}function h(a,b){return c(a)?a.replace(/\{(\w*)\}/g,function(a,c){return b.hasOwnProperty(c)?b.hasOwnProperty(c)?b[c]:c:(i&&console.log('Could not find replacement "'+c+'" in provided replacements object:',b),"{"+c+"}")}):a}e=b(e)?e:{};var i=e.debug,j=e.namespaceSplitter||"::";return function(c){var d=b(arguments[1])?arguments[1]:b(arguments[2])?arguments[2]:{},e=a(arguments[1])?arguments[1]:a(arguments[2])?arguments[2]:null,j=f(c);return null!==e&&(d.n=d.n?d.n:e,j=g(j,e)),j=h(j,d),null===j&&(j=i?"@@"+c+"@@":c,i&&console.log('Translation for "'+c+'" not found.')),j}}}}(); \ No newline at end of file diff --git a/package.json b/package.json index aef4390..a6b62c8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "translate.js", - "version": "1.0.0", + "version": "1.0.1", "description": "Javascript micro library for translations (i18n) with support for placeholders and multiple plural forms.", "main": "Gruntfile.js", "dependencies": { diff --git a/src/translate.js b/src/translate.js index 6d09c5e..b35bd23 100644 --- a/src/translate.js +++ b/src/translate.js @@ -1,7 +1,7 @@ /** * Microlib for translations with support for placeholders and multiple plural forms. * - * v1.0.0 + * v1.0.1 * * Usage: * var messages = {