[taler-merchant-backoffice] branch master updated (a386113 -> d72c350)

[gnunet]

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

ttn pushed a change to branch master
in repository merchant-backoffice.

    from a386113  add notes on "labels" to Documentation Conventions
     new 202a767  remove superfluous blank line
     new 9b6df0b  diction: s/pay/payment/
     new 051550d  s/Payments/Payment/
     new 3419f9b  add hyphen
     new 4ea3e26  s/Pay/Payment/
     new d72c350  s/Pay/Payment/

The 6 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/paths/instance/orders/create/CreatePage.tsx  | 6 +++---
 packages/frontend/src/paths/instance/orders/details/DetailPage.tsx | 2 +-
 packages/frontend/src/paths/instance/update/UpdatePage.tsx         | 2 +-
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/DESIGN.md b/DESIGN.md
index 5e2ea82..e20c8c3 100644
--- a/DESIGN.md
+++ b/DESIGN.md
@@ -187,7 +187,6 @@ the application will use in runtime.
 * labels
   * begin w/ a capital letter
   * acronyms (e.g., "URL") are upper case
-
 * tooltips
   * begin w/ a lower case letter
   * do not end w/ punctuation (period)
diff --git a/packages/frontend/src/paths/instance/orders/create/CreatePage.tsx 
b/packages/frontend/src/paths/instance/orders/create/CreatePage.tsx
index f00995c..140d0c5 100644
--- a/packages/frontend/src/paths/instance/orders/create/CreatePage.tsx
+++ b/packages/frontend/src/paths/instance/orders/create/CreatePage.tsx
@@ -290,10 +290,10 @@ export function CreatePage({ onCreate, onBack }: Props): 
VNode {
 
             <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`} />
+            <InputGroup name="payments" label={i18n`Payment 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 paid`} />
+              <InputDate name="payments.pay_deadline" label={i18n`Payment 
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 delivery required`} />
               {value.payments.delivery_date && <InputGroup 
name="payments.delivery_location" label={i18n`Location`} tooltip={i18n`where 
the order will be delivered`} >
diff --git a/packages/frontend/src/paths/instance/orders/details/DetailPage.tsx 
b/packages/frontend/src/paths/instance/orders/details/DetailPage.tsx
index bd27e26..be05b43 100644
--- a/packages/frontend/src/paths/instance/orders/details/DetailPage.tsx
+++ b/packages/frontend/src/paths/instance/orders/details/DetailPage.tsx
@@ -398,7 +398,7 @@ function UnpaidPage({ id, order }: { id: string; order: 
MerchantBackend.Orders.C
           <FormProvider<Unpaid> object={value} valueHandler={valueHandler} >
             <Input<Unpaid> name="order_status" readonly label={i18n`Order 
status`} />
             <Input<Unpaid> name="order_status_url" readonly label={i18n`Order 
status URL`} />
-            <Input<Unpaid> name="taler_pay_uri" readonly label={i18n`Pay URI`} 
/>
+            <Input<Unpaid> name="taler_pay_uri" readonly label={i18n`Payment 
URI`} />
           </FormProvider>
         </div>
         <div class="column" />
diff --git a/packages/frontend/src/paths/instance/update/UpdatePage.tsx 
b/packages/frontend/src/paths/instance/update/UpdatePage.tsx
index 975cb7c..9d6777f 100644
--- a/packages/frontend/src/paths/instance/update/UpdatePage.tsx
+++ b/packages/frontend/src/paths/instance/update/UpdatePage.tsx
@@ -126,7 +126,7 @@ export function UpdatePage({ onUpdate, selected, onBack }: 
Props): VNode {
               <InputLocation name="jurisdiction" />
             </InputGroup>
 
-            <InputDuration<Entity> name="default_pay_delay" 
label={i18n`Default pay delay`} />
+            <InputDuration<Entity> name="default_pay_delay" 
label={i18n`Default payment delay`} />
 
             <InputDuration<Entity> name="default_wire_transfer_delay" 
label={i18n`Default wire transfer delay`} />
 

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