Reword, not only late members are printed on labels

diff --git a/galette/lang/en_US/LC_MESSAGES/galette.mo b/galette/lang/en_US/LC_MESSAGES/galette.mo
index 6e17abf1e3dab6d22e519c7a56cad4f55c692afd..9682d829ee84f3bc5d5e5c00863ef137ba24bb09 100644 (file)
Binary files a/galette/lang/en_US/LC_MESSAGES/galette.mo and b/galette/lang/en_US/LC_MESSAGES/galette.mo differ

diff --git a/galette/lang/galette.pot b/galette/lang/galette.pot
index 291ac95a2b7d1a1897e9e1bff64c9ee2179cad52..386689d2bc5ae6b81d035508fcd8c1cd33077cc6 100644 (file)
--- 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: 2021-04-24 10:13+0200\n"
+"POT-Creation-Date: 2021-04-25 09:14+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"
@@ -630,7 +630,7 @@ msgstr ""
 
 #: ../lib/Galette/Controllers/CrudController.php:289
 #: ../lib/Galette/Controllers/HistoryController.php:208
-#: ../lib/Galette/Controllers/CsvController.php:499
+#: ../lib/Galette/Controllers/CsvController.php:498
 msgid "Removal has not been confirmed!"
 msgstr ""
 
@@ -967,34 +967,34 @@ msgstr ""
 msgid "No files has been uploaded!"
 msgstr ""
 
-#: ../lib/Galette/Controllers/CsvController.php:459
+#: ../lib/Galette/Controllers/CsvController.php:458
 #, php-format
 msgid "Remove %1$s file %2$s"
 msgstr ""
 
-#: ../lib/Galette/Controllers/CsvController.php:512
+#: ../lib/Galette/Controllers/CsvController.php:511
 #, php-format
 msgid "'%export' file has been removed from disk."
 msgstr ""
 
-#: ../lib/Galette/Controllers/CsvController.php:522
+#: ../lib/Galette/Controllers/CsvController.php:521
 #, php-format
 msgid "Cannot remove '%export' from disk :/"
 msgstr ""
 
-#: ../lib/Galette/Controllers/CsvController.php:594
+#: ../lib/Galette/Controllers/CsvController.php:593
 msgid "CSV import model"
 msgstr ""
 
-#: ../lib/Galette/Controllers/CsvController.php:636
+#: ../lib/Galette/Controllers/CsvController.php:635
 msgid "galette_import_model.csv"
 msgstr ""
 
-#: ../lib/Galette/Controllers/CsvController.php:672
+#: ../lib/Galette/Controllers/CsvController.php:671
 msgid "Import model has been successfully stored :)"
 msgstr ""
 
-#: ../lib/Galette/Controllers/CsvController.php:677
+#: ../lib/Galette/Controllers/CsvController.php:676
 msgid "Import model has not been stored :("
 msgstr ""
 
@@ -2061,31 +2061,31 @@ msgstr ""
 msgid "Public"
 msgstr ""
 
-#: ../lib/Galette/Entity/Reminder.php:269
+#: ../lib/Galette/Entity/Reminder.php:270
 msgid "%name <%mail> (%days days)"
 msgstr ""
 
-#: ../lib/Galette/Entity/Reminder.php:276
+#: ../lib/Galette/Entity/Reminder.php:277
 msgid "Sent reminder email for late membership"
 msgstr ""
 
-#: ../lib/Galette/Entity/Reminder.php:278
+#: ../lib/Galette/Entity/Reminder.php:279
 msgid "Sent reminder email for impending membership"
 msgstr ""
 
-#: ../lib/Galette/Entity/Reminder.php:284
+#: ../lib/Galette/Entity/Reminder.php:285
 msgid "A problem happened while sending late membership email"
 msgstr ""
 
-#: ../lib/Galette/Entity/Reminder.php:286
+#: ../lib/Galette/Entity/Reminder.php:287
 msgid "A problem happened while sending impending membership email"
 msgstr ""
 
-#: ../lib/Galette/Entity/Reminder.php:296
+#: ../lib/Galette/Entity/Reminder.php:297
 msgid "Unable to send %membership reminder (no email address)."
 msgstr ""
 
-#: ../lib/Galette/Entity/Reminder.php:309
+#: ../lib/Galette/Entity/Reminder.php:310
 msgid "%name (#%id - %days days)"
 msgstr ""
 
@@ -4979,7 +4979,7 @@ msgstr ""
 msgid "Additionnal fields:"
 msgstr ""
 
-#: ../templates/default/display_dynamic_fields.tpl:26
+#: ../templates/default/display_dynamic_fields.tpl:34
 #, php-format
 msgid "Open '%s' in a new window"
 msgstr ""
@@ -7481,7 +7481,7 @@ msgid "%s members without email address"
 msgstr ""
 
 #: ../templates/default/reminder.tpl:25
-msgid "Generate labels for late members without email address"
+msgid "Generate labels for members without email address"
 msgstr ""
 
 #: ../templates/default/reminder.tpl:68

diff --git a/galette/lang/galette_en_US.po b/galette/lang/galette_en_US.po
index e6b35e3cd61c36f04c45fb867fa7b2ced09347d5..c0a3002a548e75950d248eefc7bf3458128ca351 100644 (file)
--- a/galette/lang/galette_en_US.po
+++ b/galette/lang/galette_en_US.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-04-24 10:13+0200\n"
+"POT-Creation-Date: 2021-04-25 09:14+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"
@@ -634,7 +634,7 @@ msgstr "Download document"
 
 #: ../lib/Galette/Controllers/CrudController.php:289
 #: ../lib/Galette/Controllers/HistoryController.php:208
-#: ../lib/Galette/Controllers/CsvController.php:499
+#: ../lib/Galette/Controllers/CsvController.php:498
 msgid "Removal has not been confirmed!"
 msgstr "Removal has not been confirmed!"
 
@@ -981,34 +981,34 @@ msgstr "No files has been seleted for upload!"
 msgid "No files has been uploaded!"
 msgstr "No files has been uploaded!"
 
-#: ../lib/Galette/Controllers/CsvController.php:459
+#: ../lib/Galette/Controllers/CsvController.php:458
 #, php-format
 msgid "Remove %1$s file %2$s"
 msgstr "Remove %1$s file %2$s"
 
-#: ../lib/Galette/Controllers/CsvController.php:512
+#: ../lib/Galette/Controllers/CsvController.php:511
 #, php-format
 msgid "'%export' file has been removed from disk."
 msgstr "'%export' file has been removed from disk."
 
-#: ../lib/Galette/Controllers/CsvController.php:522
+#: ../lib/Galette/Controllers/CsvController.php:521
 #, php-format
 msgid "Cannot remove '%export' from disk :/"
 msgstr "Cannot remove '%export' from disk :/"
 
-#: ../lib/Galette/Controllers/CsvController.php:594
+#: ../lib/Galette/Controllers/CsvController.php:593
 msgid "CSV import model"
 msgstr "CSV import model"
 
-#: ../lib/Galette/Controllers/CsvController.php:636
+#: ../lib/Galette/Controllers/CsvController.php:635
 msgid "galette_import_model.csv"
 msgstr "galette_import_model.csv"
 
-#: ../lib/Galette/Controllers/CsvController.php:672
+#: ../lib/Galette/Controllers/CsvController.php:671
 msgid "Import model has been successfully stored :)"
 msgstr "Import model has been successfully stored :)"
 
-#: ../lib/Galette/Controllers/CsvController.php:677
+#: ../lib/Galette/Controllers/CsvController.php:676
 msgid "Import model has not been stored :("
 msgstr "Import model has not been stored :("
 
@@ -2086,31 +2086,31 @@ msgstr "b-day"
 msgid "Public"
 msgstr "Public"
 
-#: ../lib/Galette/Entity/Reminder.php:269
+#: ../lib/Galette/Entity/Reminder.php:270
 msgid "%name <%mail> (%days days)"
 msgstr "%name <%mail> (%days days)"
 
-#: ../lib/Galette/Entity/Reminder.php:276
+#: ../lib/Galette/Entity/Reminder.php:277
 msgid "Sent reminder email for late membership"
 msgstr "Sent reminder email for late membership"
 
-#: ../lib/Galette/Entity/Reminder.php:278
+#: ../lib/Galette/Entity/Reminder.php:279
 msgid "Sent reminder email for impending membership"
 msgstr "Sent reminder email for impending membership"
 
-#: ../lib/Galette/Entity/Reminder.php:284
+#: ../lib/Galette/Entity/Reminder.php:285
 msgid "A problem happened while sending late membership email"
 msgstr "A problem happened while sending late membership email"
 
-#: ../lib/Galette/Entity/Reminder.php:286
+#: ../lib/Galette/Entity/Reminder.php:287
 msgid "A problem happened while sending impending membership email"
 msgstr "A problem happened while sending impending membership email"
 
-#: ../lib/Galette/Entity/Reminder.php:296
+#: ../lib/Galette/Entity/Reminder.php:297
 msgid "Unable to send %membership reminder (no email address)."
 msgstr "Unable to send %membership reminder (no email address)."
 
-#: ../lib/Galette/Entity/Reminder.php:309
+#: ../lib/Galette/Entity/Reminder.php:310
 msgid "%name (#%id - %days days)"
 msgstr "%name (#%id - %days days)"
 
@@ -5149,7 +5149,7 @@ msgstr "An error occurred sending test email :("
 msgid "Additionnal fields:"
 msgstr "Additionnal fields:"
 
-#: ../templates/default/display_dynamic_fields.tpl:26
+#: ../templates/default/display_dynamic_fields.tpl:34
 #, php-format
 msgid "Open '%s' in a new window"
 msgstr "Open '%s' in a new window"
@@ -7700,8 +7700,8 @@ msgid "%s members without email address"
 msgstr "%s members without email address"
 
 #: ../templates/default/reminder.tpl:25
-msgid "Generate labels for late members without email address"
-msgstr "Generate labels for late members without email address"
+msgid "Generate labels for members without email address"
+msgstr "Generate labels for members without email address"
 
 #: ../templates/default/reminder.tpl:68
 msgid "No reminder selected"

diff --git a/galette/templates/default/reminder.tpl b/galette/templates/default/reminder.tpl
index 21c0d8d21498e15e4c66b3b154083782b13bec96..11eeae377b466e6db350dff821bc02990ed96a12 100644 (file)
--- a/galette/templates/default/reminder.tpl
+++ b/galette/templates/default/reminder.tpl
@@ -22,7 +22,7 @@
                         </li>
                         <li{if $count_impending_nomail eq 0 and $count_late_nomail eq 0} class="disabled"{/if}>
                             <input type="checkbox" name="reminder_wo_mail" id="reminder_wo_mail" value="1"{if $count_impending_nomail eq 0 and $count_late_nomail eq 0} disabled="disabled"{/if}/>
-                            <label for="reminder_wo_mail">{_T string="Generate labels for late members without email address"}</label>
+                            <label for="reminder_wo_mail">{_T string="Generate labels for members without email address"}</label>
                         </li>
                     </ul>
                 </div>