[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-wallet-core] 02/02: use translation from commons
|
From: |
gnunet |
|
Subject: |
[taler-wallet-core] 02/02: use translation from commons |
|
Date: |
Fri, 09 Dec 2022 15:58:52 +0100 |
This is an automated email from the git hooks/post-receive script.
sebasjm pushed a commit to branch master
in repository wallet-core.
commit f2b319921c53010446e05ac4f24eef9995f65836
Author: Sebastian <sebasjm@gmail.com>
AuthorDate: Fri Dec 9 11:58:39 2022 -0300
use translation from commons
---
packages/demobank-ui/src/components/app.tsx | 5 +-
.../src/components/menu/LangSelector.tsx | 2 +-
.../demobank-ui/src/components/menu/SideBar.tsx | 2 +-
.../src/components/picker/DurationPicker.tsx | 2 +-
packages/demobank-ui/src/context/pageState.ts | 4 +-
packages/demobank-ui/src/context/translation.ts | 88 ----------------------
packages/demobank-ui/src/hooks/backend.ts | 4 +-
packages/demobank-ui/src/hooks/index.ts | 10 +--
.../demobank-ui/src/pages/home/AccountPage.tsx | 4 +-
packages/demobank-ui/src/pages/home/BankFrame.tsx | 2 +-
packages/demobank-ui/src/pages/home/LoginForm.tsx | 2 +-
.../demobank-ui/src/pages/home/PaymentOptions.tsx | 2 +-
.../src/pages/home/PaytoWireTransferForm.tsx | 6 +-
.../src/pages/home/PublicHistoriesPage.tsx | 9 +--
.../demobank-ui/src/pages/home/QrCodeSection.tsx | 2 +-
.../src/pages/home/RegistrationPage.tsx | 2 +-
.../demobank-ui/src/pages/home/Transactions.tsx | 2 +-
.../src/pages/home/WalletWithdrawForm.tsx | 2 +-
.../pages/home/WithdrawalConfirmationQuestion.tsx | 2 +-
.../src/pages/home/WithdrawalQRCode.tsx | 2 +-
20 files changed, 32 insertions(+), 122 deletions(-)
diff --git a/packages/demobank-ui/src/components/app.tsx
b/packages/demobank-ui/src/components/app.tsx
index 3c3784f19..8679b05dd 100644
--- a/packages/demobank-ui/src/components/app.tsx
+++ b/packages/demobank-ui/src/components/app.tsx
@@ -21,8 +21,9 @@ import {
import { h, FunctionalComponent } from "preact";
import { BackendStateProvider } from "../context/backend.js";
import { PageStateProvider } from "../context/pageState.js";
-import { TranslationProvider } from "../context/translation.js";
import { Routing } from "../pages/Routing.js";
+import { strings } from "../i18n/strings.js";
+import { TranslationProvider } from "@gnu-taler/web-util/lib/index.browser";
/**
* FIXME:
@@ -43,7 +44,7 @@ import { Routing } from "../pages/Routing.js";
const App: FunctionalComponent = () => {
return (
- <TranslationProvider>
+ <TranslationProvider source={strings}>
<PageStateProvider>
<BackendStateProvider>
<Routing />
diff --git a/packages/demobank-ui/src/components/menu/LangSelector.tsx
b/packages/demobank-ui/src/components/menu/LangSelector.tsx
index 1487120e0..6c0acaf42 100644
--- a/packages/demobank-ui/src/components/menu/LangSelector.tsx
+++ b/packages/demobank-ui/src/components/menu/LangSelector.tsx
@@ -21,7 +21,7 @@
import { Fragment, h, VNode } from "preact";
import { useEffect, useState } from "preact/hooks";
-import { useTranslationContext } from "../../context/translation.js";
+import { useTranslationContext } from "@gnu-taler/web-util/lib/index.browser";
import { strings as messages } from "../../i18n/strings.js";
type LangsNames = {
diff --git a/packages/demobank-ui/src/components/menu/SideBar.tsx
b/packages/demobank-ui/src/components/menu/SideBar.tsx
index 6acee7b57..32fe216ab 100644
--- a/packages/demobank-ui/src/components/menu/SideBar.tsx
+++ b/packages/demobank-ui/src/components/menu/SideBar.tsx
@@ -20,7 +20,7 @@
*/
import { h, VNode } from "preact";
-import { useTranslationContext } from "../../context/translation.js";
+import { useTranslationContext } from "@gnu-taler/web-util/lib/index.browser";
interface Props {
mobile?: boolean;
diff --git a/packages/demobank-ui/src/components/picker/DurationPicker.tsx
b/packages/demobank-ui/src/components/picker/DurationPicker.tsx
index 677c3ecd7..973f2f507 100644
--- a/packages/demobank-ui/src/components/picker/DurationPicker.tsx
+++ b/packages/demobank-ui/src/components/picker/DurationPicker.tsx
@@ -21,7 +21,7 @@
import { h, VNode } from "preact";
import { useState } from "preact/hooks";
-import { useTranslationContext } from "../../context/translation.js";
+import { useTranslationContext } from "@gnu-taler/web-util/lib/index.browser";
import "../../scss/DurationPicker.scss";
export interface Props {
diff --git a/packages/demobank-ui/src/context/pageState.ts
b/packages/demobank-ui/src/context/pageState.ts
index 0537a913a..fd7a6c90c 100644
--- a/packages/demobank-ui/src/context/pageState.ts
+++ b/packages/demobank-ui/src/context/pageState.ts
@@ -14,7 +14,7 @@
GNU Taler; see the file COPYING. If not, see <http://www.gnu.org/licenses/>
*/
-import { hooks } from "@gnu-taler/web-util/lib/index.browser";
+import { useNotNullLocalStorage } from "@gnu-taler/web-util/lib/index.browser";
import { ComponentChildren, createContext, h, VNode } from "preact";
import { StateUpdater, useContext } from "preact/hooks";
@@ -62,7 +62,7 @@ function usePageState(
withdrawalInProgress: false,
},
): [PageStateType, StateUpdater<PageStateType>] {
- const ret = hooks.useNotNullLocalStorage("page-state",
JSON.stringify(state));
+ const ret = useNotNullLocalStorage("page-state", JSON.stringify(state));
const retObj: PageStateType = JSON.parse(ret[0]);
const retSetter: StateUpdater<PageStateType> = function (val) {
diff --git a/packages/demobank-ui/src/context/translation.ts
b/packages/demobank-ui/src/context/translation.ts
deleted file mode 100644
index 4d24d3f5a..000000000
--- a/packages/demobank-ui/src/context/translation.ts
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- This file is part of GNU Taler
- (C) 2022 Taler Systems S.A.
-
- GNU Taler is free software; you can redistribute it and/or modify it under the
- terms of the GNU General Public License as published by the Free Software
- Foundation; either version 3, or (at your option) any later version.
-
- GNU Taler is distributed in the hope that it will be useful, but WITHOUT ANY
- WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License along with
- GNU Taler; see the file COPYING. If not, see <http://www.gnu.org/licenses/>
- */
-
-import { i18n, setupI18n } from "@gnu-taler/taler-util";
-import { ComponentChildren, createContext, h, VNode } from "preact";
-import { useContext, useEffect } from "preact/hooks";
-import { hooks } from "@gnu-taler/web-util/lib/index.browser";
-import { strings } from "../i18n/strings.js";
-
-
-export type InternationalizationAPI = typeof i18n
-
-interface Type {
- lang: string;
- supportedLang: { [id in keyof typeof supportedLang]: string };
- changeLanguage: (l: string) => void;
- i18n: InternationalizationAPI;
- isSaved: boolean;
-}
-
-const supportedLang = {
- es: "Espanol [es]",
- en: "English [en]",
- fr: "Francais [fr]",
- de: "Deutsch [de]",
- sv: "Svenska [sv]",
- it: "Italiane [it]",
- navigator: "Defined by navigator",
-};
-
-const initial = {
- lang: "en",
- supportedLang,
- changeLanguage: () => {
- // do not change anything
- },
- i18n,
- isSaved: false,
-};
-const Context = createContext<Type>(initial);
-
-interface Props {
- initial?: string;
- children: ComponentChildren;
- forceLang?: string;
-}
-
-// Outmost UI wrapper.
-export const TranslationProvider = ({
- initial,
- children,
- forceLang,
-}: Props): VNode => {
- const [lang, changeLanguage, isSaved] = hooks.useLang(initial);
- useEffect(() => {
- if (forceLang) {
- changeLanguage(forceLang);
- }
- });
- useEffect(() => {
- setupI18n(lang, strings);
- }, [lang]);
- if (forceLang) {
- setupI18n(forceLang, strings);
- } else {
- setupI18n(lang, strings);
- }
-
- return h(Context.Provider, {
- value: { lang, changeLanguage, supportedLang, i18n, isSaved },
- children,
- });
-};
-
-export const useTranslationContext = (): Type => useContext(Context);
diff --git a/packages/demobank-ui/src/hooks/backend.ts
b/packages/demobank-ui/src/hooks/backend.ts
index f10696ac4..13a158f4f 100644
--- a/packages/demobank-ui/src/hooks/backend.ts
+++ b/packages/demobank-ui/src/hooks/backend.ts
@@ -14,7 +14,7 @@
GNU Taler; see the file COPYING. If not, see <http://www.gnu.org/licenses/>
*/
-import { hooks } from "@gnu-taler/web-util/lib/index.browser";
+import { useLocalStorage } from "@gnu-taler/web-util/lib/index.browser";
/**
* Has the information to reach and
@@ -48,7 +48,7 @@ export interface BackendStateHandler {
* base URL.
*/
export function useBackendState(): BackendStateHandler {
- const [value, update] = hooks.useLocalStorage(
+ const [value, update] = useLocalStorage(
"backend-state",
JSON.stringify(defaultState),
);
diff --git a/packages/demobank-ui/src/hooks/index.ts
b/packages/demobank-ui/src/hooks/index.ts
index 007061f1a..c582a5c63 100644
--- a/packages/demobank-ui/src/hooks/index.ts
+++ b/packages/demobank-ui/src/hooks/index.ts
@@ -20,7 +20,7 @@
*/
import { StateUpdater } from "preact/hooks";
-import { hooks } from "@gnu-taler/web-util/lib/index.browser";
+import { useLocalStorage, useNotNullLocalStorage } from
"@gnu-taler/web-util/lib/index.browser";
export type ValueOrFunction<T> = T | ((p: T) => T);
const calculateRootPath = () => {
@@ -34,11 +34,11 @@ const calculateRootPath = () => {
export function useBackendURL(
url?: string,
): [string, boolean, StateUpdater<string>, () => void] {
- const [value, setter] = hooks.useNotNullLocalStorage(
+ const [value, setter] = useNotNullLocalStorage(
"backend-url",
url || calculateRootPath(),
);
- const [triedToLog, setTriedToLog] = hooks.useLocalStorage("tried-login");
+ const [triedToLog, setTriedToLog] = useLocalStorage("tried-login");
const checkedSetter = (v: ValueOrFunction<string>) => {
setTriedToLog("yes");
@@ -55,13 +55,13 @@ export function useBackendDefaultToken(): [
string | undefined,
StateUpdater<string | undefined>,
] {
- return hooks.useLocalStorage("backend-token");
+ return useLocalStorage("backend-token");
}
export function useBackendInstanceToken(
id: string,
): [string | undefined, StateUpdater<string | undefined>] {
- const [token, setToken] = hooks.useLocalStorage(`backend-token-${id}`);
+ const [token, setToken] = useLocalStorage(`backend-token-${id}`);
const [defaultToken, defaultSetToken] = useBackendDefaultToken();
// instance named 'default' use the default token
diff --git a/packages/demobank-ui/src/pages/home/AccountPage.tsx
b/packages/demobank-ui/src/pages/home/AccountPage.tsx
index f2745e45c..da22568f9 100644
--- a/packages/demobank-ui/src/pages/home/AccountPage.tsx
+++ b/packages/demobank-ui/src/pages/home/AccountPage.tsx
@@ -15,12 +15,12 @@
*/
import { Amounts, HttpStatusCode, Logger } from "@gnu-taler/taler-util";
+import { useTranslationContext } from "@gnu-taler/web-util/lib/index.browser";
import { ComponentChildren, Fragment, h, VNode } from "preact";
import { useEffect } from "preact/hooks";
import useSWR, { SWRConfig, useSWRConfig } from "swr";
import { useBackendContext } from "../../context/backend.js";
import { PageStateType, usePageContext } from "../../context/pageState.js";
-import { useTranslationContext } from "../../context/translation.js";
import { BackendInfo } from "../../hooks/backend.js";
import { bankUiSettings } from "../../settings.js";
import { getIbanFromPayto, prepareHeaders } from "../../utils.js";
@@ -253,7 +253,7 @@ function Account({ accountLabel }: { accountLabel: string
}): VNode {
}
// function useTransactionPageNumber(): [number, StateUpdater<number>] {
-// const ret = hooks.useNotNullLocalStorage("transaction-page", "0");
+// const ret = useNotNullLocalStorage("transaction-page", "0");
// const retObj = JSON.parse(ret[0]);
// const retSetter: StateUpdater<number> = function (val) {
// const newVal =
diff --git a/packages/demobank-ui/src/pages/home/BankFrame.tsx
b/packages/demobank-ui/src/pages/home/BankFrame.tsx
index 2a0c797f2..cb629effb 100644
--- a/packages/demobank-ui/src/pages/home/BankFrame.tsx
+++ b/packages/demobank-ui/src/pages/home/BankFrame.tsx
@@ -20,7 +20,7 @@ import talerLogo from "../../assets/logo-white.svg";
import { LangSelectorLikePy as LangSelector } from
"../../components/menu/LangSelector.js";
import { useBackendContext } from "../../context/backend.js";
import { PageStateType, usePageContext } from "../../context/pageState.js";
-import { useTranslationContext } from "../../context/translation.js";
+import { useTranslationContext } from "@gnu-taler/web-util/lib/index.browser";
import { bankUiSettings } from "../../settings.js";
const logger = new Logger("BankFrame");
diff --git a/packages/demobank-ui/src/pages/home/LoginForm.tsx
b/packages/demobank-ui/src/pages/home/LoginForm.tsx
index f31f91190..4f38bc91d 100644
--- a/packages/demobank-ui/src/pages/home/LoginForm.tsx
+++ b/packages/demobank-ui/src/pages/home/LoginForm.tsx
@@ -18,7 +18,7 @@ import { h, VNode } from "preact";
import { route } from "preact-router";
import { useEffect, useRef, useState } from "preact/hooks";
import { useBackendContext } from "../../context/backend.js";
-import { useTranslationContext } from "../../context/translation.js";
+import { useTranslationContext } from "@gnu-taler/web-util/lib/index.browser";
import { BackendStateHandler } from "../../hooks/backend.js";
import { bankUiSettings } from "../../settings.js";
import { getBankBackendBaseUrl, undefinedIfEmpty } from "../../utils.js";
diff --git a/packages/demobank-ui/src/pages/home/PaymentOptions.tsx
b/packages/demobank-ui/src/pages/home/PaymentOptions.tsx
index e442ac2a3..ae876d556 100644
--- a/packages/demobank-ui/src/pages/home/PaymentOptions.tsx
+++ b/packages/demobank-ui/src/pages/home/PaymentOptions.tsx
@@ -16,7 +16,7 @@
import { h, VNode } from "preact";
import { useState } from "preact/hooks";
-import { useTranslationContext } from "../../context/translation.js";
+import { useTranslationContext } from "@gnu-taler/web-util/lib/index.browser";
import { PaytoWireTransferForm } from "./PaytoWireTransferForm.js";
import { WalletWithdrawForm } from "./WalletWithdrawForm.js";
diff --git a/packages/demobank-ui/src/pages/home/PaytoWireTransferForm.tsx
b/packages/demobank-ui/src/pages/home/PaytoWireTransferForm.tsx
index fb2ae3196..36182cd93 100644
--- a/packages/demobank-ui/src/pages/home/PaytoWireTransferForm.tsx
+++ b/packages/demobank-ui/src/pages/home/PaytoWireTransferForm.tsx
@@ -15,7 +15,7 @@
*/
import { Amounts, Logger, parsePaytoUri } from "@gnu-taler/taler-util";
-import { hooks } from "@gnu-taler/web-util/lib/index.browser";
+import { useLocalStorage } from "@gnu-taler/web-util/lib/index.browser";
import { h, VNode } from "preact";
import { StateUpdater, useEffect, useRef, useState } from "preact/hooks";
import { useBackendContext } from "../../context/backend.js";
@@ -23,7 +23,7 @@ import { PageStateType, usePageContext } from
"../../context/pageState.js";
import {
InternationalizationAPI,
useTranslationContext,
-} from "../../context/translation.js";
+} from "@gnu-taler/web-util/lib/index.browser";
import { BackendState } from "../../hooks/backend.js";
import { prepareHeaders, undefinedIfEmpty } from "../../utils.js";
import { ShowInputErrorLabel } from "./ShowInputErrorLabel.js";
@@ -330,7 +330,7 @@ type WireTransferRequestTypeOpt = WireTransferRequestType |
undefined;
function useWireTransferRequestType(
state?: WireTransferRequestType,
): [WireTransferRequestTypeOpt, StateUpdater<WireTransferRequestTypeOpt>] {
- const ret = hooks.useLocalStorage(
+ const ret = useLocalStorage(
"wire-transfer-request-state",
JSON.stringify(state),
);
diff --git a/packages/demobank-ui/src/pages/home/PublicHistoriesPage.tsx
b/packages/demobank-ui/src/pages/home/PublicHistoriesPage.tsx
index a0fb8493b..1577e0dfc 100644
--- a/packages/demobank-ui/src/pages/home/PublicHistoriesPage.tsx
+++ b/packages/demobank-ui/src/pages/home/PublicHistoriesPage.tsx
@@ -15,13 +15,13 @@
*/
import { Logger } from "@gnu-taler/taler-util";
-import { hooks } from "@gnu-taler/web-util/lib/index.browser";
+import { useLocalStorage } from "@gnu-taler/web-util/lib/index.browser";
import { ComponentChildren, Fragment, h, VNode } from "preact";
import { route } from "preact-router";
import { StateUpdater } from "preact/hooks";
import useSWR, { SWRConfig } from "swr";
import { PageStateType, usePageContext } from "../../context/pageState.js";
-import { useTranslationContext } from "../../context/translation.js";
+import { useTranslationContext } from "@gnu-taler/web-util/lib/index.browser";
import { getBankBackendBaseUrl } from "../../utils.js";
import { BankFrame } from "./BankFrame.js";
import { Transactions } from "./Transactions.js";
@@ -169,10 +169,7 @@ function PublicHistories(): VNode {
function useShowPublicAccount(
state?: string,
): [string | undefined, StateUpdater<string | undefined>] {
- const ret = hooks.useLocalStorage(
- "show-public-account",
- JSON.stringify(state),
- );
+ const ret = useLocalStorage("show-public-account", JSON.stringify(state));
const retObj: string | undefined = ret[0] ? JSON.parse(ret[0]) : ret[0];
const retSetter: StateUpdater<string | undefined> = function (val) {
const newVal =
diff --git a/packages/demobank-ui/src/pages/home/QrCodeSection.tsx
b/packages/demobank-ui/src/pages/home/QrCodeSection.tsx
index 4199ead86..531df75bc 100644
--- a/packages/demobank-ui/src/pages/home/QrCodeSection.tsx
+++ b/packages/demobank-ui/src/pages/home/QrCodeSection.tsx
@@ -17,7 +17,7 @@
import { h, VNode } from "preact";
import { useEffect } from "preact/hooks";
import { QR } from "../../components/QR.js";
-import { useTranslationContext } from "../../context/translation.js";
+import { useTranslationContext } from "@gnu-taler/web-util/lib/index.browser";
export function QrCodeSection({
talerWithdrawUri,
diff --git a/packages/demobank-ui/src/pages/home/RegistrationPage.tsx
b/packages/demobank-ui/src/pages/home/RegistrationPage.tsx
index fb7e975fb..c21693885 100644
--- a/packages/demobank-ui/src/pages/home/RegistrationPage.tsx
+++ b/packages/demobank-ui/src/pages/home/RegistrationPage.tsx
@@ -22,7 +22,7 @@ import { PageStateType, usePageContext } from
"../../context/pageState.js";
import {
InternationalizationAPI,
useTranslationContext,
-} from "../../context/translation.js";
+} from "@gnu-taler/web-util/lib/index.browser";
import { BackendStateHandler } from "../../hooks/backend.js";
import { bankUiSettings } from "../../settings.js";
import { getBankBackendBaseUrl, undefinedIfEmpty } from "../../utils.js";
diff --git a/packages/demobank-ui/src/pages/home/Transactions.tsx
b/packages/demobank-ui/src/pages/home/Transactions.tsx
index a00046648..ca88abd4d 100644
--- a/packages/demobank-ui/src/pages/home/Transactions.tsx
+++ b/packages/demobank-ui/src/pages/home/Transactions.tsx
@@ -18,7 +18,7 @@ import { Logger } from "@gnu-taler/taler-util";
import { h, VNode } from "preact";
import { useEffect } from "preact/hooks";
import useSWR from "swr";
-import { useTranslationContext } from "../../context/translation.js";
+import { useTranslationContext } from "@gnu-taler/web-util/lib/index.browser";
const logger = new Logger("Transactions");
/**
diff --git a/packages/demobank-ui/src/pages/home/WalletWithdrawForm.tsx
b/packages/demobank-ui/src/pages/home/WalletWithdrawForm.tsx
index 5304b6273..440d16c6c 100644
--- a/packages/demobank-ui/src/pages/home/WalletWithdrawForm.tsx
+++ b/packages/demobank-ui/src/pages/home/WalletWithdrawForm.tsx
@@ -22,7 +22,7 @@ import { PageStateType, usePageContext } from
"../../context/pageState.js";
import {
InternationalizationAPI,
useTranslationContext,
-} from "../../context/translation.js";
+} from "@gnu-taler/web-util/lib/index.browser";
import { BackendState } from "../../hooks/backend.js";
import { prepareHeaders, validateAmount } from "../../utils.js";
diff --git
a/packages/demobank-ui/src/pages/home/WithdrawalConfirmationQuestion.tsx
b/packages/demobank-ui/src/pages/home/WithdrawalConfirmationQuestion.tsx
index 0d52bbbf0..693f85bcd 100644
--- a/packages/demobank-ui/src/pages/home/WithdrawalConfirmationQuestion.tsx
+++ b/packages/demobank-ui/src/pages/home/WithdrawalConfirmationQuestion.tsx
@@ -22,7 +22,7 @@ import { PageStateType, usePageContext } from
"../../context/pageState.js";
import {
InternationalizationAPI,
useTranslationContext,
-} from "../../context/translation.js";
+} from "@gnu-taler/web-util/lib/index.browser";
import { BackendState } from "../../hooks/backend.js";
import { prepareHeaders } from "../../utils.js";
diff --git a/packages/demobank-ui/src/pages/home/WithdrawalQRCode.tsx
b/packages/demobank-ui/src/pages/home/WithdrawalQRCode.tsx
index f7b059816..978d3a840 100644
--- a/packages/demobank-ui/src/pages/home/WithdrawalQRCode.tsx
+++ b/packages/demobank-ui/src/pages/home/WithdrawalQRCode.tsx
@@ -18,7 +18,7 @@ import { Logger } from "@gnu-taler/taler-util";
import { Fragment, h, VNode } from "preact";
import useSWR from "swr";
import { PageStateType, usePageContext } from "../../context/pageState.js";
-import { useTranslationContext } from "../../context/translation.js";
+import { useTranslationContext } from "@gnu-taler/web-util/lib/index.browser";
import { QrCodeSection } from "./QrCodeSection.js";
import { WithdrawalConfirmationQuestion } from
"./WithdrawalConfirmationQuestion.js";
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.