Skip to content

Commit

Permalink
Merge branch 'release/v1.0.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
musterknabe committed Mar 24, 2015
2 parents 1a168f0 + 71ed1b9 commit d22016a
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
8 changes: 4 additions & 4 deletions build/translate.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* Microlib for translations with support for placeholders and multiple plural forms.
*
* v1.0.0
* v1.0.1
*
* Usage:
* var messages = {
Expand Down Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions build/translate.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down
8 changes: 4 additions & 4 deletions src/translate.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* Microlib for translations with support for placeholders and multiple plural forms.
*
* v1.0.0
* v1.0.1
*
* Usage:
* var messages = {
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit d22016a

Please sign in to comment.