taler/wallet-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Activity

misc. text fixes

Browse Source
This commit is contained in:
Florian Dold 2016-10-03 17:43:51 +02:00
parent 4156e50b7a
commit 91549d3992
9 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
img/taler-logo-24.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.4 KiB

2
pages/confirm-contract.html
View File

@ -7,6 +7,8 @@
<link rel="stylesheet" type="text/css" href="../style/lang.css"> <link rel="stylesheet" type="text/css" href="../style/lang.css">
<link rel="stylesheet" type="text/css" href="../style/wallet.css"> <link rel="stylesheet" type="text/css" href="../style/wallet.css">
<link rel="icon" href="../img/icon.png">
<script src="../lib/vendor/URI.js"></script> <script src="../lib/vendor/URI.js"></script>
<script src="../lib/vendor/mithril.js"></script> <script src="../lib/vendor/mithril.js"></script>
<script src="../lib/vendor/lodash.core.min.js"></script> <script src="../lib/vendor/lodash.core.min.js"></script>

9
pages/confirm-contract.tsx
View File

@ -52,7 +52,8 @@ const Details = {
}, "show less details"), }, "show less details"),
m("div", [ m("div", [
"Accepted exchanges:", "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) { view(ctrl: any) {
return [ return [
renderContract(contract), 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) : []), (error ? m("p.errorbox", error) : []),
m(Details, contract) m(Details, contract)
]; ];
@ -87,7 +90,7 @@ export function main() {
console.log("check-pay error", JSON.stringify(resp)); console.log("check-pay error", JSON.stringify(resp));
switch (resp.error) { switch (resp.error) {
case "coins-insufficient": 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; break;
default: default:
error = `Error: ${resp.error}`; error = `Error: ${resp.error}`;

2
pages/confirm-create-reserve.html
View File

@ -4,6 +4,8 @@
<head> <head>
<title>Taler Wallet: Select Taler Provider</title> <title>Taler Wallet: Select Taler Provider</title>
<link rel="icon" href="../img/icon.png">
<script src="../lib/vendor/URI.js"></script> <script src="../lib/vendor/URI.js"></script>
<script src="../lib/vendor/mithril.js"></script> <script src="../lib/vendor/mithril.js"></script>
<script src="../lib/vendor/system-csp-production.src.js"></script> <script src="../lib/vendor/system-csp-production.src.js"></script>

20
pages/confirm-create-reserve.tsx
View File

@ -214,6 +214,10 @@ function viewSimple(ctrl: Controller) {
}, "advanced options"); }, "advanced options");
} }
else if (ctrl.reserveCreationInfo != undefined) { 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", { yield m("button.accept", {
onclick: () => ctrl.confirmReserve(ctrl.reserveCreationInfo!, onclick: () => ctrl.confirmReserve(ctrl.reserveCreationInfo!,
ctrl.url(), ctrl.url(),
@ -228,9 +232,6 @@ function viewSimple(ctrl: Controller) {
ctrl.complexViewRequested = true; ctrl.complexViewRequested = true;
} }
}, "advanced options"); }, "advanced options");
let totalCost = Amounts.add(ctrl.reserveCreationInfo.overhead,
ctrl.reserveCreationInfo.withdrawFee).amount;
yield m("p", `Withdraw cost: ${amountToPretty(totalCost)}`);
} else { } else {
yield m("p", "Please wait ..."); yield m("p", "Please wait ...");
} }
@ -242,6 +243,12 @@ function viewSimple(ctrl: Controller) {
function viewComplex(ctrl: Controller) { function viewComplex(ctrl: Controller) {
function *f() { 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", { yield m("button.accept", {
onclick: () => ctrl.confirmReserve(ctrl.reserveCreationInfo!, onclick: () => ctrl.confirmReserve(ctrl.reserveCreationInfo!,
ctrl.url(), ctrl.url(),
@ -277,9 +284,6 @@ function viewComplex(ctrl: Controller) {
} }
if (ctrl.reserveCreationInfo) { if (ctrl.reserveCreationInfo) {
let totalCost = Amounts.add(ctrl.reserveCreationInfo.overhead,
ctrl.reserveCreationInfo.withdrawFee).amount;
yield m("p", `Withdraw cost: ${amountToPretty(totalCost)}`);
if (ctrl.detailCollapsed()) { if (ctrl.detailCollapsed()) {
yield m("button.linky", { yield m("button.linky", {
onclick: () => { onclick: () => {
@ -328,8 +332,8 @@ function renderReserveCreationDetails(rci: ReserveCreationInfo) {
let withdrawFeeStr = amountToPretty(rci.withdrawFee); let withdrawFeeStr = amountToPretty(rci.withdrawFee);
let overheadStr = amountToPretty(rci.overhead); let overheadStr = amountToPretty(rci.overhead);
return [ return [
m("p", `Fee for withdrawal: ${withdrawFeeStr}`), m("p", `Withdrawal fees: ${withdrawFeeStr}`),
m("p", `Overhead: ${overheadStr}`), m("p", `Rounding loss: ${overheadStr}`),
m("table", [ m("table", [
m("tr", [ m("tr", [
m("th", "Count"), m("th", "Count"),

1
pages/debug.html
View File

@ -2,6 +2,7 @@
<html> <html>
<head> <head>
<title>Taler Wallet Debugging</title> <title>Taler Wallet Debugging</title>
<link rel="icon" href="../img/icon.png">
</head> </head>
<body> <body>
<h1>Debug Pages</h1> <h1>Debug Pages</h1>

3
pages/help/empty-wallet.html
View File

@ -3,10 +3,11 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title>GNU Taler Help - Empty Wallet</title> <title>GNU Taler Help - Empty Wallet</title>
<link rel="icon" href="../../img/icon.png">
<meta name="description" content=""> <meta name="description" content="">
<link rel="stylesheet" type="text/css" href="../../style/wallet.css"> <link rel="stylesheet" type="text/css" href="../../style/wallet.css">
</head> </head>
<body class="en" onLoad="loadLang();"> <body>
<div class="container" id="main"> <div class="container" id="main">
<div class="row"> <div class="row">
<div class="col-lg-12"> <div class="col-lg-12">

1
pages/show-db.html
View File

@ -5,6 +5,7 @@
<head> <head>
<title>Taler Wallet: Reserve Created</title> <title>Taler Wallet: Reserve Created</title>
<link rel="stylesheet" type="text/css" href="../style/wallet.css"> <link rel="stylesheet" type="text/css" href="../style/wallet.css">
<link rel="icon" href="../img/icon.png">
<script src="show-db.js"></script> <script src="show-db.js"></script>
</head> </head>
<body> <body>

3
popup/popup.tsx
View File

@ -193,9 +193,6 @@ function formatHistoryItem(historyItem: HistoryRecord) {
return m("p", return m("p",
i18n.parts`Started to withdraw from reserve (${abbrev(d.reservePub)}) of ${formatAmount( i18n.parts`Started to withdraw from reserve (${abbrev(d.reservePub)}) of ${formatAmount(
d.requestedAmount)}.`); d.requestedAmount)}.`);
case "withdraw":
return m("p",
i18n`Withdraw at ${formatTimestamp(t)}`);
case "offer-contract": { case "offer-contract": {
let link = chrome.extension.getURL("view-contract.html"); let link = chrome.extension.getURL("view-contract.html");
let linkElem = m("a", {href: link}, abbrev(d.contractHash)); let linkElem = m("a", {href: link}, abbrev(d.contractHash));