gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[taler-wallet-core] branch master updated: -fix typos


From: gnunet
Subject: [taler-wallet-core] branch master updated: -fix typos
Date: Thu, 03 Nov 2022 20:12:37 +0100

This is an automated email from the git hooks/post-receive script.

grothoff pushed a commit to branch master
in repository wallet-core.

The following commit(s) were added to refs/heads/master by this push:
     new d00f7a4a0 -fix typos
d00f7a4a0 is described below

commit d00f7a4a0187b61257d9ff5703dfb4245d50eece
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Thu Nov 3 20:12:32 2022 +0100

    -fix typos
---
 build-system/taler-build-scripts                           |  2 +-
 packages/demobank-ui/src/i18n/bank.pot                     |  2 +-
 packages/merchant-backend-ui/README.md                     | 12 +++++-------
 packages/merchant-backend-ui/src/utils/amount.ts           | 14 +++++++-------
 packages/merchant-backend-ui/src/utils/table.ts            |  4 ++--
 .../src/paths/admin/list/TableActive.tsx                   |  6 ++----
 packages/merchant-backoffice-ui/src/utils/amount.ts        | 14 +++++++-------
 packages/merchant-backoffice-ui/src/utils/table.ts         |  4 ++--
 .../tests/hooks/notification.test.ts                       |  2 +-
 packages/taler-util/src/wallet-types.ts                    |  2 +-
 10 files changed, 29 insertions(+), 33 deletions(-)

diff --git a/build-system/taler-build-scripts b/build-system/taler-build-scripts
index 23538677f..355a31726 160000
--- a/build-system/taler-build-scripts
+++ b/build-system/taler-build-scripts
@@ -1 +1 @@
-Subproject commit 23538677f6c6be2a62f38dc6137ecdd1c76b7b15
+Subproject commit 355a3172699b96f1040edcb577c07a681802b3ae
diff --git a/packages/demobank-ui/src/i18n/bank.pot 
b/packages/demobank-ui/src/i18n/bank.pot
index dcaba009d..862aa4d97 100644
--- a/packages/demobank-ui/src/i18n/bank.pot
+++ b/packages/demobank-ui/src/i18n/bank.pot
@@ -78,7 +78,7 @@ msgstr ""
 
 #: /home/job/backoffice/packages/bank/src/pages/home/index.tsx:1026
 #, c-format
-msgid "Waiting the bank to create the operaion..."
+msgid "Waiting the bank to create the operation..."
 msgstr ""
 
 #: /home/job/backoffice/packages/bank/src/pages/home/index.tsx:1044
diff --git a/packages/merchant-backend-ui/README.md 
b/packages/merchant-backend-ui/README.md
index 16cbd0b9a..44a555ae0 100644
--- a/packages/merchant-backend-ui/README.md
+++ b/packages/merchant-backend-ui/README.md
@@ -10,9 +10,9 @@ This project generate 5 templates for the merchant backend:
  * RequestPayment
  * ShowOrderDetails
 
-This pages are to be serve from the merchant-backend service and will be 
queried for browser that may or may not have javascript enabled, so we are 
going to do server side rendering.
-The merchant-backend service is currently supporting mustache library for 
server side rendering. 
-We also want the be able to create a more interactive design if the browser 
have javascript enabled, so the pages will be serve with all the infromation in 
the html but also in javascript.
+This pages are to be serve from the merchant-backend service and will be 
queried for browser that may or may not have JavaScript enabled, so we are 
going to do server side rendering.
+The merchant-backend service is currently supporting mustache library for 
server side rendering.
+We also want the be able to create a more interactive design if the browser 
have JavaScript enabled, so the pages will be serve with all the information in 
the HTML but also in JavaScript.
 
 In this scenario, we are using jsx to build the template of the page that will 
be build-time rendered into the mustache template. This template can the be 
deployed into a merchant-backend that will complete the information before send 
it to the browser.
 
@@ -22,9 +22,7 @@ The building process can be executed with `pnpm build`
 
 # Testing
 
-This project is using a javascript implementation of mustache that can be 
executed with the command `pnpm render-examples`.
+This project is using a JavaScript implementation of mustache that can be 
executed with the command `pnpm render-examples`.
 This script will take the pages previously built in `dist/pages` directory and 
the examples definition in the `src/pages/[exampleName].examples.ts` files and 
render a to-be-sent-to-the-user page like the merchant would do.
 This examples will be saved invidivualy into directory `dist/examples` and 
should be opened with your testing browser.
-Testing should be done with javascript enabled and javascript disabled, both 
should look ok. 
-
-
+Testing should be done with JavaScript enabled and JavaScript disabled, both 
should look ok.
diff --git a/packages/merchant-backend-ui/src/utils/amount.ts 
b/packages/merchant-backend-ui/src/utils/amount.ts
index 85f230427..a54c52abe 100644
--- a/packages/merchant-backend-ui/src/utils/amount.ts
+++ b/packages/merchant-backend-ui/src/utils/amount.ts
@@ -17,10 +17,10 @@ import { amountFractionalBase, AmountJson, Amounts } from 
"@gnu-taler/taler-util
 import { MerchantBackend } from "../declaration";
 
 /**
- * sums two prices, 
- * @param one 
- * @param two 
- * @returns 
+ * sums two prices,
+ * @param one
+ * @param two
+ * @returns
  */
 const sumPrices = (one: string, two: string) => {
   const [currency, valueOne] = one.split(':')
@@ -30,7 +30,7 @@ const sumPrices = (one: string, two: string) => {
 
 /**
  * merge refund with the same description and a difference less than one minute
- * @param prev list of refunds that will hold the merged refunds 
+ * @param prev list of refunds that will hold the merged refunds
  * @param cur new refund to add to the list
  * @returns list with the new refund, may be merged with the last
  */
@@ -38,8 +38,8 @@ export function mergeRefunds(prev: 
MerchantBackend.Orders.RefundDetails[], cur:
   let tail;
 
   if (prev.length === 0 ||  //empty list
-    cur.timestamp.t_s === 'never' || //current doesnt have timestamp
-    (tail = prev[prev.length - 1]).timestamp.t_s === 'never' || // last doesnt 
have timestamp
+    cur.timestamp.t_s === 'never' || //current does not have timestamp
+    (tail = prev[prev.length - 1]).timestamp.t_s === 'never' || // last does 
not have timestamp
     cur.reason !== tail.reason || //different reason
     Math.abs(cur.timestamp.t_s - tail.timestamp.t_s) > 1000 * 60) {//more than 
1 minute difference
 
diff --git a/packages/merchant-backend-ui/src/utils/table.ts 
b/packages/merchant-backend-ui/src/utils/table.ts
index 3d713a6f7..198c46543 100644
--- a/packages/merchant-backend-ui/src/utils/table.ts
+++ b/packages/merchant-backend-ui/src/utils/table.ts
@@ -30,8 +30,8 @@ function notEmpty<TValue>(value: TValue | null | undefined): 
value is TValue {
   return value !== null && value !== undefined;
 }
 
-export function buildActions<T extends WithId>(intances: T[], selected: 
string[], action: 'DELETE'): Actions<T>[] {
-  return selected.map(id => intances.find(i => i.id === id))
+export function buildActions<T extends WithId>(instances: T[], selected: 
string[], action: 'DELETE'): Actions<T>[] {
+  return selected.map(id => instances.find(i => i.id === id))
     .filter(notEmpty)
     .map(id => ({ element: id, type: action }))
 }
diff --git 
a/packages/merchant-backoffice-ui/src/paths/admin/list/TableActive.tsx 
b/packages/merchant-backoffice-ui/src/paths/admin/list/TableActive.tsx
index 928658910..56b3f299c 100644
--- a/packages/merchant-backoffice-ui/src/paths/admin/list/TableActive.tsx
+++ b/packages/merchant-backoffice-ui/src/paths/admin/list/TableActive.tsx
@@ -175,10 +175,8 @@ function notEmpty<TValue>(value: TValue | null | 
undefined): value is TValue {
   return value !== null && value !== undefined;
 }
 
-function buildActions(intances: MerchantBackend.Instances.Instance[], 
selected: string[], action: 'DELETE'): Actions[] {
-  return selected.map(id => intances.find(i => i.id === id))
+function buildActions(instances: MerchantBackend.Instances.Instance[], 
selected: string[], action: 'DELETE'): Actions[] {
+  return selected.map(id => instances.find(i => i.id === id))
     .filter(notEmpty)
     .map(id => ({ element: id, type: action }))
 }
-
-
diff --git a/packages/merchant-backoffice-ui/src/utils/amount.ts 
b/packages/merchant-backoffice-ui/src/utils/amount.ts
index 61e33129c..1cfd5c1d1 100644
--- a/packages/merchant-backoffice-ui/src/utils/amount.ts
+++ b/packages/merchant-backoffice-ui/src/utils/amount.ts
@@ -17,10 +17,10 @@ import { amountFractionalBase, AmountJson, Amounts } from 
"@gnu-taler/taler-util
 import { MerchantBackend } from "../declaration";
 
 /**
- * sums two prices, 
- * @param one 
- * @param two 
- * @returns 
+ * sums two prices,
+ * @param one
+ * @param two
+ * @returns
  */
 const sumPrices = (one: string, two: string) => {
   const [currency, valueOne] = one.split(':')
@@ -30,7 +30,7 @@ const sumPrices = (one: string, two: string) => {
 
 /**
  * merge refund with the same description and a difference less than one minute
- * @param prev list of refunds that will hold the merged refunds 
+ * @param prev list of refunds that will hold the merged refunds
  * @param cur new refund to add to the list
  * @returns list with the new refund, may be merged with the last
  */
@@ -38,8 +38,8 @@ export function mergeRefunds(prev: 
MerchantBackend.Orders.RefundDetails[], cur:
   let tail;
 
   if (prev.length === 0 ||  //empty list
-    cur.timestamp.t_s === 'never' || //current doesnt have timestamp
-    (tail = prev[prev.length - 1]).timestamp.t_s === 'never' || // last doesnt 
have timestamp
+    cur.timestamp.t_s === 'never' || //current does not have timestamp
+    (tail = prev[prev.length - 1]).timestamp.t_s === 'never' || // last does 
not have timestamp
     cur.reason !== tail.reason || //different reason
     cur.pending !== tail.pending || //different pending state
     Math.abs(cur.timestamp.t_s - tail.timestamp.t_s) > 1000 * 60) {//more than 
1 minute difference
diff --git a/packages/merchant-backoffice-ui/src/utils/table.ts 
b/packages/merchant-backoffice-ui/src/utils/table.ts
index 3d713a6f7..198c46543 100644
--- a/packages/merchant-backoffice-ui/src/utils/table.ts
+++ b/packages/merchant-backoffice-ui/src/utils/table.ts
@@ -30,8 +30,8 @@ function notEmpty<TValue>(value: TValue | null | undefined): 
value is TValue {
   return value !== null && value !== undefined;
 }
 
-export function buildActions<T extends WithId>(intances: T[], selected: 
string[], action: 'DELETE'): Actions<T>[] {
-  return selected.map(id => intances.find(i => i.id === id))
+export function buildActions<T extends WithId>(instances: T[], selected: 
string[], action: 'DELETE'): Actions<T>[] {
+  return selected.map(id => instances.find(i => i.id === id))
     .filter(notEmpty)
     .map(id => ({ element: id, type: action }))
 }
diff --git a/packages/merchant-backoffice-ui/tests/hooks/notification.test.ts 
b/packages/merchant-backoffice-ui/tests/hooks/notification.test.ts
index 6825a825a..561c991ad 100644
--- a/packages/merchant-backoffice-ui/tests/hooks/notification.test.ts
+++ b/packages/merchant-backoffice-ui/tests/hooks/notification.test.ts
@@ -24,7 +24,7 @@ import { useNotifications } from 
'../../src/hooks/notifications';
 
 jest.useFakeTimers()
 
-test('notification should disapear after timeout', () => {
+test('notification should disappear after timeout', () => {
   jest.spyOn(global, 'setTimeout');
 
   const timeout = 1000
diff --git a/packages/taler-util/src/wallet-types.ts 
b/packages/taler-util/src/wallet-types.ts
index 3a366d4e1..daeac73fd 100644
--- a/packages/taler-util/src/wallet-types.ts
+++ b/packages/taler-util/src/wallet-types.ts
@@ -852,7 +852,7 @@ export interface ExchangeListItem {
   permanent: boolean;
 
   /**
-   * Information about the last error that occured when trying
+   * Information about the last error that occurred when trying
    * to update the exchange info.
    */
   lastUpdateErrorInfo?: OperationErrorInfo;

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]