[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-merchant-backoffice] branch master updated (4487319 -> bbe7c92)
From: |
gnunet |
Subject: |
[taler-merchant-backoffice] branch master updated (4487319 -> bbe7c92) |
Date: |
Tue, 25 May 2021 10:30:42 +0200 |
This is an automated email from the git hooks/post-receive script.
ttn pushed a change to branch master
in repository merchant-backoffice.
from 4487319 reword "physically"/"legally" to tooltips (two instances)
new bceb0d5 fix typo: s/Fullfilment url/Fulfillment URL/
new 9227e08 diction: s/Pay/Payment/
new f698a88 add hyphen
new 9dbaa71 diction: s/pay/payment/
new 350a548 capitalize ‘token’
new 48def86 capitalize ‘token’
new bbe7c92 capitalize ‘token’
The 7 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
packages/frontend/src/components/form/InputSecured.stories.tsx | 6 +++---
packages/frontend/src/paths/admin/create/CreatePage.tsx | 2 +-
packages/frontend/src/paths/instance/orders/create/CreatePage.tsx | 2 +-
packages/frontend/src/paths/instance/orders/details/DetailPage.tsx | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/packages/frontend/src/components/form/InputSecured.stories.tsx
b/packages/frontend/src/components/form/InputSecured.stories.tsx
index ef6a2e6..136d412 100644
--- a/packages/frontend/src/components/form/InputSecured.stories.tsx
+++ b/packages/frontend/src/components/form/InputSecured.stories.tsx
@@ -35,14 +35,14 @@ export const InitialValueEmpty = (): VNode => {
const [state, setState] = useState<Partial<T>>({ auth_token: '' })
return <FormProvider<T> object={state} errors={{}} valueHandler={setState}>
Initial value: ''
- <InputSecured<T> name="auth_token" label="token" />
+ <InputSecured<T> name="auth_token" label="Token" />
</FormProvider>
}
export const InitialValueToken = (): VNode => {
const [state, setState] = useState<Partial<T>>({ auth_token: 'token' })
return <FormProvider<T> object={state} errors={{}} valueHandler={setState}>
- <InputSecured<T> name="auth_token" label="token" />
+ <InputSecured<T> name="auth_token" label="Token" />
</FormProvider>
}
@@ -50,6 +50,6 @@ export const InitialValueNull = (): VNode => {
const [state, setState] = useState<Partial<T>>({ auth_token: null })
return <FormProvider<T> object={state} errors={{}} valueHandler={setState}>
Initial value: ''
- <InputSecured<T> name="auth_token" label="token" />
+ <InputSecured<T> name="auth_token" label="Token" />
</FormProvider>
}
diff --git a/packages/frontend/src/paths/admin/create/CreatePage.tsx
b/packages/frontend/src/paths/admin/create/CreatePage.tsx
index b71fcee..4cf4b3c 100644
--- a/packages/frontend/src/paths/admin/create/CreatePage.tsx
+++ b/packages/frontend/src/paths/admin/create/CreatePage.tsx
@@ -108,7 +108,7 @@ export function CreatePage({ onCreate, onBack, forceId }:
Props): VNode {
<InputLocation name="jurisdiction" />
</InputGroup>
- <InputDuration<Entity> name="default_pay_delay"
label={i18n`Default pay delay`} tooltip={i18n`max time to pay if the order does
not override it`} />
+ <InputDuration<Entity> name="default_pay_delay"
label={i18n`Default payment delay`} tooltip={i18n`max time to pay if the order
does not override it`} />
<InputDuration<Entity> name="default_wire_transfer_delay"
label={i18n`Default wire transfer delay`} tooltip={i18n`min time to wait the
transfer if the merchant does not override it`} />
diff --git a/packages/frontend/src/paths/instance/orders/create/CreatePage.tsx
b/packages/frontend/src/paths/instance/orders/create/CreatePage.tsx
index 933b999..f00995c 100644
--- a/packages/frontend/src/paths/instance/orders/create/CreatePage.tsx
+++ b/packages/frontend/src/paths/instance/orders/create/CreatePage.tsx
@@ -303,7 +303,7 @@ export function CreatePage({ onCreate, onBack }: Props):
VNode {
<InputCurrency name="payments.max_fee" label={i18n`Max fee`} />
<InputCurrency name="payments.max_wire_fee" label={i18n`Max wire
fee`} />
<Input name="payments.wire_fee_amortization" label={i18n`Wire
fee amortization`} />
- <Input name="payments.fullfilment_url" label={i18n`Fullfilment
url`} tooltip={i18n`where the user will be redirected after payment`} />
+ <Input name="payments.fullfilment_url" label={i18n`Fulfillment
URL`} tooltip={i18n`where the user will be redirected after payment`} />
</InputGroup>
<InputGroup name="extra" label={i18n`Extra information`}
tooltip={i18n`more information for this order`}>
diff --git a/packages/frontend/src/paths/instance/orders/details/DetailPage.tsx
b/packages/frontend/src/paths/instance/orders/details/DetailPage.tsx
index 4ceb315..bd27e26 100644
--- a/packages/frontend/src/paths/instance/orders/details/DetailPage.tsx
+++ b/packages/frontend/src/paths/instance/orders/details/DetailPage.tsx
@@ -322,7 +322,7 @@ function PaidPage({ id, order, onRefund }: { id: string;
order: MerchantBackend.
<Input<CT> readonly name="wire_fee_amortization"
label={i18n`Wire fee amortization`} tooltip={i18n`over how many customer
transactions does the merchant expect to amortize wire fees on average`} />
<InputDate<CT> readonly name="timestamp" label={i18n`Created
at`} tooltip={i18n`time when this contract was generated`} />
<InputDate<CT> readonly name="refund_deadline"
label={i18n`Refund deadline`} tooltip={i18n`after this deadline has passed no
refunds will be accepted`} />
- <InputDate<CT> readonly name="pay_deadline" label={i18n`Pay
deadline`} tooltip={i18n`after this deadline, the merchant won't accept
payments for the contract`} />
+ <InputDate<CT> readonly name="pay_deadline"
label={i18n`Payment deadline`} tooltip={i18n`after this deadline, the merchant
won't accept payments for the contract`} />
<InputDate<CT> readonly name="wire_transfer_deadline"
label={i18n`Wire transfer deadline`} tooltip={i18n`transfer deadline for the
exchange`} />
<InputDate<CT> readonly name="delivery_date"
label={i18n`Delivery date`} tooltip={i18n`time indicating when the order should
be delivered`} />
{value.contract_terms.delivery_date &&
@@ -330,7 +330,7 @@ function PaidPage({ id, order, onRefund }: { id: string;
order: MerchantBackend.
<InputLocation name="payments.delivery_location" />
</InputGroup>
}
- <InputDuration<CT> readonly name="auto_refund"
label={i18n`Auto refund delay`} tooltip={i18n`how long the wallet should try to
get an automatic refund for the purchase`} />
+ <InputDuration<CT> readonly name="auto_refund"
label={i18n`Auto-refund delay`} tooltip={i18n`how long the wallet should try to
get an automatic refund for the purchase`} />
<Input<CT> readonly name="extra" label={i18n`Extra info`}
tooltip={i18n`extra data that is only interpreted by the merchant frontend`} />
</FormProvider>
</div>
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [taler-merchant-backoffice] branch master updated (4487319 -> bbe7c92),
gnunet <=
- [taler-merchant-backoffice] 03/07: add hyphen, gnunet, 2021/05/25
- [taler-merchant-backoffice] 07/07: capitalize ‘token’, gnunet, 2021/05/25
- [taler-merchant-backoffice] 01/07: fix typo: s/Fullfilment url/Fulfillment URL/, gnunet, 2021/05/25
- [taler-merchant-backoffice] 06/07: capitalize ‘token’, gnunet, 2021/05/25
- [taler-merchant-backoffice] 05/07: capitalize ‘token’, gnunet, 2021/05/25
- [taler-merchant-backoffice] 02/07: diction: s/Pay/Payment/, gnunet, 2021/05/25
- [taler-merchant-backoffice] 04/07: diction: s/pay/payment/, gnunet, 2021/05/25