From 89815175a0c084f27eb5e150f59c458a74774242 Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Thu, 22 Feb 2018 11:49:13 +0100 Subject: [PATCH] more i18n/spacing fixes --- node_modules/pogen/pogen.js | 6 ++ src/i18n.tsx | 1 + src/i18n/de.po | 34 +++---- src/i18n/en-US.po | 34 +++---- src/i18n/fr.po | 34 +++---- src/i18n/it.po | 34 +++---- src/i18n/strings.ts | 136 +++++++++++++-------------- src/i18n/sv.po | 42 ++++----- src/i18n/taler-wallet-webex.pot | 34 +++---- src/webex/pages/confirm-contract.tsx | 5 +- tooling/pogen/pogen.js | 6 ++ tooling/pogen/pogen.ts | 6 ++ 12 files changed, 195 insertions(+), 177 deletions(-) diff --git a/node_modules/pogen/pogen.js b/node_modules/pogen/pogen.js index ed634ef0d..203ed442c 100644 --- a/node_modules/pogen/pogen.js +++ b/node_modules/pogen/pogen.js @@ -190,6 +190,12 @@ function processFile(sourceFile) { var e = childNode; var s = e.getFullText(); var t = s.split("\n").map(trim).join(" "); + if (s[0] === " ") { + t = " " + t; + } + if (s[s.length - 1] === " ") { + t = t + " "; + } fragments.push(t); } case ts.SyntaxKind.JsxOpeningElement: diff --git a/src/i18n.tsx b/src/i18n.tsx index 73fab27a4..dfd1528e3 100644 --- a/src/i18n.tsx +++ b/src/i18n.tsx @@ -44,6 +44,7 @@ if (!strings[lang]) { const jed = new jedLib.Jed(strings[lang]); + /** * Convert template strings to a msgid */ diff --git a/src/i18n/de.po b/src/i18n/de.po index 172f8f118..a57ecf7fa 100644 --- a/src/i18n/de.po +++ b/src/i18n/de.po @@ -95,17 +95,17 @@ msgstr "Bezahlung bestätigen" #: src/webex/pages/confirm-contract.tsx:372 #, fuzzy, c-format -msgid "The merchant%1$soffers you to purchase:" +msgid "The merchant %1$s offers you to purchase:" msgstr "Der Händler %1$s möchte einen Vertrag über %2$s mit Ihnen abschließen." #: src/webex/pages/confirm-contract.tsx:381 #, c-format -msgid "The total price is%1$s (plus%2$sfees)." +msgid "The total price is %1$s (plus %2$s fees)." msgstr "" -#: src/webex/pages/confirm-contract.tsx:385 +#: src/webex/pages/confirm-contract.tsx:384 #, c-format -msgid "The total price is%1$s." +msgid "The total price is %1$s." msgstr "" #: src/webex/pages/confirm-create-reserve.tsx:128 @@ -144,7 +144,7 @@ msgstr "" #: src/webex/pages/confirm-create-reserve.tsx:231 #, c-format msgid "" -"Using exchange provider%1$s. The exchange provider will charge %2$s in fees." +"Using exchange provider %1$s. The exchange provider will charge %2$s in fees." msgstr "" #: src/webex/pages/confirm-create-reserve.tsx:243 @@ -162,16 +162,16 @@ msgstr "" #: src/webex/pages/confirm-create-reserve.tsx:279 #, c-format msgid "" -"Your wallet (protocol version%1$s) might be outdated.%2$s The exchange has a " -"higher, incompatible protocol version (%3$s)." +"Your wallet (protocol version %1$s) might be outdated.%2$s The exchange has " +"a higher, incompatible protocol version (%3$s)." msgstr "" #: src/webex/pages/confirm-create-reserve.tsx:290 #, c-format msgid "" -"The chosen exchange (protocol version%1$smight be outdated.%2$s The exchange " -"has a lower, incompatible protocol version than your wallet (protocol version" -"%3$s)." +"The chosen exchange (protocol version %1$s might be outdated.%2$s The " +"exchange has a lower, incompatible protocol version than your wallet " +"(protocol version %3$s)." msgstr "" #: src/webex/pages/confirm-create-reserve.tsx:309 @@ -194,7 +194,7 @@ msgstr "" #: src/webex/pages/confirm-create-reserve.tsx:341 #: src/webex/pages/confirm-create-reserve.tsx:353 #, c-format -msgid "Select%1$s" +msgid "Select %1$s" msgstr "" #: src/webex/pages/confirm-create-reserve.tsx:370 @@ -292,12 +292,12 @@ msgstr "Bank bestätig anlegen der Reserve (%1$s) bei %2$s" #: src/webex/pages/popup.tsx:361 #, fuzzy, c-format -msgid "Started to withdraw %1$s from%2$s(%3$s)." +msgid "Started to withdraw %1$s from %2$s (%3$s)." msgstr "Reserve (%1$s) mit %2$s bei %3$s erzeugt" #: src/webex/pages/popup.tsx:370 #, fuzzy, c-format -msgid "Merchant%1$soffered contract%2$s." +msgid "Merchant %1$s offered contract %2$s." msgstr "" "%1$s\n" " möchte einen Vertrag über %2$s\n" @@ -305,17 +305,17 @@ msgstr "" #: src/webex/pages/popup.tsx:381 #, fuzzy, c-format -msgid "Withdrew%1$sfrom%2$s(%3$s)." +msgid "Withdrew %1$s from %2$s (%3$s)." msgstr "Reserve (%1$s) mit %2$s bei %3$s erzeugt" #: src/webex/pages/popup.tsx:391 #, fuzzy, c-format -msgid "Paid%1$sto merchant%2$s. %3$s (%4$s)" +msgid "Paid %1$s to merchant %2$s. %3$s (%4$s)" msgstr "Reserve (%1$s) mit %2$s bei %3$s erzeugt" #: src/webex/pages/popup.tsx:401 #, fuzzy, c-format -msgid "Merchant%1$sgave a refund over%2$s." +msgid "Merchant %1$s gave a refund over %2$s." msgstr "" "%1$s\n" " möchte einen Vertrag über %2$s\n" @@ -328,7 +328,7 @@ msgstr "" #: src/webex/pages/popup.tsx:414 #, fuzzy, c-format -msgid "Merchant%1$sgave a%2$sof%3$s." +msgid "Merchant %1$s gave a %2$s of %3$s." msgstr "" "%1$s\n" " möchte einen Vertrag über %2$s\n" diff --git a/src/i18n/en-US.po b/src/i18n/en-US.po index 5ca2bea75..098a07207 100644 --- a/src/i18n/en-US.po +++ b/src/i18n/en-US.po @@ -95,17 +95,17 @@ msgstr "" #: src/webex/pages/confirm-contract.tsx:372 #, c-format -msgid "The merchant%1$soffers you to purchase:" +msgid "The merchant %1$s offers you to purchase:" msgstr "" #: src/webex/pages/confirm-contract.tsx:381 #, c-format -msgid "The total price is%1$s (plus%2$sfees)." +msgid "The total price is %1$s (plus %2$s fees)." msgstr "" -#: src/webex/pages/confirm-contract.tsx:385 +#: src/webex/pages/confirm-contract.tsx:384 #, c-format -msgid "The total price is%1$s." +msgid "The total price is %1$s." msgstr "" #: src/webex/pages/confirm-create-reserve.tsx:128 @@ -144,7 +144,7 @@ msgstr "" #: src/webex/pages/confirm-create-reserve.tsx:231 #, c-format msgid "" -"Using exchange provider%1$s. The exchange provider will charge %2$s in fees." +"Using exchange provider %1$s. The exchange provider will charge %2$s in fees." msgstr "" #: src/webex/pages/confirm-create-reserve.tsx:243 @@ -162,16 +162,16 @@ msgstr "" #: src/webex/pages/confirm-create-reserve.tsx:279 #, c-format msgid "" -"Your wallet (protocol version%1$s) might be outdated.%2$s The exchange has a " -"higher, incompatible protocol version (%3$s)." +"Your wallet (protocol version %1$s) might be outdated.%2$s The exchange has " +"a higher, incompatible protocol version (%3$s)." msgstr "" #: src/webex/pages/confirm-create-reserve.tsx:290 #, c-format msgid "" -"The chosen exchange (protocol version%1$smight be outdated.%2$s The exchange " -"has a lower, incompatible protocol version than your wallet (protocol version" -"%3$s)." +"The chosen exchange (protocol version %1$s might be outdated.%2$s The " +"exchange has a lower, incompatible protocol version than your wallet " +"(protocol version %3$s)." msgstr "" #: src/webex/pages/confirm-create-reserve.tsx:309 @@ -194,7 +194,7 @@ msgstr "" #: src/webex/pages/confirm-create-reserve.tsx:341 #: src/webex/pages/confirm-create-reserve.tsx:353 #, c-format -msgid "Select%1$s" +msgid "Select %1$s" msgstr "" #: src/webex/pages/confirm-create-reserve.tsx:370 @@ -292,27 +292,27 @@ msgstr "" #: src/webex/pages/popup.tsx:361 #, c-format -msgid "Started to withdraw %1$s from%2$s(%3$s)." +msgid "Started to withdraw %1$s from %2$s (%3$s)." msgstr "" #: src/webex/pages/popup.tsx:370 #, c-format -msgid "Merchant%1$soffered contract%2$s." +msgid "Merchant %1$s offered contract %2$s." msgstr "" #: src/webex/pages/popup.tsx:381 #, c-format -msgid "Withdrew%1$sfrom%2$s(%3$s)." +msgid "Withdrew %1$s from %2$s (%3$s)." msgstr "" #: src/webex/pages/popup.tsx:391 #, c-format -msgid "Paid%1$sto merchant%2$s. %3$s (%4$s)" +msgid "Paid %1$s to merchant %2$s. %3$s (%4$s)" msgstr "" #: src/webex/pages/popup.tsx:401 #, c-format -msgid "Merchant%1$sgave a refund over%2$s." +msgid "Merchant %1$s gave a refund over %2$s." msgstr "" #: src/webex/pages/popup.tsx:411 @@ -322,7 +322,7 @@ msgstr "" #: src/webex/pages/popup.tsx:414 #, c-format -msgid "Merchant%1$sgave a%2$sof%3$s." +msgid "Merchant %1$s gave a %2$s of %3$s." msgstr "" #: src/webex/pages/popup.tsx:419 diff --git a/src/i18n/fr.po b/src/i18n/fr.po index 38f817fae..93fef374d 100644 --- a/src/i18n/fr.po +++ b/src/i18n/fr.po @@ -95,17 +95,17 @@ msgstr "" #: src/webex/pages/confirm-contract.tsx:372 #, c-format -msgid "The merchant%1$soffers you to purchase:" +msgid "The merchant %1$s offers you to purchase:" msgstr "" #: src/webex/pages/confirm-contract.tsx:381 #, c-format -msgid "The total price is%1$s (plus%2$sfees)." +msgid "The total price is %1$s (plus %2$s fees)." msgstr "" -#: src/webex/pages/confirm-contract.tsx:385 +#: src/webex/pages/confirm-contract.tsx:384 #, c-format -msgid "The total price is%1$s." +msgid "The total price is %1$s." msgstr "" #: src/webex/pages/confirm-create-reserve.tsx:128 @@ -144,7 +144,7 @@ msgstr "" #: src/webex/pages/confirm-create-reserve.tsx:231 #, c-format msgid "" -"Using exchange provider%1$s. The exchange provider will charge %2$s in fees." +"Using exchange provider %1$s. The exchange provider will charge %2$s in fees." msgstr "" #: src/webex/pages/confirm-create-reserve.tsx:243 @@ -162,16 +162,16 @@ msgstr "" #: src/webex/pages/confirm-create-reserve.tsx:279 #, c-format msgid "" -"Your wallet (protocol version%1$s) might be outdated.%2$s The exchange has a " -"higher, incompatible protocol version (%3$s)." +"Your wallet (protocol version %1$s) might be outdated.%2$s The exchange has " +"a higher, incompatible protocol version (%3$s)." msgstr "" #: src/webex/pages/confirm-create-reserve.tsx:290 #, c-format msgid "" -"The chosen exchange (protocol version%1$smight be outdated.%2$s The exchange " -"has a lower, incompatible protocol version than your wallet (protocol version" -"%3$s)." +"The chosen exchange (protocol version %1$s might be outdated.%2$s The " +"exchange has a lower, incompatible protocol version than your wallet " +"(protocol version %3$s)." msgstr "" #: src/webex/pages/confirm-create-reserve.tsx:309 @@ -194,7 +194,7 @@ msgstr "" #: src/webex/pages/confirm-create-reserve.tsx:341 #: src/webex/pages/confirm-create-reserve.tsx:353 #, c-format -msgid "Select%1$s" +msgid "Select %1$s" msgstr "" #: src/webex/pages/confirm-create-reserve.tsx:370 @@ -292,27 +292,27 @@ msgstr "" #: src/webex/pages/popup.tsx:361 #, c-format -msgid "Started to withdraw %1$s from%2$s(%3$s)." +msgid "Started to withdraw %1$s from %2$s (%3$s)." msgstr "" #: src/webex/pages/popup.tsx:370 #, c-format -msgid "Merchant%1$soffered contract%2$s." +msgid "Merchant %1$s offered contract %2$s." msgstr "" #: src/webex/pages/popup.tsx:381 #, c-format -msgid "Withdrew%1$sfrom%2$s(%3$s)." +msgid "Withdrew %1$s from %2$s (%3$s)." msgstr "" #: src/webex/pages/popup.tsx:391 #, c-format -msgid "Paid%1$sto merchant%2$s. %3$s (%4$s)" +msgid "Paid %1$s to merchant %2$s. %3$s (%4$s)" msgstr "" #: src/webex/pages/popup.tsx:401 #, c-format -msgid "Merchant%1$sgave a refund over%2$s." +msgid "Merchant %1$s gave a refund over %2$s." msgstr "" #: src/webex/pages/popup.tsx:411 @@ -322,7 +322,7 @@ msgstr "" #: src/webex/pages/popup.tsx:414 #, c-format -msgid "Merchant%1$sgave a%2$sof%3$s." +msgid "Merchant %1$s gave a %2$s of %3$s." msgstr "" #: src/webex/pages/popup.tsx:419 diff --git a/src/i18n/it.po b/src/i18n/it.po index 38f817fae..93fef374d 100644 --- a/src/i18n/it.po +++ b/src/i18n/it.po @@ -95,17 +95,17 @@ msgstr "" #: src/webex/pages/confirm-contract.tsx:372 #, c-format -msgid "The merchant%1$soffers you to purchase:" +msgid "The merchant %1$s offers you to purchase:" msgstr "" #: src/webex/pages/confirm-contract.tsx:381 #, c-format -msgid "The total price is%1$s (plus%2$sfees)." +msgid "The total price is %1$s (plus %2$s fees)." msgstr "" -#: src/webex/pages/confirm-contract.tsx:385 +#: src/webex/pages/confirm-contract.tsx:384 #, c-format -msgid "The total price is%1$s." +msgid "The total price is %1$s." msgstr "" #: src/webex/pages/confirm-create-reserve.tsx:128 @@ -144,7 +144,7 @@ msgstr "" #: src/webex/pages/confirm-create-reserve.tsx:231 #, c-format msgid "" -"Using exchange provider%1$s. The exchange provider will charge %2$s in fees." +"Using exchange provider %1$s. The exchange provider will charge %2$s in fees." msgstr "" #: src/webex/pages/confirm-create-reserve.tsx:243 @@ -162,16 +162,16 @@ msgstr "" #: src/webex/pages/confirm-create-reserve.tsx:279 #, c-format msgid "" -"Your wallet (protocol version%1$s) might be outdated.%2$s The exchange has a " -"higher, incompatible protocol version (%3$s)." +"Your wallet (protocol version %1$s) might be outdated.%2$s The exchange has " +"a higher, incompatible protocol version (%3$s)." msgstr "" #: src/webex/pages/confirm-create-reserve.tsx:290 #, c-format msgid "" -"The chosen exchange (protocol version%1$smight be outdated.%2$s The exchange " -"has a lower, incompatible protocol version than your wallet (protocol version" -"%3$s)." +"The chosen exchange (protocol version %1$s might be outdated.%2$s The " +"exchange has a lower, incompatible protocol version than your wallet " +"(protocol version %3$s)." msgstr "" #: src/webex/pages/confirm-create-reserve.tsx:309 @@ -194,7 +194,7 @@ msgstr "" #: src/webex/pages/confirm-create-reserve.tsx:341 #: src/webex/pages/confirm-create-reserve.tsx:353 #, c-format -msgid "Select%1$s" +msgid "Select %1$s" msgstr "" #: src/webex/pages/confirm-create-reserve.tsx:370 @@ -292,27 +292,27 @@ msgstr "" #: src/webex/pages/popup.tsx:361 #, c-format -msgid "Started to withdraw %1$s from%2$s(%3$s)." +msgid "Started to withdraw %1$s from %2$s (%3$s)." msgstr "" #: src/webex/pages/popup.tsx:370 #, c-format -msgid "Merchant%1$soffered contract%2$s." +msgid "Merchant %1$s offered contract %2$s." msgstr "" #: src/webex/pages/popup.tsx:381 #, c-format -msgid "Withdrew%1$sfrom%2$s(%3$s)." +msgid "Withdrew %1$s from %2$s (%3$s)." msgstr "" #: src/webex/pages/popup.tsx:391 #, c-format -msgid "Paid%1$sto merchant%2$s. %3$s (%4$s)" +msgid "Paid %1$s to merchant %2$s. %3$s (%4$s)" msgstr "" #: src/webex/pages/popup.tsx:401 #, c-format -msgid "Merchant%1$sgave a refund over%2$s." +msgid "Merchant %1$s gave a refund over %2$s." msgstr "" #: src/webex/pages/popup.tsx:411 @@ -322,7 +322,7 @@ msgstr "" #: src/webex/pages/popup.tsx:414 #, c-format -msgid "Merchant%1$sgave a%2$sof%3$s." +msgid "Merchant %1$s gave a %2$s of %3$s." msgstr "" #: src/webex/pages/popup.tsx:419 diff --git a/src/i18n/strings.ts b/src/i18n/strings.ts index 5c3daf300..b0d2208d4 100644 --- a/src/i18n/strings.ts +++ b/src/i18n/strings.ts @@ -60,13 +60,13 @@ strings['de'] = { "Abort Payment": [ "Bezahlung bestätigen" ], - "The merchant%1$soffers you to purchase:": [ + "The merchant %1$s offers you to purchase:": [ "Der Händler %1$s möchte einen Vertrag über %2$s mit Ihnen abschließen." ], - "The total price is%1$s (plus%2$sfees).": [ + "The total price is %1$s (plus %2$s fees).": [ "" ], - "The total price is%1$s.": [ + "The total price is %1$s.": [ "" ], "Select": [ @@ -87,7 +87,7 @@ strings['de'] = { "Warning: The exchange is neither directly trusted nor audited by a trusted auditor. If you withdraw from this exchange, it will be trusted in the future.": [ "" ], - "Using exchange provider%1$s. The exchange provider will charge %2$s in fees.": [ + "Using exchange provider %1$s. The exchange provider will charge %2$s in fees.": [ "" ], "Waiting for a response from %1$s %2$s": [ @@ -96,10 +96,10 @@ strings['de'] = { "Information about fees will be available when an exchange provider is selected.": [ "" ], - "Your wallet (protocol version%1$s) might be outdated.%2$s The exchange has a higher, incompatible protocol version (%3$s).": [ + "Your wallet (protocol version %1$s) might be outdated.%2$s The exchange has a higher, incompatible protocol version (%3$s).": [ "" ], - "The chosen exchange (protocol version%1$smight be outdated.%2$s The exchange has a lower, incompatible protocol version than your wallet (protocol version%3$s).": [ + "The chosen exchange (protocol version %1$s might be outdated.%2$s The exchange has a lower, incompatible protocol version than your wallet (protocol version %3$s).": [ "" ], "Accept fees and withdraw": [ @@ -111,7 +111,7 @@ strings['de'] = { "Please select an exchange. You can review the details before after your selection.": [ "" ], - "Select%1$s": [ + "Select %1$s": [ "" ], "You are about to withdraw %1$s from your bank account into your wallet.": [ @@ -168,25 +168,25 @@ strings['de'] = { "Bank requested reserve (%1$s) for %2$s.": [ "Bank bestätig anlegen der Reserve (%1$s) bei %2$s" ], - "Started to withdraw %1$s from%2$s(%3$s).": [ + "Started to withdraw %1$s from %2$s (%3$s).": [ "Reserve (%1$s) mit %2$s bei %3$s erzeugt" ], - "Merchant%1$soffered contract%2$s.": [ + "Merchant %1$s offered contract %2$s.": [ "%1$s\n möchte einen Vertrag über %2$s\n mit Ihnen abschließen." ], - "Withdrew%1$sfrom%2$s(%3$s).": [ + "Withdrew %1$s from %2$s (%3$s).": [ "Reserve (%1$s) mit %2$s bei %3$s erzeugt" ], - "Paid%1$sto merchant%2$s. %3$s (%4$s)": [ + "Paid %1$s to merchant %2$s. %3$s (%4$s)": [ "Reserve (%1$s) mit %2$s bei %3$s erzeugt" ], - "Merchant%1$sgave a refund over%2$s.": [ + "Merchant %1$s gave a refund over %2$s.": [ "%1$s\n möchte einen Vertrag über %2$s\n mit Ihnen abschließen." ], "tip": [ "" ], - "Merchant%1$sgave a%2$sof%3$s.": [ + "Merchant %1$s gave a %2$s of %3$s.": [ "%1$s\n möchte einen Vertrag über %2$s\n mit Ihnen abschließen." ], "You did not accept the tip yet.": [ @@ -294,13 +294,13 @@ strings['en-US'] = { "Abort Payment": [ "" ], - "The merchant%1$soffers you to purchase:": [ + "The merchant %1$s offers you to purchase:": [ "" ], - "The total price is%1$s (plus%2$sfees).": [ + "The total price is %1$s (plus %2$s fees).": [ "" ], - "The total price is%1$s.": [ + "The total price is %1$s.": [ "" ], "Select": [ @@ -321,7 +321,7 @@ strings['en-US'] = { "Warning: The exchange is neither directly trusted nor audited by a trusted auditor. If you withdraw from this exchange, it will be trusted in the future.": [ "" ], - "Using exchange provider%1$s. The exchange provider will charge %2$s in fees.": [ + "Using exchange provider %1$s. The exchange provider will charge %2$s in fees.": [ "" ], "Waiting for a response from %1$s %2$s": [ @@ -330,10 +330,10 @@ strings['en-US'] = { "Information about fees will be available when an exchange provider is selected.": [ "" ], - "Your wallet (protocol version%1$s) might be outdated.%2$s The exchange has a higher, incompatible protocol version (%3$s).": [ + "Your wallet (protocol version %1$s) might be outdated.%2$s The exchange has a higher, incompatible protocol version (%3$s).": [ "" ], - "The chosen exchange (protocol version%1$smight be outdated.%2$s The exchange has a lower, incompatible protocol version than your wallet (protocol version%3$s).": [ + "The chosen exchange (protocol version %1$s might be outdated.%2$s The exchange has a lower, incompatible protocol version than your wallet (protocol version %3$s).": [ "" ], "Accept fees and withdraw": [ @@ -345,7 +345,7 @@ strings['en-US'] = { "Please select an exchange. You can review the details before after your selection.": [ "" ], - "Select%1$s": [ + "Select %1$s": [ "" ], "You are about to withdraw %1$s from your bank account into your wallet.": [ @@ -402,25 +402,25 @@ strings['en-US'] = { "Bank requested reserve (%1$s) for %2$s.": [ "" ], - "Started to withdraw %1$s from%2$s(%3$s).": [ + "Started to withdraw %1$s from %2$s (%3$s).": [ "" ], - "Merchant%1$soffered contract%2$s.": [ + "Merchant %1$s offered contract %2$s.": [ "" ], - "Withdrew%1$sfrom%2$s(%3$s).": [ + "Withdrew %1$s from %2$s (%3$s).": [ "" ], - "Paid%1$sto merchant%2$s. %3$s (%4$s)": [ + "Paid %1$s to merchant %2$s. %3$s (%4$s)": [ "" ], - "Merchant%1$sgave a refund over%2$s.": [ + "Merchant %1$s gave a refund over %2$s.": [ "" ], "tip": [ "" ], - "Merchant%1$sgave a%2$sof%3$s.": [ + "Merchant %1$s gave a %2$s of %3$s.": [ "" ], "You did not accept the tip yet.": [ @@ -528,13 +528,13 @@ strings['fr'] = { "Abort Payment": [ "" ], - "The merchant%1$soffers you to purchase:": [ + "The merchant %1$s offers you to purchase:": [ "" ], - "The total price is%1$s (plus%2$sfees).": [ + "The total price is %1$s (plus %2$s fees).": [ "" ], - "The total price is%1$s.": [ + "The total price is %1$s.": [ "" ], "Select": [ @@ -555,7 +555,7 @@ strings['fr'] = { "Warning: The exchange is neither directly trusted nor audited by a trusted auditor. If you withdraw from this exchange, it will be trusted in the future.": [ "" ], - "Using exchange provider%1$s. The exchange provider will charge %2$s in fees.": [ + "Using exchange provider %1$s. The exchange provider will charge %2$s in fees.": [ "" ], "Waiting for a response from %1$s %2$s": [ @@ -564,10 +564,10 @@ strings['fr'] = { "Information about fees will be available when an exchange provider is selected.": [ "" ], - "Your wallet (protocol version%1$s) might be outdated.%2$s The exchange has a higher, incompatible protocol version (%3$s).": [ + "Your wallet (protocol version %1$s) might be outdated.%2$s The exchange has a higher, incompatible protocol version (%3$s).": [ "" ], - "The chosen exchange (protocol version%1$smight be outdated.%2$s The exchange has a lower, incompatible protocol version than your wallet (protocol version%3$s).": [ + "The chosen exchange (protocol version %1$s might be outdated.%2$s The exchange has a lower, incompatible protocol version than your wallet (protocol version %3$s).": [ "" ], "Accept fees and withdraw": [ @@ -579,7 +579,7 @@ strings['fr'] = { "Please select an exchange. You can review the details before after your selection.": [ "" ], - "Select%1$s": [ + "Select %1$s": [ "" ], "You are about to withdraw %1$s from your bank account into your wallet.": [ @@ -636,25 +636,25 @@ strings['fr'] = { "Bank requested reserve (%1$s) for %2$s.": [ "" ], - "Started to withdraw %1$s from%2$s(%3$s).": [ + "Started to withdraw %1$s from %2$s (%3$s).": [ "" ], - "Merchant%1$soffered contract%2$s.": [ + "Merchant %1$s offered contract %2$s.": [ "" ], - "Withdrew%1$sfrom%2$s(%3$s).": [ + "Withdrew %1$s from %2$s (%3$s).": [ "" ], - "Paid%1$sto merchant%2$s. %3$s (%4$s)": [ + "Paid %1$s to merchant %2$s. %3$s (%4$s)": [ "" ], - "Merchant%1$sgave a refund over%2$s.": [ + "Merchant %1$s gave a refund over %2$s.": [ "" ], "tip": [ "" ], - "Merchant%1$sgave a%2$sof%3$s.": [ + "Merchant %1$s gave a %2$s of %3$s.": [ "" ], "You did not accept the tip yet.": [ @@ -762,13 +762,13 @@ strings['it'] = { "Abort Payment": [ "" ], - "The merchant%1$soffers you to purchase:": [ + "The merchant %1$s offers you to purchase:": [ "" ], - "The total price is%1$s (plus%2$sfees).": [ + "The total price is %1$s (plus %2$s fees).": [ "" ], - "The total price is%1$s.": [ + "The total price is %1$s.": [ "" ], "Select": [ @@ -789,7 +789,7 @@ strings['it'] = { "Warning: The exchange is neither directly trusted nor audited by a trusted auditor. If you withdraw from this exchange, it will be trusted in the future.": [ "" ], - "Using exchange provider%1$s. The exchange provider will charge %2$s in fees.": [ + "Using exchange provider %1$s. The exchange provider will charge %2$s in fees.": [ "" ], "Waiting for a response from %1$s %2$s": [ @@ -798,10 +798,10 @@ strings['it'] = { "Information about fees will be available when an exchange provider is selected.": [ "" ], - "Your wallet (protocol version%1$s) might be outdated.%2$s The exchange has a higher, incompatible protocol version (%3$s).": [ + "Your wallet (protocol version %1$s) might be outdated.%2$s The exchange has a higher, incompatible protocol version (%3$s).": [ "" ], - "The chosen exchange (protocol version%1$smight be outdated.%2$s The exchange has a lower, incompatible protocol version than your wallet (protocol version%3$s).": [ + "The chosen exchange (protocol version %1$s might be outdated.%2$s The exchange has a lower, incompatible protocol version than your wallet (protocol version %3$s).": [ "" ], "Accept fees and withdraw": [ @@ -813,7 +813,7 @@ strings['it'] = { "Please select an exchange. You can review the details before after your selection.": [ "" ], - "Select%1$s": [ + "Select %1$s": [ "" ], "You are about to withdraw %1$s from your bank account into your wallet.": [ @@ -870,25 +870,25 @@ strings['it'] = { "Bank requested reserve (%1$s) for %2$s.": [ "" ], - "Started to withdraw %1$s from%2$s(%3$s).": [ + "Started to withdraw %1$s from %2$s (%3$s).": [ "" ], - "Merchant%1$soffered contract%2$s.": [ + "Merchant %1$s offered contract %2$s.": [ "" ], - "Withdrew%1$sfrom%2$s(%3$s).": [ + "Withdrew %1$s from %2$s (%3$s).": [ "" ], - "Paid%1$sto merchant%2$s. %3$s (%4$s)": [ + "Paid %1$s to merchant %2$s. %3$s (%4$s)": [ "" ], - "Merchant%1$sgave a refund over%2$s.": [ + "Merchant %1$s gave a refund over %2$s.": [ "" ], "tip": [ "" ], - "Merchant%1$sgave a%2$sof%3$s.": [ + "Merchant %1$s gave a %2$s of %3$s.": [ "" ], "You did not accept the tip yet.": [ @@ -996,13 +996,13 @@ strings['sv'] = { "Abort Payment": [ "" ], - "The merchant%1$soffers you to purchase:": [ - "Säljaren %1$serbjuder följande:" + "The merchant %1$s offers you to purchase:": [ + "Säljaren %1$s erbjuder följande:" ], - "The total price is%1$s (plus%2$sfees).": [ - "Det totala priset är %1$s(plus %2$savgifter).\n" + "The total price is %1$s (plus %2$s fees).": [ + "Det totala priset är %1$s (plus %2$s avgifter).\n" ], - "The total price is%1$s.": [ + "The total price is %1$s.": [ "Det totala priset är %1$s." ], "Select": [ @@ -1023,7 +1023,7 @@ strings['sv'] = { "Warning: The exchange is neither directly trusted nor audited by a trusted auditor. If you withdraw from this exchange, it will be trusted in the future.": [ "" ], - "Using exchange provider%1$s. The exchange provider will charge %2$s in fees.": [ + "Using exchange provider %1$s. The exchange provider will charge %2$s in fees.": [ "" ], "Waiting for a response from %1$s %2$s": [ @@ -1032,10 +1032,10 @@ strings['sv'] = { "Information about fees will be available when an exchange provider is selected.": [ "" ], - "Your wallet (protocol version%1$s) might be outdated.%2$s The exchange has a higher, incompatible protocol version (%3$s).": [ - "" + "Your wallet (protocol version %1$s) might be outdated.%2$s The exchange has a higher, incompatible protocol version (%3$s).": [ + "tjänsteleverantörer plånboken" ], - "The chosen exchange (protocol version%1$smight be outdated.%2$s The exchange has a lower, incompatible protocol version than your wallet (protocol version%3$s).": [ + "The chosen exchange (protocol version %1$s might be outdated.%2$s The exchange has a lower, incompatible protocol version than your wallet (protocol version %3$s).": [ "tjänsteleverantörer plånboken" ], "Accept fees and withdraw": [ @@ -1047,7 +1047,7 @@ strings['sv'] = { "Please select an exchange. You can review the details before after your selection.": [ "" ], - "Select%1$s": [ + "Select %1$s": [ "Välj %1$s" ], "You are about to withdraw %1$s from your bank account into your wallet.": [ @@ -1104,25 +1104,25 @@ strings['sv'] = { "Bank requested reserve (%1$s) for %2$s.": [ "" ], - "Started to withdraw %1$s from%2$s(%3$s).": [ + "Started to withdraw %1$s from %2$s (%3$s).": [ "" ], - "Merchant%1$soffered contract%2$s.": [ + "Merchant %1$s offered contract %2$s.": [ "Säljaren %1$s erbjöd kontrakt %2$s.\n" ], - "Withdrew%1$sfrom%2$s(%3$s).": [ + "Withdrew %1$s from %2$s (%3$s).": [ "" ], - "Paid%1$sto merchant%2$s. %3$s (%4$s)": [ + "Paid %1$s to merchant %2$s. %3$s (%4$s)": [ "" ], - "Merchant%1$sgave a refund over%2$s.": [ + "Merchant %1$s gave a refund over %2$s.": [ "Säljaren %1$sgav en återbetalning på %2$s.\n" ], "tip": [ "" ], - "Merchant%1$sgave a%2$sof%3$s.": [ + "Merchant %1$s gave a %2$s of %3$s.": [ "Säljaren %1$sgav en återbetalning på %2$s.\n" ], "You did not accept the tip yet.": [ diff --git a/src/i18n/sv.po b/src/i18n/sv.po index 4796ff2a4..daec2f839 100644 --- a/src/i18n/sv.po +++ b/src/i18n/sv.po @@ -97,17 +97,17 @@ msgstr "" #: src/webex/pages/confirm-contract.tsx:372 #, fuzzy, c-format -msgid "The merchant%1$soffers you to purchase:" -msgstr "Säljaren %1$serbjuder följande:" +msgid "The merchant %1$s offers you to purchase:" +msgstr "Säljaren %1$s erbjuder följande:" #: src/webex/pages/confirm-contract.tsx:381 #, fuzzy, c-format -msgid "The total price is%1$s (plus%2$sfees)." -msgstr "Det totala priset är %1$s(plus %2$savgifter).\n" +msgid "The total price is %1$s (plus %2$s fees)." +msgstr "Det totala priset är %1$s (plus %2$s avgifter).\n" -#: src/webex/pages/confirm-contract.tsx:385 +#: src/webex/pages/confirm-contract.tsx:384 #, fuzzy, c-format -msgid "The total price is%1$s." +msgid "The total price is %1$s." msgstr "Det totala priset är %1$s." #: src/webex/pages/confirm-create-reserve.tsx:128 @@ -146,7 +146,7 @@ msgstr "" #: src/webex/pages/confirm-create-reserve.tsx:231 #, c-format msgid "" -"Using exchange provider%1$s. The exchange provider will charge %2$s in fees." +"Using exchange provider %1$s. The exchange provider will charge %2$s in fees." msgstr "" #: src/webex/pages/confirm-create-reserve.tsx:243 @@ -162,18 +162,18 @@ msgid "" msgstr "" #: src/webex/pages/confirm-create-reserve.tsx:279 -#, c-format +#, fuzzy, c-format msgid "" -"Your wallet (protocol version%1$s) might be outdated.%2$s The exchange has a " -"higher, incompatible protocol version (%3$s)." -msgstr "" +"Your wallet (protocol version %1$s) might be outdated.%2$s The exchange has " +"a higher, incompatible protocol version (%3$s)." +msgstr "tjänsteleverantörer plånboken" #: src/webex/pages/confirm-create-reserve.tsx:290 #, fuzzy, c-format msgid "" -"The chosen exchange (protocol version%1$smight be outdated.%2$s The exchange " -"has a lower, incompatible protocol version than your wallet (protocol version" -"%3$s)." +"The chosen exchange (protocol version %1$s might be outdated.%2$s The " +"exchange has a lower, incompatible protocol version than your wallet " +"(protocol version %3$s)." msgstr "tjänsteleverantörer plånboken" #: src/webex/pages/confirm-create-reserve.tsx:309 @@ -196,7 +196,7 @@ msgstr "" #: src/webex/pages/confirm-create-reserve.tsx:341 #: src/webex/pages/confirm-create-reserve.tsx:353 #, fuzzy, c-format -msgid "Select%1$s" +msgid "Select %1$s" msgstr "Välj %1$s" #: src/webex/pages/confirm-create-reserve.tsx:370 @@ -298,27 +298,27 @@ msgstr "" #: src/webex/pages/popup.tsx:361 #, c-format -msgid "Started to withdraw %1$s from%2$s(%3$s)." +msgid "Started to withdraw %1$s from %2$s (%3$s)." msgstr "" #: src/webex/pages/popup.tsx:370 #, fuzzy, c-format -msgid "Merchant%1$soffered contract%2$s." +msgid "Merchant %1$s offered contract %2$s." msgstr "Säljaren %1$s erbjöd kontrakt %2$s.\n" #: src/webex/pages/popup.tsx:381 #, c-format -msgid "Withdrew%1$sfrom%2$s(%3$s)." +msgid "Withdrew %1$s from %2$s (%3$s)." msgstr "" #: src/webex/pages/popup.tsx:391 #, c-format -msgid "Paid%1$sto merchant%2$s. %3$s (%4$s)" +msgid "Paid %1$s to merchant %2$s. %3$s (%4$s)" msgstr "" #: src/webex/pages/popup.tsx:401 #, fuzzy, c-format -msgid "Merchant%1$sgave a refund over%2$s." +msgid "Merchant %1$s gave a refund over %2$s." msgstr "Säljaren %1$sgav en återbetalning på %2$s.\n" #: src/webex/pages/popup.tsx:411 @@ -328,7 +328,7 @@ msgstr "" #: src/webex/pages/popup.tsx:414 #, fuzzy, c-format -msgid "Merchant%1$sgave a%2$sof%3$s." +msgid "Merchant %1$s gave a %2$s of %3$s." msgstr "Säljaren %1$sgav en återbetalning på %2$s.\n" #: src/webex/pages/popup.tsx:419 diff --git a/src/i18n/taler-wallet-webex.pot b/src/i18n/taler-wallet-webex.pot index 38f817fae..93fef374d 100644 --- a/src/i18n/taler-wallet-webex.pot +++ b/src/i18n/taler-wallet-webex.pot @@ -95,17 +95,17 @@ msgstr "" #: src/webex/pages/confirm-contract.tsx:372 #, c-format -msgid "The merchant%1$soffers you to purchase:" +msgid "The merchant %1$s offers you to purchase:" msgstr "" #: src/webex/pages/confirm-contract.tsx:381 #, c-format -msgid "The total price is%1$s (plus%2$sfees)." +msgid "The total price is %1$s (plus %2$s fees)." msgstr "" -#: src/webex/pages/confirm-contract.tsx:385 +#: src/webex/pages/confirm-contract.tsx:384 #, c-format -msgid "The total price is%1$s." +msgid "The total price is %1$s." msgstr "" #: src/webex/pages/confirm-create-reserve.tsx:128 @@ -144,7 +144,7 @@ msgstr "" #: src/webex/pages/confirm-create-reserve.tsx:231 #, c-format msgid "" -"Using exchange provider%1$s. The exchange provider will charge %2$s in fees." +"Using exchange provider %1$s. The exchange provider will charge %2$s in fees." msgstr "" #: src/webex/pages/confirm-create-reserve.tsx:243 @@ -162,16 +162,16 @@ msgstr "" #: src/webex/pages/confirm-create-reserve.tsx:279 #, c-format msgid "" -"Your wallet (protocol version%1$s) might be outdated.%2$s The exchange has a " -"higher, incompatible protocol version (%3$s)." +"Your wallet (protocol version %1$s) might be outdated.%2$s The exchange has " +"a higher, incompatible protocol version (%3$s)." msgstr "" #: src/webex/pages/confirm-create-reserve.tsx:290 #, c-format msgid "" -"The chosen exchange (protocol version%1$smight be outdated.%2$s The exchange " -"has a lower, incompatible protocol version than your wallet (protocol version" -"%3$s)." +"The chosen exchange (protocol version %1$s might be outdated.%2$s The " +"exchange has a lower, incompatible protocol version than your wallet " +"(protocol version %3$s)." msgstr "" #: src/webex/pages/confirm-create-reserve.tsx:309 @@ -194,7 +194,7 @@ msgstr "" #: src/webex/pages/confirm-create-reserve.tsx:341 #: src/webex/pages/confirm-create-reserve.tsx:353 #, c-format -msgid "Select%1$s" +msgid "Select %1$s" msgstr "" #: src/webex/pages/confirm-create-reserve.tsx:370 @@ -292,27 +292,27 @@ msgstr "" #: src/webex/pages/popup.tsx:361 #, c-format -msgid "Started to withdraw %1$s from%2$s(%3$s)." +msgid "Started to withdraw %1$s from %2$s (%3$s)." msgstr "" #: src/webex/pages/popup.tsx:370 #, c-format -msgid "Merchant%1$soffered contract%2$s." +msgid "Merchant %1$s offered contract %2$s." msgstr "" #: src/webex/pages/popup.tsx:381 #, c-format -msgid "Withdrew%1$sfrom%2$s(%3$s)." +msgid "Withdrew %1$s from %2$s (%3$s)." msgstr "" #: src/webex/pages/popup.tsx:391 #, c-format -msgid "Paid%1$sto merchant%2$s. %3$s (%4$s)" +msgid "Paid %1$s to merchant %2$s. %3$s (%4$s)" msgstr "" #: src/webex/pages/popup.tsx:401 #, c-format -msgid "Merchant%1$sgave a refund over%2$s." +msgid "Merchant %1$s gave a refund over %2$s." msgstr "" #: src/webex/pages/popup.tsx:411 @@ -322,7 +322,7 @@ msgstr "" #: src/webex/pages/popup.tsx:414 #, c-format -msgid "Merchant%1$sgave a%2$sof%3$s." +msgid "Merchant %1$s gave a %2$s of %3$s." msgstr "" #: src/webex/pages/popup.tsx:419 diff --git a/src/webex/pages/confirm-contract.tsx b/src/webex/pages/confirm-contract.tsx index 24e08aec8..f1e98f22b 100644 --- a/src/webex/pages/confirm-contract.tsx +++ b/src/webex/pages/confirm-contract.tsx @@ -370,7 +370,7 @@ class ContractPrompt extends React.Component - The merchant {merchantName} offers you to purchase: + The merchant{" "}{merchantName} offers you to purchase:
{c.summary} @@ -379,8 +379,7 @@ class ContractPrompt extends React.Component - The total price is {amount} - (plus {renderAmount(this.state.payStatus.coinSelection.totalFees)} fees). + The total price is {amount} (plus {renderAmount(this.state.payStatus.coinSelection.totalFees)} fees). : The total price is {amount}. diff --git a/tooling/pogen/pogen.js b/tooling/pogen/pogen.js index ed634ef0d..203ed442c 100644 --- a/tooling/pogen/pogen.js +++ b/tooling/pogen/pogen.js @@ -190,6 +190,12 @@ function processFile(sourceFile) { var e = childNode; var s = e.getFullText(); var t = s.split("\n").map(trim).join(" "); + if (s[0] === " ") { + t = " " + t; + } + if (s[s.length - 1] === " ") { + t = t + " "; + } fragments.push(t); } case ts.SyntaxKind.JsxOpeningElement: diff --git a/tooling/pogen/pogen.ts b/tooling/pogen/pogen.ts index 391843912..98ecdf785 100644 --- a/tooling/pogen/pogen.ts +++ b/tooling/pogen/pogen.ts @@ -213,6 +213,12 @@ export function processFile(sourceFile: ts.SourceFile) { let e = childNode as ts.JsxText; let s = e.getFullText(); let t = s.split("\n").map(trim).join(" "); + if (s[0] === " ") { + t = " " + t; + } + if (s[s.length - 1] === " ") { + t = t + " "; + } fragments.push(t); } case ts.SyntaxKind.JsxOpeningElement: