[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-merchant-backoffice] branch master updated (47e67eb -> 4a0c661)
From: |
gnunet |
Subject: |
[taler-merchant-backoffice] branch master updated (47e67eb -> 4a0c661) |
Date: |
Mon, 24 May 2021 15:34:41 +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 47e67eb downcase first word in tooltip (13 instances)
new c2cbb55 diction: s/into/to/
new f8055fd fix typo: s/exists/exist/
new 4ff83f3 grammar: s/being sell/being sold/
new 91d8382 fix typo: s/payed/paid/
new af7f172 diction: s/is going to be delivered/delivery required/
new 95a9563 diction: s/payed/payment/
new e21111e fix typo: s/product/products/
new 7f3261e drop superfluous "specifies for"
new f62b570 fix typo: s/fronted/frontend/
new 3891243 diction: s/other to change/others from changing/
new 0b706be fix typo: s/override/overridden/ (five instances)
new 62f0b13 fix typo: s/doest/does/ (two instances)
new 9813407 grammar: s/physical/physically/
new 7ffbb57 grammar: s/legal/legally/
new 94953d1 change two instances of ‘overridden’ back to ‘override’
new e659b0b diction: s/token in curently use/token currently in use/
new 5590309 add hyphen
new c9d81e6 add another point to the tooltips Documentation Conventions
new 4a0c661 drop leading "the" in tooltip text (three instances)
The 19 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:
DESIGN.md | 1 +
packages/frontend/src/components/modal/index.tsx | 2 +-
.../frontend/src/components/product/ProductForm.tsx | 4 ++--
.../frontend/src/paths/admin/create/CreatePage.tsx | 18 +++++++++---------
.../src/paths/instance/orders/create/CreatePage.tsx | 12 ++++++------
.../instance/orders/create/InventoryProductForm.tsx | 4 ++--
.../instance/orders/create/NonInventoryProductForm.tsx | 2 +-
.../src/paths/instance/orders/details/DetailPage.tsx | 6 +++---
.../src/paths/instance/products/list/Table.tsx | 4 ++--
9 files changed, 27 insertions(+), 26 deletions(-)
diff --git a/DESIGN.md b/DESIGN.md
index a6372f4..e5b7bb7 100644
--- a/DESIGN.md
+++ b/DESIGN.md
@@ -187,3 +187,4 @@ the application will use in runtime.
* tooltips
* begin w/ a lower case letter
* do not end w/ punctuation (period)
+ * avoid leading article ("a", "an", "the")
diff --git a/packages/frontend/src/components/modal/index.tsx
b/packages/frontend/src/components/modal/index.tsx
index 8229dde..44b103c 100644
--- a/packages/frontend/src/components/modal/index.tsx
+++ b/packages/frontend/src/components/modal/index.tsx
@@ -143,7 +143,7 @@ export function UpdateTokenModal({ element, onCancel,
onClear, onConfirm, oldTok
>
<p>{text}</p>
<FormProvider errors={errors} object={form} valueHandler={setValue}>
- <Input name="old_token" label={i18n`Old token`} tooltip={i18n`token in
currently use`} />
+ <Input name="old_token" label={i18n`Old token`} tooltip={i18n`token
currently in use`} />
<Input name="new_token" label={i18n`New token`} tooltip={i18n`next token
to be used`} />
</FormProvider>
<p><Translate>Clearing the auth token will mean public access to the
instance</Translate></p>
diff --git a/packages/frontend/src/components/product/ProductForm.tsx
b/packages/frontend/src/components/product/ProductForm.tsx
index 5ff77c2..2729247 100644
--- a/packages/frontend/src/components/product/ProductForm.tsx
+++ b/packages/frontend/src/components/product/ProductForm.tsx
@@ -98,11 +98,11 @@ export function ProductForm({ onSubscribe, initial,
alreadyExist, }: Props) {
{alreadyExist ? undefined : <InputWithAddon<Entity> name="product_id"
addonBefore={`${backend.url}/product/`} label={i18n`ID`} tooltip={i18n`unique
name identification`} />}
<InputImage<Entity> name="image" label={i18n`Image`} tooltip={i18n`photo
of the product`} />
- <Input<Entity> name="description" inputType="multiline"
label={i18n`Description`} tooltip={i18n`full length description`} />
+ <Input<Entity> name="description" inputType="multiline"
label={i18n`Description`} tooltip={i18n`full-length description`} />
<Input<Entity> name="unit" label={i18n`Unit`} tooltip={i18n`name of the
product unit`} />
<InputCurrency<Entity> name="price" label={i18n`Price`}
tooltip={i18n`amount in the current currency`} />
- <InputStock name="stock" label={i18n`Stock`} alreadyExist={alreadyExist}
tooltip={i18n`the stock of the product can be managed or infinite`} />
+ <InputStock name="stock" label={i18n`Stock`} alreadyExist={alreadyExist}
tooltip={i18n`stock of the product can be managed or infinite`} />
<InputTaxes<Entity> name="taxes" label={i18n`Taxes`} tooltip={i18n`taxes
for this product`} />
diff --git a/packages/frontend/src/paths/admin/create/CreatePage.tsx
b/packages/frontend/src/paths/admin/create/CreatePage.tsx
index 61d7690..2984ea9 100644
--- a/packages/frontend/src/paths/admin/create/CreatePage.tsx
+++ b/packages/frontend/src/paths/admin/create/CreatePage.tsx
@@ -90,27 +90,27 @@ export function CreatePage({ onCreate, onBack, forceId }:
Props): VNode {
<Input<Entity> name="name" label={i18n`Name`}
tooltip={i18n`descriptive name`} />
- <InputSecured<Entity> name="auth_token" label={i18n`Auth token`}
tooltip={i18n`useful to prevent other to change the instance configuration`} />
+ <InputSecured<Entity> name="auth_token" label={i18n`Auth token`}
tooltip={i18n`useful to prevent others from changing the instance
configuration`} />
<InputPayto<Entity> name="payto_uris" label={i18n`Account
address`} help="x-taler-bank/bank.taler:5882/blogger" tooltip={i18n`where the
money will be sent`} />
- <InputCurrency<Entity> name="default_max_deposit_fee"
label={i18n`Default max deposit fee`} tooltip={i18n`max deposit fee when an
order has not override it`} />
+ <InputCurrency<Entity> name="default_max_deposit_fee"
label={i18n`Default max deposit fee`} tooltip={i18n`max deposit fee when an
order has not overridden it`} />
- <InputCurrency<Entity> name="default_max_wire_fee"
label={i18n`Default max wire fee`} tooltip={i18n`max wire fee when the order
has not override it`} />
+ <InputCurrency<Entity> name="default_max_wire_fee"
label={i18n`Default max wire fee`} tooltip={i18n`max wire fee when the order
has not overridden it`} />
- <Input<Entity> name="default_wire_fee_amortization"
label={i18n`Default wire fee amortization`} tooltip={i18n`max wire fee
amortization when the order has not override it`} />
+ <Input<Entity> name="default_wire_fee_amortization"
label={i18n`Default wire fee amortization`} tooltip={i18n`max wire fee
amortization when the order has not overridden it`} />
- <InputGroup name="address" label={i18n`Address`}
tooltip={i18n`where is the merchant physical located`}>
+ <InputGroup name="address" label={i18n`Address`}
tooltip={i18n`where is the merchant physically located`}>
<InputLocation name="address" />
</InputGroup>
- <InputGroup name="jurisdiction" label={i18n`Jurisdiction`}
tooltip={i18n`where is the merchant legal located`}>
+ <InputGroup name="jurisdiction" label={i18n`Jurisdiction`}
tooltip={i18n`where is the merchant legally located`}>
<InputLocation name="jurisdiction" />
</InputGroup>
- <InputDuration<Entity> name="default_pay_delay"
label={i18n`Default pay delay`} tooltip={i18n`max time to pay if the order
doest not override it`} />
+ <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_wire_transfer_delay"
label={i18n`Default wire transfer delay`} tooltip={i18n`min time to wait the
transfer if the merchant doest 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`} />
</FormProvider>
@@ -125,4 +125,4 @@ export function CreatePage({ onCreate, onBack, forceId }:
Props): VNode {
</section>
</div>
-}
\ No newline at end of file
+}
diff --git a/packages/frontend/src/paths/instance/orders/create/CreatePage.tsx
b/packages/frontend/src/paths/instance/orders/create/CreatePage.tsx
index f760fd4..933b999 100644
--- a/packages/frontend/src/paths/instance/orders/create/CreatePage.tsx
+++ b/packages/frontend/src/paths/instance/orders/create/CreatePage.tsx
@@ -232,7 +232,7 @@ export function CreatePage({ onCreate, onBack }: Props):
VNode {
in {inventoryList.reduce((prev, cur) => cur.quantity + prev, 0)}
units,
with a total price of {totalPriceInventory}
</p>
- } tooltip={i18n`add products to the order that already exists in the
inventory`}>
+ } tooltip={i18n`add products to the order that already exist in the
inventory`}>
<InventoryProductForm
currentProducts={value.inventoryProducts}
onAddProduct={addProductToTheInventoryList}
@@ -288,14 +288,14 @@ export function CreatePage({ onCreate, onBack }: Props):
VNode {
<InputCurrency name="pricing.order_price" label={i18n`Order
price`} tooltip={i18n`final order price`} />
}
- <Input name="pricing.summary" inputType="multiline"
label={i18n`Summary`} tooltip={i18n`description of what is being sell`} />
+ <Input name="pricing.summary" inputType="multiline"
label={i18n`Summary`} tooltip={i18n`description of what is being sold`} />
<InputGroup name="payments" label={i18n`Payments options`}
tooltip={i18n`override default payment configuration for this order`}>
<InputDate name="payments.auto_refund_deadline" label={i18n`Auto
refund deadline`} tooltip={i18n`time until the order will be refunded
automatically`} />
<InputDate name="payments.refund_deadline" label={i18n`Refund
deadline`} tooltip={i18n`time until the order can be refunded`} />
- <InputDate name="payments.pay_deadline" label={i18n`Pay
deadline`} tooltip={i18n`time until the order can be payed`} />
+ <InputDate name="payments.pay_deadline" label={i18n`Pay
deadline`} tooltip={i18n`time until the order can be paid`} />
- <InputDate name="payments.delivery_date" label={i18n`Delivery
date`} tooltip={i18n`when the order will be delivered, if is going to be
delivered`} />
+ <InputDate name="payments.delivery_date" label={i18n`Delivery
date`} tooltip={i18n`when the order will be delivered, if delivery required`} />
{value.payments.delivery_date && <InputGroup
name="payments.delivery_location" label={i18n`Location`} tooltip={i18n`where
the order will be delivered`} >
<InputLocation name="payments.delivery_location" />
</InputGroup>}
@@ -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 payed`} />
+ <Input name="payments.fullfilment_url" label={i18n`Fullfilment
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`}>
@@ -334,4 +334,4 @@ function asProduct(p: ProductAndQuantity) {
description: p.product.description,
taxes: p.product.taxes
})
-}
\ No newline at end of file
+}
diff --git
a/packages/frontend/src/paths/instance/orders/create/InventoryProductForm.tsx
b/packages/frontend/src/paths/instance/orders/create/InventoryProductForm.tsx
index abb88c5..5bb69f1 100644
---
a/packages/frontend/src/paths/instance/orders/create/InventoryProductForm.tsx
+++
b/packages/frontend/src/paths/instance/orders/create/InventoryProductForm.tsx
@@ -73,9 +73,9 @@ export function InventoryProductForm({ currentProducts,
onAddProduct }: Props):
return <FormProvider<Form> errors={errors} object={state}
valueHandler={setState}>
<InputSearchProduct selected={state.product} onChange={(p) => setState(v
=> ({ ...v, product: p }))} />
- <InputNumber<Form> name="quantity" label={i18n`Quantity`}
tooltip={i18n`how many product will be added`} />
+ <InputNumber<Form> name="quantity" label={i18n`Quantity`}
tooltip={i18n`how many products will be added`} />
<div class="buttons is-right mt-5">
<button class="button is-success"
onClick={submit}><Translate>Add</Translate></button>
</div>
</FormProvider>
-}
\ No newline at end of file
+}
diff --git
a/packages/frontend/src/paths/instance/orders/create/NonInventoryProductForm.tsx
b/packages/frontend/src/paths/instance/orders/create/NonInventoryProductForm.tsx
index 4429fb7..967f1cb 100644
---
a/packages/frontend/src/paths/instance/orders/create/NonInventoryProductForm.tsx
+++
b/packages/frontend/src/paths/instance/orders/create/NonInventoryProductForm.tsx
@@ -122,7 +122,7 @@ export function ProductForm({ onSubscribe, initial }:
ProductProps) {
<InputImage<NonInventoryProduct> name="image" label={i18n`Image`}
tooltip={i18n`photo of the product`} />
<Input<NonInventoryProduct> name="description" inputType="multiline"
label={i18n`Description`} tooltip={i18n`full product description`} />
<Input<NonInventoryProduct> name="unit" label={i18n`Unit`}
tooltip={i18n`name of the product unit`} />
- <InputCurrency<NonInventoryProduct> name="price" label={i18n`Price`}
tooltip={i18n`the amount in the current currency`} />
+ <InputCurrency<NonInventoryProduct> name="price" label={i18n`Price`}
tooltip={i18n`amount in the current currency`} />
<InputNumber<NonInventoryProduct> name="quantity" label={i18n`Quantity`}
tooltip={i18n`how many products will be added`} />
diff --git a/packages/frontend/src/paths/instance/orders/details/DetailPage.tsx
b/packages/frontend/src/paths/instance/orders/details/DetailPage.tsx
index 1d0950a..4ceb315 100644
--- a/packages/frontend/src/paths/instance/orders/details/DetailPage.tsx
+++ b/packages/frontend/src/paths/instance/orders/details/DetailPage.tsx
@@ -315,7 +315,7 @@ function PaidPage({ id, order, onRefund }: { id: string;
order: MerchantBackend.
<Input<CT> readonly name="summary" label={i18n`Summary`}
tooltip={i18n`human-readable description of the whole purchase`} />
<InputCurrency<CT> readonly name="amount"
label={i18n`Amount`} tooltip={i18n`total price for the transaction`} />
{value.contract_terms.fulfillment_url &&
- <Input<CT> readonly name="fulfillment_url"
label={i18n`Fulfillment URL`} tooltip={i18n`the URL for this purchase`} />
+ <Input<CT> readonly name="fulfillment_url"
label={i18n`Fulfillment URL`} tooltip={i18n`URL for this purchase`} />
}
<Input<CT> readonly name="max_fee" label={i18n`Max fee`}
tooltip={i18n`maximum total deposit fee accepted by the merchant for this
contract`} />
<Input<CT> readonly name="max_wire_fee" label={i18n`Max wire
fee`} tooltip={i18n`maximum wire fee accepted by the merchant`} />
@@ -330,8 +330,8 @@ 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`specifies for 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 fronted`} />
+ <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>
<div class="column" />
diff --git a/packages/frontend/src/paths/instance/products/list/Table.tsx
b/packages/frontend/src/paths/instance/products/list/Table.tsx
index 7f07cb6..85e5ce4 100644
--- a/packages/frontend/src/paths/instance/products/list/Table.tsx
+++ b/packages/frontend/src/paths/instance/products/list/Table.tsx
@@ -201,7 +201,7 @@ function FastProductWithManagedStockUpdateForm({ product,
onUpdate, onCancel }:
return <Fragment>
<FormProvider<FastProductUpdate> name="added" errors={errors}
object={value} valueHandler={valueHandler as any} >
- <InputNumber<FastProductUpdate> name="incoming" label={i18n`Incoming`}
tooltip={i18n`add more elements into the inventory`} />
+ <InputNumber<FastProductUpdate> name="incoming" label={i18n`Incoming`}
tooltip={i18n`add more elements to the inventory`} />
<InputNumber<FastProductUpdate> name="lost" label={i18n`Lost`}
tooltip={i18n`report elements lost in the inventory`} />
<div class="field is-horizontal">
<div class="field-label is-normal" />
@@ -256,4 +256,4 @@ function difference(price: string, tax: number) {
}
function sum(taxes: MerchantBackend.Tax[]) {
return taxes.reduce((p, c) => p + parseInt(c.tax.split(':')[1], 10), 0)
-}
\ No newline at end of file
+}
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [taler-merchant-backoffice] branch master updated (47e67eb -> 4a0c661),
gnunet <=
- [taler-merchant-backoffice] 03/19: grammar: s/being sell/being sold/, gnunet, 2021/05/24
- [taler-merchant-backoffice] 01/19: diction: s/into/to/, gnunet, 2021/05/24
- [taler-merchant-backoffice] 02/19: fix typo: s/exists/exist/, gnunet, 2021/05/24
- [taler-merchant-backoffice] 09/19: fix typo: s/fronted/frontend/, gnunet, 2021/05/24
- [taler-merchant-backoffice] 06/19: diction: s/payed/payment/, gnunet, 2021/05/24
- [taler-merchant-backoffice] 08/19: drop superfluous "specifies for", gnunet, 2021/05/24
- [taler-merchant-backoffice] 07/19: fix typo: s/product/products/, gnunet, 2021/05/24
- [taler-merchant-backoffice] 05/19: diction: s/is going to be delivered/delivery required/, gnunet, 2021/05/24
- [taler-merchant-backoffice] 04/19: fix typo: s/payed/paid/, gnunet, 2021/05/24
- [taler-merchant-backoffice] 10/19: diction: s/other to change/others from changing/, gnunet, 2021/05/24