gnunet-svn
[Top][All Lists]
Advanced

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

[taler-merchant-backoffice] branch master updated (3e3c9d3 -> 47e67eb)


From: gnunet
Subject: [taler-merchant-backoffice] branch master updated (3e3c9d3 -> 47e67eb)
Date: Mon, 24 May 2021 15:06:36 +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 3e3c9d3  capitalize ‘english’
     new 90b71f3  add small section "Documentation Conventions" in DESIGN.md
     new 47e67eb  downcase first word in tooltip (13 instances)

The 2 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                                          |  6 +++++
 .../paths/instance/orders/details/DetailPage.tsx   | 26 +++++++++++-----------
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/DESIGN.md b/DESIGN.md
index b079ea4..a6372f4 100644
--- a/DESIGN.md
+++ b/DESIGN.md
@@ -181,3 +181,9 @@ Every non translated message should be written in English 
and wrapped into:
 Makefile has a i18n that will parse source files and update the po template.
 When *.po are updated, running the i18n target will create the strings.ts that
 the application will use in runtime.
+
+# Documentation Conventions
+
+* tooltips
+  * begin w/ a lower case letter
+  * do not end w/ punctuation (period)
diff --git a/packages/frontend/src/paths/instance/orders/details/DetailPage.tsx 
b/packages/frontend/src/paths/instance/orders/details/DetailPage.tsx
index d8dbe0f..1d0950a 100644
--- a/packages/frontend/src/paths/instance/orders/details/DetailPage.tsx
+++ b/packages/frontend/src/paths/instance/orders/details/DetailPage.tsx
@@ -312,26 +312,26 @@ function PaidPage({ id, order, onRefund }: { id: string; 
order: MerchantBackend.
               <div class="column is-12" >
                 <div class="title"><Translate>Contract Terms</Translate></div>
                 <FormProvider<CT> object={value.contract_terms} 
valueHandler={null} >
-                  <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`} />
+                  <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`the 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`} />
-                  <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="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`} />
+                  <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`} />
+                  <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="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 &&
                     <InputGroup name="delivery_location" 
label={i18n`Location`} tooltip={i18n`where the order will be delivered`} >
                       <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`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`} />
                 </FormProvider>
               </div>
               <div class="column" />

-- 
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]