From 2221ba0dc4236ce1058ea19fca801355d90a1e26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Mur=C3=A9?= <batolettre@gmail.com>
Date: Sun, 13 Jul 2014 14:58:45 +0200
Subject: [PATCH] fix the last quirks for i18n

---
 index.html              | 38 ++++++++++++++++++++------------------
 l10n/en.js              |  7 ++-----
 src/index.html          | 12 ++++++------
 src/ninja.onload.js     | 21 +++++++++++++--------
 src/ninja.translator.js |  6 +-----
 5 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/index.html b/index.html
index 53ee187..8fa7cc6 100644
--- a/index.html
+++ b/index.html
@@ -9713,7 +9713,7 @@ h1 { margin: 0px; height: 91px; }
 				<div id="keyarea" class="keyarea">
 					<div class="public">
 						<div class="pubaddress">
-							<span class="label" id="singlelabelbitcoinaddress" class="i18n">Public Address</span>
+							<span class="label i18n" id="singlelabelbitcoinaddress">Public Address</span>
 						</div>
 						<div id="qrcode_public" class="qrcode_public"></div>
 						<div class="pubaddress">
@@ -9853,8 +9853,8 @@ Walletgenerator.net use the same security measure as its original. All-in-one ht
 			<div id="paperarea">
 				<div class="commands">
 					<div id="papercommands" class="row">
-						<span><label id="paperlabelencrypt" for="paperencrypt">BIP38 Encrypt?</label> <input type="checkbox" id="paperencrypt" onchange="ninja.wallets.paperwallet.toggleEncrypt(this);" /></span>
-						<span><label id="paperlabelBIPpassphrase" for="paperpassphrase">Passphrase:</label> <input type="text" id="paperpassphrase" /></span>
+						<span><label id="paperlabelencrypt" for="paperencrypt" class="i18n">BIP38 Encrypt?</label> <input type="checkbox" id="paperencrypt" onchange="ninja.wallets.paperwallet.toggleEncrypt(this);" /></span>
+						<span><label id="paperlabelBIPpassphrase" for="paperpassphrase" class="i18n">Passphrase:</label> <input type="text" id="paperpassphrase" /></span>
 
 						
 						<span><input type="button" id="papergenerate" value="Generate" onclick="ninja.wallets.paperwallet.build(document.getElementById('paperpassphrase').value);" /></span>
@@ -9868,9 +9868,9 @@ Walletgenerator.net use the same security measure as its original. All-in-one ht
 			<div id="bulkarea" class="walletarea">
 				<div class="commands">
 					<div id="bulkcommands" class="row">
-						<span><label id="bulklabelstartindex" for="bulkstartindex">Start index:</label> <input type="text" id="bulkstartindex" value="1" /></span>
-						<span><label id="bulklabelrowstogenerate" for="bulklimit">Rows to generate:</label> <input type="text" id="bulklimit" value="3" /></span>
-						<span><label id="bulklabelcompressed" for="bulkcompressed">Compressed addresses?</label> <input type="checkbox" id="bulkcompressed" /></span>
+						<span><label id="bulklabelstartindex" for="bulkstartindex" class="i18n">Start index:</label> <input type="text" id="bulkstartindex" value="1" /></span>
+						<span><label id="bulklabelrowstogenerate" for="bulklimit" class="i18n">Rows to generate:</label> <input type="text" id="bulklimit" value="3" /></span>
+						<span><label id="bulklabelcompressed" for="bulkcompressed" class="i18n">Compressed addresses?</label> <input type="checkbox" id="bulkcompressed" /></span>
 						<span><input type="button" id="bulkgenerate" value="Generate" onclick="ninja.wallets.bulkwallet.buildCSV(document.getElementById('bulklimit').value * 1, document.getElementById('bulkstartindex').value * 1, document.getElementById('bulkcompressed').checked);" /> </span>
 						<span class="print"><input type="button" name="print" id="bulkprint" value="Print" onclick="window.print();" /></span>
 					</div>
@@ -10955,7 +10955,7 @@ ninja.translator = {
 				document.getElementById("culture" + cult).setAttribute("class", "");
 			}
 			document.getElementById("culture" + culture).setAttribute("class", "selected");
-			// apply translations
+			// apply translations for each know id
 			for (var id in dict) {
 				if (document.getElementById(id) && document.getElementById(id).value) {
 					document.getElementById(id).value = dict[id];
@@ -10985,9 +10985,6 @@ ninja.translator = {
         "bip38alertpassphraserequired",
         "detailconfirmsha256",
         "detailalertnotvalidprivatekey",
-        "paperlabelprivatekey",
-        "paperlabelencryptedkey",
-        "paperlabelbitcoinaddress",
 		"securitychecklistrandomOK",
 		"securitychecklistrandomNOK",
 		"securitychecklistofflineNOK",
@@ -12253,21 +12250,21 @@ if (ninja.getQueryString()["i18nextract"]) {
     var i18n = "\"" + culture + "\": {\n";
     for(x=0; x<a.length; x++) {
         i18n += "\t";
-        i18n += "'" + a[x].id + "': '";
+        i18n += "\"" + a[x].id + "\": \"";
         if(ninja.translator.translations[culture] && ninja.translator.translations[culture][a[x].id])
-            i18n += ninja.translator.translations[culture][a[x].id];
+            i18n += cleani18n(ninja.translator.translations[culture][a[x].id]);
         else
-            i18n += "(ENGLISH)" + a[x].innerHTML.replace(/^\s\s*/, '').replace(/\s\s*$/, '');
-        i18n += "',\n";
+            i18n += "(ENGLISH)" + cleani18n(a[x].innerHTML);
+        i18n += "\",\n";
     }
     for(x=0; x<ninja.translator.staticID.length; x++) {
         i18n += "\t";
-        i18n += "'" + ninja.translator.staticID[x] + "': '";
+        i18n += "\"" + ninja.translator.staticID[x] + "\": \"";
         if(ninja.translator.translations[culture] && ninja.translator.translations[culture][ninja.translator.staticID[x]])
-            i18n += ninja.translator.translations[culture][ninja.translator.staticID[x]];
+            i18n += cleani18n(ninja.translator.translations[culture][ninja.translator.staticID[x]]);
         else
-            i18n += "(ENGLISH)" + ninja.translator.translations["en"][ninja.translator.staticID[x]].replace(/^\s\s*/, '').replace(/\s\s*$/, '');
-        i18n += "',\n";
+            i18n += "(ENGLISH)" + cleani18n(ninja.translator.translations["en"][ninja.translator.staticID[x]]);
+        i18n += "\",\n";
     }
     
     i18n += "},"
@@ -12276,6 +12273,11 @@ if (ninja.getQueryString()["i18nextract"]) {
     div.appendChild(elem);
     document.body.appendChild(div);
 }
+function cleani18n(string) {
+    return string.replace(/^\s\s*/, '').replace(/\s\s*$/, '') // remove leading and trailing space
+                .replace(/\s*\n+\s*/g, '\\n') // replace new line
+                .replace(/"/g, '\\"');
+}
 
 ninja.envSecurityCheck();
 ninja.browserSecurityCheck();
diff --git a/l10n/en.js b/l10n/en.js
index 07baa72..47218f9 100644
--- a/l10n/en.js
+++ b/l10n/en.js
@@ -1,15 +1,12 @@
 "en": {
-    "paperlabelbitcoinaddress": "Bitcoin Address:",
-    "paperlabelprivatekey": "Private Key (Wallet Import Format):",
-    "paperlabelencryptedkey": "Encrypted Private Key (Password required)",
     "defaultTitle" : "WalletGenerator.net - Universal Paper wallet generator for Bitcoin and other cryptocurrencies",
     "title" : "Paper Wallet Generator",
     "bulkgeneratingaddresses": "Generating addresses... ",
     "brainalertpassphrasetooshort": "The passphrase you entered is too short.\n\n",
-    "brainalertpassphrasewarning": "Warning: Choosing a strong passphrase is important to avoid brute force attempts to guess your passphrase and steal your bitcoins.",
+    "brainalertpassphrasewarning": "Warning: Choosing a strong passphrase is important to avoid brute force attempts to guess your passphrase and steal your coins.",
     "brainalertpassphrasedoesnotmatch": "The passphrase does not match the confirm passphrase.",
     "detailalertnotvalidprivatekey": "The text you entered is not a valid Private Key",
-    "detailconfirmsha256": "The text you entered is not a valid Private Key!\n\nWould you like to use the entered text as a passphrase and create a Private Key using a SHA256 hash of the passphrase?\n\nWarning: Choosing a strong passphrase is important to avoid brute force attempts to guess your passphrase and steal your bitcoins.",
+    "detailconfirmsha256": "The text you entered is not a valid Private Key!\n\nWould you like to use the entered text as a passphrase and create a Private Key using a SHA256 hash of the passphrase?\n\nWarning: Choosing a strong passphrase is important to avoid brute force attempts to guess your passphrase and steal your coins.",
     "bip38alertincorrectpassphrase": "Incorrect passphrase for this encrypted private key.",
     "bip38alertpassphraserequired": "Passphrase required for BIP38 key",
 	"securitychecklistrandomOK": "Your browser is capable of generating cryptographically random keys using window.crypto.getRandomValues",
diff --git a/src/index.html b/src/index.html
index f8b4d5b..fa5e9a3 100644
--- a/src/index.html
+++ b/src/index.html
@@ -180,7 +180,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 				<div id="keyarea" class="keyarea">
 					<div class="public">
 						<div class="pubaddress">
-							<span class="label" id="singlelabelbitcoinaddress" class="i18n">Public Address</span>
+							<span class="label i18n" id="singlelabelbitcoinaddress">Public Address</span>
 						</div>
 						<div id="qrcode_public" class="qrcode_public"></div>
 						<div class="pubaddress">
@@ -320,8 +320,8 @@ Walletgenerator.net use the same security measure as its original. All-in-one ht
 			<div id="paperarea">
 				<div class="commands">
 					<div id="papercommands" class="row">
-						<span><label id="paperlabelencrypt" for="paperencrypt">BIP38 Encrypt?</label> <input type="checkbox" id="paperencrypt" onchange="ninja.wallets.paperwallet.toggleEncrypt(this);" /></span>
-						<span><label id="paperlabelBIPpassphrase" for="paperpassphrase">Passphrase:</label> <input type="text" id="paperpassphrase" /></span>
+						<span><label id="paperlabelencrypt" for="paperencrypt" class="i18n">BIP38 Encrypt?</label> <input type="checkbox" id="paperencrypt" onchange="ninja.wallets.paperwallet.toggleEncrypt(this);" /></span>
+						<span><label id="paperlabelBIPpassphrase" for="paperpassphrase" class="i18n">Passphrase:</label> <input type="text" id="paperpassphrase" /></span>
 
 						
 						<span><input type="button" id="papergenerate" value="Generate" onclick="ninja.wallets.paperwallet.build(document.getElementById('paperpassphrase').value);" /></span>
@@ -335,9 +335,9 @@ Walletgenerator.net use the same security measure as its original. All-in-one ht
 			<div id="bulkarea" class="walletarea">
 				<div class="commands">
 					<div id="bulkcommands" class="row">
-						<span><label id="bulklabelstartindex" for="bulkstartindex">Start index:</label> <input type="text" id="bulkstartindex" value="1" /></span>
-						<span><label id="bulklabelrowstogenerate" for="bulklimit">Rows to generate:</label> <input type="text" id="bulklimit" value="3" /></span>
-						<span><label id="bulklabelcompressed" for="bulkcompressed">Compressed addresses?</label> <input type="checkbox" id="bulkcompressed" /></span>
+						<span><label id="bulklabelstartindex" for="bulkstartindex" class="i18n">Start index:</label> <input type="text" id="bulkstartindex" value="1" /></span>
+						<span><label id="bulklabelrowstogenerate" for="bulklimit" class="i18n">Rows to generate:</label> <input type="text" id="bulklimit" value="3" /></span>
+						<span><label id="bulklabelcompressed" for="bulkcompressed" class="i18n">Compressed addresses?</label> <input type="checkbox" id="bulkcompressed" /></span>
 						<span><input type="button" id="bulkgenerate" value="Generate" onclick="ninja.wallets.bulkwallet.buildCSV(document.getElementById('bulklimit').value * 1, document.getElementById('bulkstartindex').value * 1, document.getElementById('bulkcompressed').checked);" /> </span>
 						<span class="print"><input type="button" name="print" id="bulkprint" value="Print" onclick="window.print();" /></span>
 					</div>
diff --git a/src/ninja.onload.js b/src/ninja.onload.js
index 930d198..558da72 100644
--- a/src/ninja.onload.js
+++ b/src/ninja.onload.js
@@ -79,21 +79,21 @@ if (ninja.getQueryString()["i18nextract"]) {
     var i18n = "\"" + culture + "\": {\n";
     for(x=0; x<a.length; x++) {
         i18n += "\t";
-        i18n += "'" + a[x].id + "': '";
+        i18n += "\"" + a[x].id + "\": \"";
         if(ninja.translator.translations[culture] && ninja.translator.translations[culture][a[x].id])
-            i18n += ninja.translator.translations[culture][a[x].id];
+            i18n += cleani18n(ninja.translator.translations[culture][a[x].id]);
         else
-            i18n += "(ENGLISH)" + a[x].innerHTML.replace(/^\s\s*/, '').replace(/\s\s*$/, '');
-        i18n += "',\n";
+            i18n += "(ENGLISH)" + cleani18n(a[x].innerHTML);
+        i18n += "\",\n";
     }
     for(x=0; x<ninja.translator.staticID.length; x++) {
         i18n += "\t";
-        i18n += "'" + ninja.translator.staticID[x] + "': '";
+        i18n += "\"" + ninja.translator.staticID[x] + "\": \"";
         if(ninja.translator.translations[culture] && ninja.translator.translations[culture][ninja.translator.staticID[x]])
-            i18n += ninja.translator.translations[culture][ninja.translator.staticID[x]];
+            i18n += cleani18n(ninja.translator.translations[culture][ninja.translator.staticID[x]]);
         else
-            i18n += "(ENGLISH)" + ninja.translator.translations["en"][ninja.translator.staticID[x]].replace(/^\s\s*/, '').replace(/\s\s*$/, '');
-        i18n += "',\n";
+            i18n += "(ENGLISH)" + cleani18n(ninja.translator.translations["en"][ninja.translator.staticID[x]]);
+        i18n += "\",\n";
     }
     
     i18n += "},"
@@ -102,6 +102,11 @@ if (ninja.getQueryString()["i18nextract"]) {
     div.appendChild(elem);
     document.body.appendChild(div);
 }
+function cleani18n(string) {
+    return string.replace(/^\s\s*/, '').replace(/\s\s*$/, '') // remove leading and trailing space
+                .replace(/\s*\n+\s*/g, '\\n') // replace new line
+                .replace(/"/g, '\\"');
+}
 
 ninja.envSecurityCheck();
 ninja.browserSecurityCheck();
diff --git a/src/ninja.translator.js b/src/ninja.translator.js
index 84bcaf6..9525dcb 100644
--- a/src/ninja.translator.js
+++ b/src/ninja.translator.js
@@ -22,7 +22,7 @@ ninja.translator = {
 				document.getElementById("culture" + cult).setAttribute("class", "");
 			}
 			document.getElementById("culture" + culture).setAttribute("class", "selected");
-			// apply translations
+			// apply translations for each know id
 			for (var id in dict) {
 				if (document.getElementById(id) && document.getElementById(id).value) {
 					document.getElementById(id).value = dict[id];
@@ -52,9 +52,6 @@ ninja.translator = {
         "bip38alertpassphraserequired",
         "detailconfirmsha256",
         "detailalertnotvalidprivatekey",
-        "paperlabelprivatekey",
-        "paperlabelencryptedkey",
-        "paperlabelbitcoinaddress",
 		"securitychecklistrandomOK",
 		"securitychecklistrandomNOK",
 		"securitychecklistofflineNOK",
@@ -65,6 +62,5 @@ ninja.translator = {
 	translations: {
     //en.js
     //fr.js
-
 	}
 };