From 500c677d0c17c6f0948c34c4b318691d3a5ba499 Mon Sep 17 00:00:00 2001
From: Johan Cwiklinski <johan@x-tnd.be>
Date: Tue, 16 Apr 2024 23:19:18 +0200
Subject: [PATCH] Rely on class declared labels on form

---
 galette/lang/galette.pot                      | 52 +++++++----------
 galette/lang/galette_en_US.po                 | 58 ++++++++-----------
 .../lib/Galette/Entity/ScheduledPayment.php   | 10 ++--
 .../pages/scheduledpayment_form.html.twig     | 10 ++--
 4 files changed, 57 insertions(+), 73 deletions(-)

diff --git a/galette/lang/galette.pot b/galette/lang/galette.pot
index 516f0021c..0d6fabcb4 100644
--- a/galette/lang/galette.pot
+++ b/galette/lang/galette.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-04-16 22:53+0200\n"
+"POT-Creation-Date: 2024-04-16 23:19+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -2687,7 +2687,6 @@ msgid "Contribution label"
 msgstr ""
 
 #: ../lib/Galette/Features/Replacements.php:378
-#: ../lib/Galette/Entity/ScheduledPayment.php:638
 #: ../../tempcache/pages/transaction_form.html.twig:237
 #: ../../tempcache/pages/contributions_list.html.twig:408
 #: ../../tempcache/pages/contributions_list.html.twig:668
@@ -2696,7 +2695,6 @@ msgstr ""
 #: ../../tempcache/pages/contributions_types_list.html.twig:106
 #: ../../tempcache/pages/contribution_form.html.twig:260
 #: ../../tempcache/pages/contribution_form.html.twig:411
-#: ../../tempcache/pages/scheduledpayment_form.html.twig:70
 #: ../../tempcache/pages/scheduledpayment_form.html.twig:203
 #: ../../tempcache/pages/scheduledpayments_list.html.twig:208
 #: ../../tempcache/pages/scheduledpayments_list.html.twig:371
@@ -2719,7 +2717,6 @@ msgid "Contribution year"
 msgstr ""
 
 #: ../lib/Galette/Features/Replacements.php:394
-#: ../lib/Galette/Entity/ScheduledPayment.php:646
 #: ../../tempcache/pages/document_form.html.twig:176
 msgid "Comment"
 msgstr ""
@@ -2740,7 +2737,6 @@ msgid "Contribution id"
 msgstr ""
 
 #: ../lib/Galette/Features/Replacements.php:410
-#: ../lib/Galette/Entity/ScheduledPayment.php:626
 #: ../../tempcache/pages/contributions_list.html.twig:408
 #: ../../tempcache/pages/contributions_list.html.twig:674
 #: ../../tempcache/pages/scheduledpayments_list.html.twig:208
@@ -2964,6 +2960,7 @@ msgstr ""
 
 #: ../lib/Galette/Entity/Transaction.php:118
 #: ../lib/Galette/Entity/Contribution.php:213
+#: ../lib/Galette/Entity/ScheduledPayment.php:638
 #: ../../tempcache/pages/contribution_type_form.html.twig:73
 #: ../../tempcache/pages/transaction_form.html.twig:134
 #: ../../tempcache/pages/contribution_form.html.twig:497
@@ -2983,6 +2980,7 @@ msgstr ""
 
 #: ../lib/Galette/Entity/Transaction.php:130
 #: ../lib/Galette/Entity/Contribution.php:217
+#: ../lib/Galette/Entity/ScheduledPayment.php:626
 #: ../../tempcache/components/forms/payment_types.html.twig:53
 msgid "Payment type:"
 msgstr ""
@@ -3039,6 +3037,7 @@ msgid "Contribution type:"
 msgstr ""
 
 #: ../lib/Galette/Entity/Contribution.php:221
+#: ../lib/Galette/Entity/ScheduledPayment.php:646
 #: ../../tempcache/pages/contribution_form.html.twig:669
 msgid "Comments:"
 msgstr ""
@@ -3222,25 +3221,15 @@ msgid "Contribution ID"
 msgstr ""
 
 #: ../lib/Galette/Entity/ScheduledPayment.php:630
-#: ../../tempcache/pages/documents_list.html.twig:97
-#: ../../tempcache/pages/documents_list.html.twig:180
-#: ../../tempcache/pages/saved_searches_list.html.twig:69
-#: ../../tempcache/pages/saved_searches_list.html.twig:128
-#: ../../tempcache/pages/advanced_search.html.twig:308
-#: ../../tempcache/pages/advanced_search.html.twig:661
-msgid "Creation date"
+#: ../../tempcache/pages/contribution_form.html.twig:545
+msgid "Record date:"
 msgstr ""
 
 #: ../lib/Galette/Entity/ScheduledPayment.php:634
-#: ../../tempcache/pages/scheduledpayment_form.html.twig:283
-#: ../../tempcache/pages/scheduledpayments_list.html.twig:93
-#: ../../tempcache/pages/scheduledpayments_list.html.twig:208
-#: ../../tempcache/pages/scheduledpayments_list.html.twig:365
-msgid "Scheduled date"
+msgid "Scheduled date:"
 msgstr ""
 
 #: ../lib/Galette/Entity/ScheduledPayment.php:642
-#: ../../tempcache/pages/scheduledpayment_form.html.twig:107
 msgid "Paid"
 msgstr ""
 
@@ -6778,6 +6767,15 @@ msgstr ""
 msgid "Filename"
 msgstr ""
 
+#: ../../tempcache/pages/documents_list.html.twig:97
+#: ../../tempcache/pages/documents_list.html.twig:180
+#: ../../tempcache/pages/saved_searches_list.html.twig:69
+#: ../../tempcache/pages/saved_searches_list.html.twig:128
+#: ../../tempcache/pages/advanced_search.html.twig:308
+#: ../../tempcache/pages/advanced_search.html.twig:661
+msgid "Creation date"
+msgstr ""
+
 #: ../../tempcache/pages/index.html.twig:122
 msgid "Lost your password?"
 msgstr ""
@@ -7011,10 +7009,6 @@ msgstr ""
 msgid "Details of donation"
 msgstr ""
 
-#: ../../tempcache/pages/contribution_form.html.twig:545
-msgid "Record date:"
-msgstr ""
-
 #: ../../tempcache/pages/contribution_form.html.twig:630
 msgid "months"
 msgstr ""
@@ -7158,14 +7152,6 @@ msgstr ""
 msgid "Related contribution information"
 msgstr ""
 
-#: ../../tempcache/pages/scheduledpayment_form.html.twig:265
-msgid "Record date"
-msgstr ""
-
-#: ../../tempcache/pages/scheduledpayment_form.html.twig:301
-msgid "Comments"
-msgstr ""
-
 #: ../../tempcache/pages/configuration_title_form.html.twig:63
 msgid "Short form:"
 msgstr ""
@@ -8063,6 +8049,12 @@ msgstr ""
 msgid "Show payments by"
 msgstr ""
 
+#: ../../tempcache/pages/scheduledpayments_list.html.twig:93
+#: ../../tempcache/pages/scheduledpayments_list.html.twig:208
+#: ../../tempcache/pages/scheduledpayments_list.html.twig:365
+msgid "Scheduled date"
+msgstr ""
+
 #: ../../tempcache/pages/scheduledpayments_list.html.twig:193
 #, php-format
 msgid "%count shceduled payment"
diff --git a/galette/lang/galette_en_US.po b/galette/lang/galette_en_US.po
index bb9060db7..5c8ce0c8a 100644
--- a/galette/lang/galette_en_US.po
+++ b/galette/lang/galette_en_US.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-04-16 22:53+0200\n"
-"PO-Revision-Date: 2024-04-16 22:53+0200\n"
+"POT-Creation-Date: 2024-04-16 23:19+0200\n"
+"PO-Revision-Date: 2024-04-16 23:19+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "Language: en_US\n"
@@ -2716,7 +2716,6 @@ msgid "Contribution label"
 msgstr "Contribution label"
 
 #: ../lib/Galette/Features/Replacements.php:378
-#: ../lib/Galette/Entity/ScheduledPayment.php:638
 #: ../../tempcache/pages/transaction_form.html.twig:237
 #: ../../tempcache/pages/contributions_list.html.twig:408
 #: ../../tempcache/pages/contributions_list.html.twig:668
@@ -2725,7 +2724,6 @@ msgstr "Contribution label"
 #: ../../tempcache/pages/contributions_types_list.html.twig:106
 #: ../../tempcache/pages/contribution_form.html.twig:260
 #: ../../tempcache/pages/contribution_form.html.twig:411
-#: ../../tempcache/pages/scheduledpayment_form.html.twig:70
 #: ../../tempcache/pages/scheduledpayment_form.html.twig:203
 #: ../../tempcache/pages/scheduledpayments_list.html.twig:208
 #: ../../tempcache/pages/scheduledpayments_list.html.twig:371
@@ -2748,7 +2746,6 @@ msgid "Contribution year"
 msgstr "Contribution year"
 
 #: ../lib/Galette/Features/Replacements.php:394
-#: ../lib/Galette/Entity/ScheduledPayment.php:646
 #: ../../tempcache/pages/document_form.html.twig:176
 msgid "Comment"
 msgstr "Comment"
@@ -2769,7 +2766,6 @@ msgid "Contribution id"
 msgstr "Contribution id"
 
 #: ../lib/Galette/Features/Replacements.php:410
-#: ../lib/Galette/Entity/ScheduledPayment.php:626
 #: ../../tempcache/pages/contributions_list.html.twig:408
 #: ../../tempcache/pages/contributions_list.html.twig:674
 #: ../../tempcache/pages/scheduledpayments_list.html.twig:208
@@ -2993,6 +2989,7 @@ msgstr "Date:"
 
 #: ../lib/Galette/Entity/Transaction.php:118
 #: ../lib/Galette/Entity/Contribution.php:213
+#: ../lib/Galette/Entity/ScheduledPayment.php:638
 #: ../../tempcache/pages/contribution_type_form.html.twig:73
 #: ../../tempcache/pages/transaction_form.html.twig:134
 #: ../../tempcache/pages/contribution_form.html.twig:497
@@ -3012,6 +3009,7 @@ msgstr "Originator:"
 
 #: ../lib/Galette/Entity/Transaction.php:130
 #: ../lib/Galette/Entity/Contribution.php:217
+#: ../lib/Galette/Entity/ScheduledPayment.php:626
 #: ../../tempcache/components/forms/payment_types.html.twig:53
 msgid "Payment type:"
 msgstr "Payment type:"
@@ -3068,6 +3066,7 @@ msgid "Contribution type:"
 msgstr "Contribution type:"
 
 #: ../lib/Galette/Entity/Contribution.php:221
+#: ../lib/Galette/Entity/ScheduledPayment.php:646
 #: ../../tempcache/pages/contribution_form.html.twig:669
 msgid "Comments:"
 msgstr "Comments:"
@@ -3251,25 +3250,15 @@ msgid "Contribution ID"
 msgstr "Contribution ID"
 
 #: ../lib/Galette/Entity/ScheduledPayment.php:630
-#: ../../tempcache/pages/documents_list.html.twig:97
-#: ../../tempcache/pages/documents_list.html.twig:180
-#: ../../tempcache/pages/saved_searches_list.html.twig:69
-#: ../../tempcache/pages/saved_searches_list.html.twig:128
-#: ../../tempcache/pages/advanced_search.html.twig:308
-#: ../../tempcache/pages/advanced_search.html.twig:661
-msgid "Creation date"
-msgstr "Creation date"
+#: ../../tempcache/pages/contribution_form.html.twig:545
+msgid "Record date:"
+msgstr "Record date:"
 
 #: ../lib/Galette/Entity/ScheduledPayment.php:634
-#: ../../tempcache/pages/scheduledpayment_form.html.twig:283
-#: ../../tempcache/pages/scheduledpayments_list.html.twig:93
-#: ../../tempcache/pages/scheduledpayments_list.html.twig:208
-#: ../../tempcache/pages/scheduledpayments_list.html.twig:365
-msgid "Scheduled date"
-msgstr "Scheduled date"
+msgid "Scheduled date:"
+msgstr "Scheduled date:"
 
 #: ../lib/Galette/Entity/ScheduledPayment.php:642
-#: ../../tempcache/pages/scheduledpayment_form.html.twig:107
 msgid "Paid"
 msgstr "Paid"
 
@@ -6923,6 +6912,15 @@ msgstr "Add a document"
 msgid "Filename"
 msgstr "Filename"
 
+#: ../../tempcache/pages/documents_list.html.twig:97
+#: ../../tempcache/pages/documents_list.html.twig:180
+#: ../../tempcache/pages/saved_searches_list.html.twig:69
+#: ../../tempcache/pages/saved_searches_list.html.twig:128
+#: ../../tempcache/pages/advanced_search.html.twig:308
+#: ../../tempcache/pages/advanced_search.html.twig:661
+msgid "Creation date"
+msgstr "Creation date"
+
 #: ../../tempcache/pages/index.html.twig:122
 msgid "Lost your password?"
 msgstr "Lost your password?"
@@ -7159,10 +7157,6 @@ msgstr "Details of membership fee"
 msgid "Details of donation"
 msgstr "Details of donation"
 
-#: ../../tempcache/pages/contribution_form.html.twig:545
-msgid "Record date:"
-msgstr "Record date:"
-
 #: ../../tempcache/pages/contribution_form.html.twig:630
 msgid "months"
 msgstr "months"
@@ -7309,14 +7303,6 @@ msgstr "View contribution"
 msgid "Related contribution information"
 msgstr "Related contribution information"
 
-#: ../../tempcache/pages/scheduledpayment_form.html.twig:265
-msgid "Record date"
-msgstr "Record date"
-
-#: ../../tempcache/pages/scheduledpayment_form.html.twig:301
-msgid "Comments"
-msgstr "Comments"
-
 #: ../../tempcache/pages/configuration_title_form.html.twig:63
 msgid "Short form:"
 msgstr "Short form:"
@@ -8270,6 +8256,12 @@ msgstr ""
 msgid "Show payments by"
 msgstr "Show payments by"
 
+#: ../../tempcache/pages/scheduledpayments_list.html.twig:93
+#: ../../tempcache/pages/scheduledpayments_list.html.twig:208
+#: ../../tempcache/pages/scheduledpayments_list.html.twig:365
+msgid "Scheduled date"
+msgstr "Scheduled date"
+
 #: ../../tempcache/pages/scheduledpayments_list.html.twig:193
 #, php-format
 msgid "%count shceduled payment"
diff --git a/galette/lib/Galette/Entity/ScheduledPayment.php b/galette/lib/Galette/Entity/ScheduledPayment.php
index e006db868..b1922df95 100644
--- a/galette/lib/Galette/Entity/ScheduledPayment.php
+++ b/galette/lib/Galette/Entity/ScheduledPayment.php
@@ -623,19 +623,19 @@ class ScheduledPayment
                 'propname' => 'contribution'
             ),
             'id_paymenttype'   => array(
-                'label'    => _T('Payment type'),
+                'label'    => _T('Payment type:'),
                 'propname' => 'payment_type'
             ),
             'creation_date'    => array(
-                'label'    => _T('Creation date'),
+                'label'    => _T('Record date:'),
                 'propname' => 'creation_date'
             ),
             'scheduled_date'   => array(
-                'label'    => _T('Scheduled date'),
+                'label'    => _T('Scheduled date:'),
                 'propname' => 'scheduled_date'
             ),
             'amount'           => array(
-                'label'    => _T('Amount'),
+                'label'    => _T('Amount:'),
                 'propname' => 'amount'
             ),
             'paid'          => array(
@@ -643,7 +643,7 @@ class ScheduledPayment
                 'propname' => 'is_paid'
             ),
             'comment'          => array(
-                'label'    => _T('Comment'),
+                'label'    => _T('Comments:'),
                 'propname' => 'comment'
             )
         );
diff --git a/galette/templates/default/pages/scheduledpayment_form.html.twig b/galette/templates/default/pages/scheduledpayment_form.html.twig
index 4002e503b..7e462d53c 100644
--- a/galette/templates/default/pages/scheduledpayment_form.html.twig
+++ b/galette/templates/default/pages/scheduledpayment_form.html.twig
@@ -31,7 +31,7 @@
                 <div class="ui mobile reversed stackable grid">
                     <div class="six wide column">
                         <div class="inline field required">
-                            <label for="montant_cotis">{{ _T("Amount") }}</label>
+                            <label for="montant_cotis">{{ scheduled.getFieldLabel('amount') }}</label>
                             <input type="text" name="amount" id="amount" value="{% if scheduled.getId() %}{{ scheduled.getAmount() }}{% else %}{{ scheduled.getMissingAmount() }}{% endif %}" maxlength="10" required="required"/>
                         </div>
     {# payment type #}
@@ -49,7 +49,7 @@
         'required': true
     } %}
                         <div class="inline field">
-                            <label for="paid">{{ _T('Paid') }}</label>
+                            <label for="paid">{{ scheduled.getFieldLabel('paid') }}</label>
                             <input type="checkbox" name="paid" id="paid" value="1"{% if scheduled.isPaid() %} checked="checked"{% endif %}/>
                         </div>
                     </div>
@@ -127,7 +127,7 @@
                         <div class="two fields">
                             <div class="inline field required">
                                 <label for="creation_date">
-                                    {{ _T("Record date") }}
+                                    {{ scheduled.getFieldLabel('creation_date') }}
                                 </label>
                                 <div class="ui calendar" id="scheduled-creationdate">
                                     <div class="ui input left icon">
@@ -137,7 +137,7 @@
                                 </div>
                             </div>
                             <div class="inline field required">
-                                <label for="scheduled_date">{{ _T("Scheduled date") }}</label>
+                                <label for="scheduled_date">{{ scheduled.getFieldLabel('scheduled_date') }}</label>
                                 <div class="ui calendar" id="scheduled-scheduleddate">
                                     <div class="ui input left icon">
                                         <i class="calendar icon" aria-hidden="true"></i>
@@ -147,7 +147,7 @@
                             </div>
                         </div>
                         <div class="field">
-                            <label for="comment">{{ _T("Comments") }}</label>
+                            <label for="comment">{{ scheduled.getFieldLabel('comment') }}</label>
                             <textarea name="comment" id="comment" cols="61" rows="6">{{ scheduled.getComment() }}</textarea>
                         </div>
                     </div>
-- 
2.39.2