);
diff --git a/packages/taler-wallet-webextension/src/components/DebugCheckbox.tsx b/packages/taler-wallet-webextension/src/components/DebugCheckbox.tsx
index 522fbce98..b5ad7cda7 100644
--- a/packages/taler-wallet-webextension/src/components/DebugCheckbox.tsx
+++ b/packages/taler-wallet-webextension/src/components/DebugCheckbox.tsx
@@ -14,7 +14,7 @@
TALER; see the file COPYING. If not, see
*/
-import { Translate } from "@gnu-taler/taler-util";
+import { i18n } from "@gnu-taler/taler-util";
import { h, VNode } from "preact";
export function DebugCheckbox({
@@ -37,7 +37,9 @@ export function DebugCheckbox({
htmlFor="checkbox-perm"
style={{ marginLeft: "0.5em", fontWeight: "bold" }}
>
- Automatically open wallet based on page content
+
+ Automatically open wallet based on page content
+
(
-
+
Enabling this option below will make using the wallet faster, but
requires more permissions from your browser.
-
+
)
diff --git a/packages/taler-wallet-webextension/src/components/Diagnostics.tsx b/packages/taler-wallet-webextension/src/components/Diagnostics.tsx
index 04b6abb55..b136ebc24 100644
--- a/packages/taler-wallet-webextension/src/components/Diagnostics.tsx
+++ b/packages/taler-wallet-webextension/src/components/Diagnostics.tsx
@@ -14,7 +14,7 @@
GNU Taler; see the file COPYING. If not, see
*/
-import { Translate, WalletDiagnostics } from "@gnu-taler/taler-util";
+import { i18n, WalletDiagnostics } from "@gnu-taler/taler-util";
import { Fragment, h, VNode } from "preact";
import { PageLink } from "../renderHtml";
@@ -27,9 +27,9 @@ export function Diagnostics({ timedOut, diagnostics }: Props): VNode {
if (timedOut) {
return (
-
+
Diagnostics timed out. Could not talk to the wallet backend.
-
+
-
+
Please check in your about:config settings that you
have IndexedDB enabled (check the preference name{" "}
dom.indexedDB.enabled).
-
+
) : null}
{diagnostics.dbOutdated ? (
-
+
Your wallet database is outdated. Currently automatic migration is
not supported. Please go{" "}
- here
+ here{" "}
to reset the wallet database.
-
+
);
}
diff --git a/packages/taler-wallet-webextension/src/components/EditableText.tsx b/packages/taler-wallet-webextension/src/components/EditableText.tsx
index c5d6e397e..8d45cae90 100644
--- a/packages/taler-wallet-webextension/src/components/EditableText.tsx
+++ b/packages/taler-wallet-webextension/src/components/EditableText.tsx
@@ -14,7 +14,7 @@
GNU Taler; see the file COPYING. If not, see
*/
-import { Translate } from "@gnu-taler/taler-util";
+import { i18n } from "@gnu-taler/taler-util";
import { h, VNode } from "preact";
import { useRef, useState } from "preact/hooks";
@@ -41,7 +41,7 @@ export function EditableText({
{value}
);
@@ -57,7 +57,7 @@ export function EditableText({
onChange(ref.current.value).then(() => setEditing(false));
}}
>
- Confirm
+ Confirm
);
diff --git a/packages/taler-wallet-webextension/src/components/Loading.tsx b/packages/taler-wallet-webextension/src/components/Loading.tsx
index ff6d21376..7504034a0 100644
--- a/packages/taler-wallet-webextension/src/components/Loading.tsx
+++ b/packages/taler-wallet-webextension/src/components/Loading.tsx
@@ -13,13 +13,13 @@
You should have received a copy of the GNU General Public License along with
TALER; see the file COPYING. If not, see
*/
-import { Translate } from "@gnu-taler/taler-util";
+import { i18n } from "@gnu-taler/taler-util";
import { h, VNode } from "preact";
export function Loading(): VNode {
return (
- Loading...
+ Loading...
);
}
diff --git a/packages/taler-wallet-webextension/src/components/SelectList.tsx b/packages/taler-wallet-webextension/src/components/SelectList.tsx
index a5f182d77..676fd672f 100644
--- a/packages/taler-wallet-webextension/src/components/SelectList.tsx
+++ b/packages/taler-wallet-webextension/src/components/SelectList.tsx
@@ -14,7 +14,7 @@
GNU Taler; see the file COPYING. If not, see
*/
-import { Translate } from "@gnu-taler/taler-util";
+import { i18n } from "@gnu-taler/taler-util";
import { Fragment, h, VNode } from "preact";
import { NiceSelect } from "./styled";
@@ -59,7 +59,7 @@ export function SelectList({
{value === undefined ||
(canBeNull && (
// ) : (
//
diff --git a/packages/taler-wallet-webextension/src/components/TransactionItem.tsx b/packages/taler-wallet-webextension/src/components/TransactionItem.tsx
index 5c8897006..abcca9c26 100644
--- a/packages/taler-wallet-webextension/src/components/TransactionItem.tsx
+++ b/packages/taler-wallet-webextension/src/components/TransactionItem.tsx
@@ -21,7 +21,7 @@ import {
Timestamp,
Transaction,
TransactionType,
- Translate,
+ i18n,
} from "@gnu-taler/taler-util";
import { h, VNode } from "preact";
import imageBank from "../../static/img/ri-bank-line.svg";
@@ -134,7 +134,7 @@ function TransactionLayout(props: TransactionLayoutProps): VNode {
{props.pending && (
- Waiting for confirmation
+ Waiting for confirmation
)}
@@ -198,7 +198,7 @@ function TransactionAmount(props: TransactionAmountProps): VNode {
{props.pending && (
- PENDING
+ PENDING
)}
diff --git a/packages/taler-wallet-webextension/src/cta/Deposit.tsx b/packages/taler-wallet-webextension/src/cta/Deposit.tsx
index 5adc641f4..82d898d77 100644
--- a/packages/taler-wallet-webextension/src/cta/Deposit.tsx
+++ b/packages/taler-wallet-webextension/src/cta/Deposit.tsx
@@ -111,7 +111,7 @@ export function DepositPage({ talerPayUri, goBack }: Props): VNode {
if (!talerPayUri) {
return (
- missing pay uri
+ missing pay uri
);
}
@@ -122,14 +122,14 @@ export function DepositPage({ talerPayUri, goBack }: Props): VNode {
- Digital cash payment
+ Digital cash payment
+
Could not get the payment information for this order
-
+
}
error={payErrMsg?.operationError}
/>
@@ -142,13 +142,13 @@ export function DepositPage({ talerPayUri, goBack }: Props): VNode {
- Digital cash payment
+ Digital cash payment
-
+
Could not get the payment information for this order
-
+
{payErrMsg}
@@ -157,7 +157,7 @@ export function DepositPage({ talerPayUri, goBack }: Props): VNode {
}
return (
- Loading payment information ...
+ Loading payment information ...
);
}
@@ -205,28 +205,28 @@ export function PaymentRequestView({
)}
@@ -241,7 +241,7 @@ export function PaymentRequestView({
- Processing...
+ Processing...
@@ -254,9 +254,9 @@ export function PaymentRequestView({
-
+
Pay {amountToString(payStatus.amountEffective)}
-
+
@@ -269,22 +269,22 @@ export function PaymentRequestView({
{balance ? (
-
+
Your balance of {amountToString(balance)} is not enough to pay
for this purchase
-
+
) : (
-
+
Your balance is not enough to pay for this purchase.
-
+
)}
- Withdraw digital cash
+ Withdraw digital cash
@@ -297,7 +297,7 @@ export function PaymentRequestView({
{payStatus.paid && contractTerms.fulfillment_message && (
Merchant message}
+ title={Merchant message}
text={contractTerms.fulfillment_message}
kind="neutral"
/>
@@ -315,43 +315,43 @@ export function PaymentRequestView({
-
+
The refund amount of{" "}
could not be
applied.
-
+
) : null}
@@ -92,7 +94,7 @@ export function RefundPage({ talerRefundUri }: Props): VNode {
if (!talerRefundUri) {
return (
- missing taler refund uri
+ missing taler refund uri
);
}
@@ -100,7 +102,7 @@ export function RefundPage({ talerRefundUri }: Props): VNode {
if (errMsg) {
return (
- Error: {errMsg}
+ Error: {errMsg}
);
}
@@ -108,7 +110,7 @@ export function RefundPage({ talerRefundUri }: Props): VNode {
if (!applyResult) {
return (
- Updating refund status
+ Updating refund status
);
}
diff --git a/packages/taler-wallet-webextension/src/cta/TermsOfServiceSection.tsx b/packages/taler-wallet-webextension/src/cta/TermsOfServiceSection.tsx
index 00f7bd211..1244b7915 100644
--- a/packages/taler-wallet-webextension/src/cta/TermsOfServiceSection.tsx
+++ b/packages/taler-wallet-webextension/src/cta/TermsOfServiceSection.tsx
@@ -34,7 +34,9 @@ export function TermsOfServiceSection({
{terms.status === "notfound" && (
- Exchange doesn't have terms of service
+
+ Exchange doesn't have terms of service
+
)}
@@ -46,21 +48,27 @@ export function TermsOfServiceSection({
{terms.status === "notfound" && (
- Exchange doesn't have terms of service
+
+ Exchange doesn't have terms of service
+
)}
{terms.status === "new" && (
onReview(true)}>
- Review exchange terms of service
+
+ Review exchange terms of service
+
)}
{terms.status === "changed" && (
onReview(true)}>
- Review new version of terms of service
+
+ Review new version of terms of service
+
)}
@@ -72,7 +80,7 @@ export function TermsOfServiceSection({
{onReview && (
onReview(true)}>
- Show terms of service
+ Show terms of service
)}
@@ -81,7 +89,9 @@ export function TermsOfServiceSection({
name="terms"
enabled={reviewed}
label={
- I accept the exchange terms of service
+
+ I accept the exchange terms of service
+
}
onToggle={() => {
onAccept(!reviewed);
@@ -97,9 +107,9 @@ export function TermsOfServiceSection({
{terms.status !== "notfound" && !terms.content && (
-
+
The exchange reply with a empty terms of service
-
+
)}
@@ -120,7 +130,7 @@ export function TermsOfServiceSection({
)}
{terms.content.type === "pdf" && (
- Download Terms of Service
+ Download Terms of Service
)}
@@ -128,7 +138,7 @@ export function TermsOfServiceSection({
{reviewed && onReview && (
onReview(false)}>
- Hide terms of service
+ Hide terms of service
)}
@@ -138,7 +148,9 @@ export function TermsOfServiceSection({
name="terms"
enabled={reviewed}
label={
- I accept the exchange terms of service
+
+ I accept the exchange terms of service
+
}
onToggle={() => {
onAccept(!reviewed);
diff --git a/packages/taler-wallet-webextension/src/cta/Tip.tsx b/packages/taler-wallet-webextension/src/cta/Tip.tsx
index 9bb03b7ac..ff86ce8c7 100644
--- a/packages/taler-wallet-webextension/src/cta/Tip.tsx
+++ b/packages/taler-wallet-webextension/src/cta/Tip.tsx
@@ -20,7 +20,7 @@
* @author sebasjm
*/
-import { PrepareTipResult, Translate } from "@gnu-taler/taler-util";
+import { PrepareTipResult, i18n } from "@gnu-taler/taler-util";
import { h, VNode } from "preact";
import { useEffect, useState } from "preact/hooks";
import { Loading } from "../components/Loading";
@@ -46,28 +46,28 @@ export function View({
{prepareTipResult.accepted ? (
-
+
Tip from {prepareTipResult.merchantBaseUrl} accepted.
Check your transactions list for more details.
-
+
) : (
-
+
The merchant {prepareTipResult.merchantBaseUrl} is
offering you a tip of{" "}
{" "}
via the exchange {prepareTipResult.exchangeBaseUrl}
-
+
)}
@@ -108,7 +108,7 @@ export function TipPage({ talerTipUri }: Props): VNode {
if (!talerTipUri) {
return (
- missing tip uri
+ missing tip uri
);
}
@@ -116,7 +116,7 @@ export function TipPage({ talerTipUri }: Props): VNode {
if (tipIgnored) {
return (
- You've ignored the tip.
+ You've ignored the tip.
);
}
diff --git a/packages/taler-wallet-webextension/src/cta/Withdraw.tsx b/packages/taler-wallet-webextension/src/cta/Withdraw.tsx
index 7d36a6084..7c9745ddc 100644
--- a/packages/taler-wallet-webextension/src/cta/Withdraw.tsx
+++ b/packages/taler-wallet-webextension/src/cta/Withdraw.tsx
@@ -119,13 +119,15 @@ export function View({
- Digital cash withdrawal
+ Digital cash withdrawal
{withdrawError && (
Could not finish the withdrawal operation
+
+ Could not finish the withdrawal operation
+
}
error={withdrawError.operationError}
/>
@@ -133,19 +135,19 @@ export function View({
Total to withdraw}
+ title={Total to withdraw}
text={amountToString(Amounts.sub(amount, withdrawalFee).amount)}
kind="positive"
/>
{Amounts.isNonZero(withdrawalFee) && (
Chosen amount}
+ title={Chosen amount}
text={amountToString(amount)}
kind="neutral"
/>
Exchange fee}
+ title={Exchange fee}
text={amountToString(withdrawalFee)}
kind="negative"
/>
@@ -153,7 +155,7 @@ export function View({
)}
{exchangeBaseUrl && (
Exchange}
+ title={Exchange}
text={exchangeBaseUrl}
kind="neutral"
big
@@ -166,7 +168,7 @@ export function View({
Known exchanges}
+ label={Known exchanges}
list={exchanges}
value={nextExchange}
name="switchingExchange"
@@ -183,15 +185,15 @@ export function View({
}}
>
{nextExchange === undefined ? (
- Cancel exchange selection
+ Cancel exchange selection
) : (
- Confirm exchange selection
+ Confirm exchange selection
)}
) : (
setSwitchingExchange(true)}>
- Switch exchange
+ Switch exchange
)}
@@ -210,7 +212,7 @@ export function View({
disabled={!exchangeBaseUrl || confirmDisabled}
onClick={doWithdrawAndCheckError}
>
- Confirm withdrawal
+ Confirm withdrawal
)}
{terms.status === "notfound" && (
@@ -219,7 +221,7 @@ export function View({
disabled={!exchangeBaseUrl}
onClick={doWithdrawAndCheckError}
>
- Withdraw anyway
+ Withdraw anyway
)}
@@ -282,7 +284,9 @@ export function WithdrawPageWithParsedURI({
if (detailsHook.hasError) {
return (
Could not load the withdrawal details}
+ title={
+ Could not load the withdrawal details
+ }
error={detailsHook}
/>
);
@@ -337,7 +341,7 @@ export function WithdrawPage({ talerWithdrawUri }: Props): VNode {
if (!talerWithdrawUri) {
return (
- missing withdraw uri
+ missing withdraw uri
);
}
@@ -347,7 +351,9 @@ export function WithdrawPage({ talerWithdrawUri }: Props): VNode {
if (uriInfoHook.hasError) {
return (
Could not get the info from the URI}
+ title={
+ Could not get the info from the URI
+ }
error={uriInfoHook}
/>
);
diff --git a/packages/taler-wallet-webextension/src/cta/reset-required.tsx b/packages/taler-wallet-webextension/src/cta/reset-required.tsx
index e8c5a0dff..350c32d76 100644
--- a/packages/taler-wallet-webextension/src/cta/reset-required.tsx
+++ b/packages/taler-wallet-webextension/src/cta/reset-required.tsx
@@ -20,7 +20,7 @@
* @author sebasjm
*/
-import { Translate } from "@gnu-taler/taler-util";
+import { i18n } from "@gnu-taler/taler-util";
import { Component, h, VNode } from "preact";
import * as wxApi from "../wxApi";
@@ -51,19 +51,19 @@ class ResetNotification extends Component {
return (