1 files changed, 17 insertions, 3 deletions

diff --git a/src/js/jsbip39.js b/src/js/jsbip39.js
index 455615a..80ce656 100644
--- a/src/js/jsbip39.js
+++ b/src/js/jsbip39.js
@@ -93,11 +93,11 @@ var Mnemonic = function(language) {
             var idx = parseInt(b.substring(i * 11, (i + 1) * 11), 2);
             result.push(wordlist[idx]);
         }
-        return result.join(' ');
+        return self.joinWords(result);
     }
 
     self.check = function(mnemonic) {
-        var mnemonic = mnemonic.split(' ')
+        var mnemonic = self.splitWords(mnemonic);
         if (mnemonic.length % 3 > 0) {
             return false
         }
@@ -130,7 +130,7 @@ var Mnemonic = function(language) {
 
     self.toSeed = function(mnemonic, passphrase) {
         passphrase = passphrase || '';
-        mnemonic = self.normalizeString(mnemonic).split(' ').filter(function(x) { return x.length; }).join(' ');
+        mnemonic = self.joinWords(self.splitWords(self.normalizeString(mnemonic))); // removes blanks
         passphrase = self.normalizeString(passphrase)
         passphrase = "mnemonic" + passphrase;
         var mnemonicBits = sjcl.codec.utf8String.toBits(mnemonic);
@@ -140,6 +140,20 @@ var Mnemonic = function(language) {
         return hashHex;
     }
 
+    self.splitWords = function(mnemonic) {
+        return mnemonic.split(/\s/g).filter(function(x) { return x.length; });
+    }
+
+    self.joinWords = function(words) {
+        // Set space correctly depending on the language
+        // see https://github.com/bitcoin/bips/blob/master/bip-0039/bip-0039-wordlists.md#japanese
+        var space = " ";
+        if (language == "japanese") {
+            space = "\u3000"; // ideographic space
+        }
+        return words.join(space);
+    }
+
     self.normalizeString = function(str) {
         if (typeof str.normalize == "function") {
             return str.normalize("NFKD");