From 91549d39929195add3f76544989d65f22b9296ea Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Mon, 3 Oct 2016 17:43:51 +0200 Subject: misc. text fixes --- img/taler-logo-24.png | Bin 1452 -> 0 bytes pages/confirm-contract.html | 2 ++ pages/confirm-contract.tsx | 9 ++++++--- pages/confirm-create-reserve.html | 2 ++ pages/confirm-create-reserve.tsx | 20 ++++++++++++-------- pages/debug.html | 1 + pages/help/empty-wallet.html | 3 ++- pages/show-db.html | 3 ++- popup/popup.tsx | 3 --- 9 files changed, 27 insertions(+), 16 deletions(-) delete mode 100644 img/taler-logo-24.png diff --git a/img/taler-logo-24.png b/img/taler-logo-24.png deleted file mode 100644 index 00a908e79..000000000 Binary files a/img/taler-logo-24.png and /dev/null differ diff --git a/pages/confirm-contract.html b/pages/confirm-contract.html index 720bd3334..e7200910a 100644 --- a/pages/confirm-contract.html +++ b/pages/confirm-contract.html @@ -7,6 +7,8 @@ + + diff --git a/pages/confirm-contract.tsx b/pages/confirm-contract.tsx index 52e4cb79a..f162dca85 100644 --- a/pages/confirm-contract.tsx +++ b/pages/confirm-contract.tsx @@ -52,7 +52,8 @@ const Details = { }, "show less details"), m("div", [ "Accepted exchanges:", - m("ul", contract.exchanges.map(e => m("li", `${e.url}: ${e.master_pub}`))) + m("ul", + contract.exchanges.map(e => m("li", `${e.url}: ${e.master_pub}`))) ]) ]); } @@ -72,7 +73,9 @@ export function main() { view(ctrl: any) { return [ renderContract(contract), - m("button.accept", {onclick: doPayment, disabled: payDisabled}, i18n`Confirm Payment`), + m("button.accept", + {onclick: doPayment, disabled: payDisabled}, + i18n`Confirm Payment`), (error ? m("p.errorbox", error) : []), m(Details, contract) ]; @@ -87,7 +90,7 @@ export function main() { console.log("check-pay error", JSON.stringify(resp)); switch (resp.error) { case "coins-insufficient": - error = "You do not have enough coins of the requested currency."; + error = i18n`You have insufficient funds of the requested currency in your wallet.`; break; default: error = `Error: ${resp.error}`; diff --git a/pages/confirm-create-reserve.html b/pages/confirm-create-reserve.html index 995a85aec..b8a825bd1 100644 --- a/pages/confirm-create-reserve.html +++ b/pages/confirm-create-reserve.html @@ -4,6 +4,8 @@ Taler Wallet: Select Taler Provider + + diff --git a/pages/confirm-create-reserve.tsx b/pages/confirm-create-reserve.tsx index 0a509118d..8e8067052 100644 --- a/pages/confirm-create-reserve.tsx +++ b/pages/confirm-create-reserve.tsx @@ -214,6 +214,10 @@ function viewSimple(ctrl: Controller) { }, "advanced options"); } else if (ctrl.reserveCreationInfo != undefined) { + let totalCost = Amounts.add(ctrl.reserveCreationInfo.overhead, + ctrl.reserveCreationInfo.withdrawFee).amount; + yield m("p", `Withdraw fees: ${amountToPretty(totalCost)}`); + yield m("button.accept", { onclick: () => ctrl.confirmReserve(ctrl.reserveCreationInfo!, ctrl.url(), @@ -228,9 +232,6 @@ function viewSimple(ctrl: Controller) { ctrl.complexViewRequested = true; } }, "advanced options"); - let totalCost = Amounts.add(ctrl.reserveCreationInfo.overhead, - ctrl.reserveCreationInfo.withdrawFee).amount; - yield m("p", `Withdraw cost: ${amountToPretty(totalCost)}`); } else { yield m("p", "Please wait ..."); } @@ -242,6 +243,12 @@ function viewSimple(ctrl: Controller) { function viewComplex(ctrl: Controller) { function *f() { + if (ctrl.reserveCreationInfo) { + let totalCost = Amounts.add(ctrl.reserveCreationInfo.overhead, + ctrl.reserveCreationInfo.withdrawFee).amount; + yield m("p", `Withdraw fees: ${amountToPretty(totalCost)}`); + } + yield m("button.accept", { onclick: () => ctrl.confirmReserve(ctrl.reserveCreationInfo!, ctrl.url(), @@ -277,9 +284,6 @@ function viewComplex(ctrl: Controller) { } if (ctrl.reserveCreationInfo) { - let totalCost = Amounts.add(ctrl.reserveCreationInfo.overhead, - ctrl.reserveCreationInfo.withdrawFee).amount; - yield m("p", `Withdraw cost: ${amountToPretty(totalCost)}`); if (ctrl.detailCollapsed()) { yield m("button.linky", { onclick: () => { @@ -328,8 +332,8 @@ function renderReserveCreationDetails(rci: ReserveCreationInfo) { let withdrawFeeStr = amountToPretty(rci.withdrawFee); let overheadStr = amountToPretty(rci.overhead); return [ - m("p", `Fee for withdrawal: ${withdrawFeeStr}`), - m("p", `Overhead: ${overheadStr}`), + m("p", `Withdrawal fees: ${withdrawFeeStr}`), + m("p", `Rounding loss: ${overheadStr}`), m("table", [ m("tr", [ m("th", "Count"), diff --git a/pages/debug.html b/pages/debug.html index 24682dd24..221c7380c 100644 --- a/pages/debug.html +++ b/pages/debug.html @@ -2,6 +2,7 @@ Taler Wallet Debugging +

Debug Pages

diff --git a/pages/help/empty-wallet.html b/pages/help/empty-wallet.html index 38a868aa4..952bd92b7 100644 --- a/pages/help/empty-wallet.html +++ b/pages/help/empty-wallet.html @@ -3,10 +3,11 @@ GNU Taler Help - Empty Wallet + - +

diff --git a/pages/show-db.html b/pages/show-db.html index ee54d0e08..024e844ee 100644 --- a/pages/show-db.html +++ b/pages/show-db.html @@ -4,7 +4,8 @@ Taler Wallet: Reserve Created - + + diff --git a/popup/popup.tsx b/popup/popup.tsx index e5e929eb0..5b2b1e9f9 100644 --- a/popup/popup.tsx +++ b/popup/popup.tsx @@ -193,9 +193,6 @@ function formatHistoryItem(historyItem: HistoryRecord) { return m("p", i18n.parts`Started to withdraw from reserve (${abbrev(d.reservePub)}) of ${formatAmount( d.requestedAmount)}.`); - case "withdraw": - return m("p", - i18n`Withdraw at ${formatTimestamp(t)}`); case "offer-contract": { let link = chrome.extension.getURL("view-contract.html"); let linkElem = m("a", {href: link}, abbrev(d.contractHash)); -- cgit v1.2.3