Allow to include objects in translations - this allows to use vdom-no…

…des in translations

index.js

@@ -4,9 +4,9 @@
  * v0.3.0
  *
  * Usage:
- * 
+ *
  * var translate = require('translate.js')
- * 
+ *
  * var messages = {
  *  translationKey: 'translationValue'
  * }
@@ -38,23 +38,19 @@
     return obj && typeof obj === 'object'
   }
 
-  function assemble(parts, replacements, count, debug) {
-    var result = parts[0]
-    var i = 1
-    var len = parts.length
-    while (i < len) {
-      var part = parts[i]
-      var val = replacements[part]
+  function assemble (parts, replacements, count, debug) {
+    var result = [].concat(parts)
+    for (var i = 1; i < parts.length; i += 2) {
+      var val = replacements[parts[i]]
       if (val == null) {
-        if (part === 'n' && count != null) {
+        if (parts[i] === 'n' && count != null) {
           val = count
         } else {
-          debug && console.warn('No "' + part + '" in placeholder object:', replacements)
-          val = '{' + part + '}'
+          debug && console.warn('No "' + parts[i] + '" in placeholder object:', replacements)
+          val = '{' + parts[i] + '}'
         }
       }
-      result += val + parts[i+1]
-      i += 2
+      result[i] = val
     }
     return result
   }
@@ -105,7 +101,7 @@
       return result
     }
 
-    var tFunc = function (translationKey, count, replacements) {
+    function runTranslation (translationKey, count, replacements) {
       var translation = tFunc.keys[translationKey]
       var complex = count != null || replacements != null
 
@@ -137,6 +133,14 @@
       return translation
     }
 
+    var tFunc = function () {
+      var translation = runTranslation.apply(null, arguments)
+      if (translation && translation.join) {
+        return translation.join('')
+      }
+      return translation
+    }
+    tFunc.v = runTranslation
     tFunc.keys = messageObject || {}
     tFunc.opts = options || {}
 

test.js

@@ -258,3 +258,12 @@ describe('translate.js', function () {
     expect(t('test', { x: 'HelloWorld' })).to.equal('HelloWorld')
   })
 })
+
+describe('vdom awareness', function () {
+  it('should not kill any objects and return arrays as translations', function () {
+    var t = translate({
+      test: 'abc {xyz} def'
+    })
+    expect(t.v('test', { xyz: { foo: 'bar' } })).to.eql(['abc ', { foo: 'bar' }, ' def'])
+  })
+})