From 79ffd90f5ec509ed6ee5a74a7d85e7655991e316 Mon Sep 17 00:00:00 2001 From: Johan Cwiklinski Date: Mon, 26 Aug 2024 07:53:01 +0200 Subject: [PATCH] Prevent duplicated subscriptions --- lang/activities.pot | 28 ++++++++------- lang/activities_ar.utf8.po | 30 +++++++++------- lang/activities_br.utf8.po | 30 +++++++++------- lang/activities_ca.utf8.po | 30 +++++++++------- lang/activities_de_DE.utf8.po | 32 +++++++++++------- lang/activities_en_US.po | 30 +++++++++------- lang/activities_es.utf8.po | 32 +++++++++++------- lang/activities_fr_FR.utf8.po | 30 +++++++++------- lang/activities_it_IT.utf8.po | 32 +++++++++++------- lang/activities_nb_NO.utf8.po | 30 +++++++++------- lang/activities_oc.utf8.po | 32 +++++++++++------- lang/activities_ota.utf8.po | 30 +++++++++------- lang/activities_pt.utf8.po | 30 +++++++++------- lang/activities_ru.utf8.po | 30 +++++++++------- lang/activities_si.utf8.po | 30 +++++++++------- lang/activities_tr.utf8.po | 30 +++++++++------- lang/activities_uk.utf8.po | 32 +++++++++++------- lang/ar.utf8/LC_MESSAGES/activities.mo | Bin 707 -> 707 bytes lang/br.utf8/LC_MESSAGES/activities.mo | Bin 631 -> 631 bytes lang/ca.utf8/LC_MESSAGES/activities.mo | Bin 530 -> 530 bytes lang/de_DE.utf8/LC_MESSAGES/activities.mo | Bin 1769 -> 1769 bytes lang/en_US/LC_MESSAGES/activities.mo | Bin 4413 -> 4543 bytes lang/es.utf8/LC_MESSAGES/activities.mo | Bin 2275 -> 2275 bytes lang/fr_FR.utf8/LC_MESSAGES/activities.mo | Bin 4838 -> 4980 bytes lang/it_IT.utf8/LC_MESSAGES/activities.mo | Bin 2240 -> 2240 bytes lang/nb_NO.utf8/LC_MESSAGES/activities.mo | Bin 388 -> 388 bytes lang/oc.utf8/LC_MESSAGES/activities.mo | Bin 693 -> 693 bytes lang/ota.utf8/LC_MESSAGES/activities.mo | Bin 386 -> 386 bytes lang/pt.utf8/LC_MESSAGES/activities.mo | Bin 382 -> 382 bytes lang/ru.utf8/LC_MESSAGES/activities.mo | Bin 560 -> 560 bytes lang/si.utf8/LC_MESSAGES/activities.mo | Bin 384 -> 384 bytes lang/tr.utf8/LC_MESSAGES/activities.mo | Bin 450 -> 450 bytes lang/uk.utf8/LC_MESSAGES/activities.mo | Bin 2766 -> 2766 bytes .../Crud/SubscriptionsController.php | 9 +++-- lib/GaletteActivities/Entity/Subscription.php | 20 ++++++----- .../Entity/tests/units/Activity.php | 4 +-- .../Entity/tests/units/Subscription.php | 20 ++++++++++- tests/TestsBootstrap.php | 2 ++ 38 files changed, 339 insertions(+), 234 deletions(-) diff --git a/lang/activities.pot b/lang/activities.pot index 410fa4e..e0a718b 100644 --- a/lang/activities.pot +++ b/lang/activities.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-08-25 14:51+0200\n" +"POT-Creation-Date: 2024-08-26 07:53+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -23,7 +23,7 @@ msgid "Activities management" msgstr "" #: ../lib/GaletteActivities/Controllers/Crud/ActivitiesController.php:199 -#: ../lib/GaletteActivities/Entity/Subscription.php:559 +#: ../lib/GaletteActivities/Entity/Subscription.php:563 #: ../tempcache/subscriptions.html.twig:102 #: ../tempcache/subscriptions.html.twig:124 #: ../tempcache/subscription.html.twig:109 @@ -65,16 +65,16 @@ msgstr "" msgid "Subscription has been modified." msgstr "" -#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:378 +#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:382 msgid "An error occurred while storing the subscription." msgstr "" -#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:388 +#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:391 msgid "Do not forget to store the subscription" msgstr "" #. TRANS: %1$s is the member name, %2$s the activity name. -#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:491 +#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:494 #, php-format msgid "Remove subscription for %1$s on %2$s" msgstr "" @@ -129,14 +129,14 @@ msgid "Group" msgstr "" #: ../lib/GaletteActivities/Entity/Activity.php:428 -#: ../lib/GaletteActivities/Entity/Subscription.php:579 +#: ../lib/GaletteActivities/Entity/Subscription.php:583 #: ../tempcache/activities.html.twig:100 ../tempcache/activities.html.twig:181 #: ../tempcache/subscription.html.twig:71 msgid "Creation date" msgstr "" #: ../lib/GaletteActivities/Entity/Activity.php:432 -#: ../lib/GaletteActivities/Entity/Subscription.php:591 +#: ../lib/GaletteActivities/Entity/Subscription.php:595 #: ../tempcache/subscription.html.twig:121 msgid "Comment" msgstr "" @@ -169,26 +169,30 @@ msgstr "" msgid "Subscription updated" msgstr "" -#: ../lib/GaletteActivities/Entity/Subscription.php:563 -msgid "Member" +#: ../lib/GaletteActivities/Entity/Subscription.php:328 +msgid "Subscription already exists for this member and activity" msgstr "" #: ../lib/GaletteActivities/Entity/Subscription.php:567 -msgid "Is paid" +msgid "Member" msgstr "" #: ../lib/GaletteActivities/Entity/Subscription.php:571 +msgid "Is paid" +msgstr "" + +#: ../lib/GaletteActivities/Entity/Subscription.php:575 #: ../tempcache/subscriptions.html.twig:102 #: ../tempcache/subscriptions.html.twig:448 #: ../tempcache/subscription.html.twig:138 msgid "Amount" msgstr "" -#: ../lib/GaletteActivities/Entity/Subscription.php:575 +#: ../lib/GaletteActivities/Entity/Subscription.php:579 msgid "Payment method" msgstr "" -#: ../lib/GaletteActivities/Entity/Subscription.php:583 +#: ../lib/GaletteActivities/Entity/Subscription.php:587 #: ../tempcache/subscriptions.html.twig:102 #: ../tempcache/subscriptions.html.twig:432 #: ../tempcache/subscription.html.twig:77 diff --git a/lang/activities_ar.utf8.po b/lang/activities_ar.utf8.po index 8cf7597..b0ba9d3 100644 --- a/lang/activities_ar.utf8.po +++ b/lang/activities_ar.utf8.po @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-08-25 14:51+0200\n" -"PO-Revision-Date: 2024-08-25 14:53+0200\n" +"POT-Creation-Date: 2024-08-26 07:53+0200\n" +"PO-Revision-Date: 2024-08-26 07:54+0200\n" "Last-Translator: Johan Cwiklinski \n" "Language-Team: Arabic \n" @@ -23,7 +23,7 @@ msgid "Activities management" msgstr "" #: ../lib/GaletteActivities/Controllers/Crud/ActivitiesController.php:199 -#: ../lib/GaletteActivities/Entity/Subscription.php:559 +#: ../lib/GaletteActivities/Entity/Subscription.php:563 #: ../tempcache/subscriptions.html.twig:102 #: ../tempcache/subscriptions.html.twig:124 #: ../tempcache/subscription.html.twig:109 @@ -65,16 +65,16 @@ msgstr "" msgid "Subscription has been modified." msgstr "" -#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:378 +#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:382 msgid "An error occurred while storing the subscription." msgstr "" -#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:388 +#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:391 msgid "Do not forget to store the subscription" msgstr "" #. TRANS: %1$s is the member name, %2$s the activity name. -#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:491 +#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:494 #, php-format msgid "Remove subscription for %1$s on %2$s" msgstr "" @@ -129,14 +129,14 @@ msgid "Group" msgstr "" #: ../lib/GaletteActivities/Entity/Activity.php:428 -#: ../lib/GaletteActivities/Entity/Subscription.php:579 +#: ../lib/GaletteActivities/Entity/Subscription.php:583 #: ../tempcache/activities.html.twig:100 ../tempcache/activities.html.twig:181 #: ../tempcache/subscription.html.twig:71 msgid "Creation date" msgstr "تاريخ الإنشاء" #: ../lib/GaletteActivities/Entity/Activity.php:432 -#: ../lib/GaletteActivities/Entity/Subscription.php:591 +#: ../lib/GaletteActivities/Entity/Subscription.php:595 #: ../tempcache/subscription.html.twig:121 msgid "Comment" msgstr "" @@ -171,26 +171,30 @@ msgstr "" msgid "Subscription updated" msgstr "تاريخ الإنشاء" -#: ../lib/GaletteActivities/Entity/Subscription.php:563 -msgid "Member" +#: ../lib/GaletteActivities/Entity/Subscription.php:328 +msgid "Subscription already exists for this member and activity" msgstr "" #: ../lib/GaletteActivities/Entity/Subscription.php:567 -msgid "Is paid" +msgid "Member" msgstr "" #: ../lib/GaletteActivities/Entity/Subscription.php:571 +msgid "Is paid" +msgstr "" + +#: ../lib/GaletteActivities/Entity/Subscription.php:575 #: ../tempcache/subscriptions.html.twig:102 #: ../tempcache/subscriptions.html.twig:448 #: ../tempcache/subscription.html.twig:138 msgid "Amount" msgstr "المَبلغ" -#: ../lib/GaletteActivities/Entity/Subscription.php:575 +#: ../lib/GaletteActivities/Entity/Subscription.php:579 msgid "Payment method" msgstr "" -#: ../lib/GaletteActivities/Entity/Subscription.php:583 +#: ../lib/GaletteActivities/Entity/Subscription.php:587 #: ../tempcache/subscriptions.html.twig:102 #: ../tempcache/subscriptions.html.twig:432 #: ../tempcache/subscription.html.twig:77 diff --git a/lang/activities_br.utf8.po b/lang/activities_br.utf8.po index 7eba03d..7635ba0 100644 --- a/lang/activities_br.utf8.po +++ b/lang/activities_br.utf8.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-08-25 14:51+0200\n" -"PO-Revision-Date: 2024-08-25 14:55+0200\n" +"POT-Creation-Date: 2024-08-26 07:53+0200\n" +"PO-Revision-Date: 2024-08-26 07:55+0200\n" "Last-Translator: Johan Cwiklinski \n" "Language-Team: none\n" "Language: br\n" @@ -21,7 +21,7 @@ msgid "Activities management" msgstr "" #: ../lib/GaletteActivities/Controllers/Crud/ActivitiesController.php:199 -#: ../lib/GaletteActivities/Entity/Subscription.php:559 +#: ../lib/GaletteActivities/Entity/Subscription.php:563 #: ../tempcache/subscriptions.html.twig:102 #: ../tempcache/subscriptions.html.twig:124 #: ../tempcache/subscription.html.twig:109 @@ -63,16 +63,16 @@ msgstr "" msgid "Subscription has been modified." msgstr "" -#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:378 +#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:382 msgid "An error occurred while storing the subscription." msgstr "" -#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:388 +#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:391 msgid "Do not forget to store the subscription" msgstr "" #. TRANS: %1$s is the member name, %2$s the activity name. -#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:491 +#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:494 #, php-format msgid "Remove subscription for %1$s on %2$s" msgstr "" @@ -127,14 +127,14 @@ msgid "Group" msgstr "" #: ../lib/GaletteActivities/Entity/Activity.php:428 -#: ../lib/GaletteActivities/Entity/Subscription.php:579 +#: ../lib/GaletteActivities/Entity/Subscription.php:583 #: ../tempcache/activities.html.twig:100 ../tempcache/activities.html.twig:181 #: ../tempcache/subscription.html.twig:71 msgid "Creation date" msgstr "" #: ../lib/GaletteActivities/Entity/Activity.php:432 -#: ../lib/GaletteActivities/Entity/Subscription.php:591 +#: ../lib/GaletteActivities/Entity/Subscription.php:595 #: ../tempcache/subscription.html.twig:121 msgid "Comment" msgstr "" @@ -167,26 +167,30 @@ msgstr "" msgid "Subscription updated" msgstr "" -#: ../lib/GaletteActivities/Entity/Subscription.php:563 -msgid "Member" +#: ../lib/GaletteActivities/Entity/Subscription.php:328 +msgid "Subscription already exists for this member and activity" msgstr "" #: ../lib/GaletteActivities/Entity/Subscription.php:567 -msgid "Is paid" +msgid "Member" msgstr "" #: ../lib/GaletteActivities/Entity/Subscription.php:571 +msgid "Is paid" +msgstr "" + +#: ../lib/GaletteActivities/Entity/Subscription.php:575 #: ../tempcache/subscriptions.html.twig:102 #: ../tempcache/subscriptions.html.twig:448 #: ../tempcache/subscription.html.twig:138 msgid "Amount" msgstr "" -#: ../lib/GaletteActivities/Entity/Subscription.php:575 +#: ../lib/GaletteActivities/Entity/Subscription.php:579 msgid "Payment method" msgstr "" -#: ../lib/GaletteActivities/Entity/Subscription.php:583 +#: ../lib/GaletteActivities/Entity/Subscription.php:587 #: ../tempcache/subscriptions.html.twig:102 #: ../tempcache/subscriptions.html.twig:432 #: ../tempcache/subscription.html.twig:77 diff --git a/lang/activities_ca.utf8.po b/lang/activities_ca.utf8.po index 03b8533..ef07b51 100644 --- a/lang/activities_ca.utf8.po +++ b/lang/activities_ca.utf8.po @@ -4,8 +4,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-08-25 14:51+0200\n" -"PO-Revision-Date: 2024-08-25 14:55+0200\n" +"POT-Creation-Date: 2024-08-26 07:53+0200\n" +"PO-Revision-Date: 2024-08-26 07:55+0200\n" "Last-Translator: Johan Cwiklinski \n" "Language-Team: Catalan \n" @@ -21,7 +21,7 @@ msgid "Activities management" msgstr "" #: ../lib/GaletteActivities/Controllers/Crud/ActivitiesController.php:199 -#: ../lib/GaletteActivities/Entity/Subscription.php:559 +#: ../lib/GaletteActivities/Entity/Subscription.php:563 #: ../tempcache/subscriptions.html.twig:102 #: ../tempcache/subscriptions.html.twig:124 #: ../tempcache/subscription.html.twig:109 @@ -63,16 +63,16 @@ msgstr "" msgid "Subscription has been modified." msgstr "" -#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:378 +#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:382 msgid "An error occurred while storing the subscription." msgstr "" -#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:388 +#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:391 msgid "Do not forget to store the subscription" msgstr "" #. TRANS: %1$s is the member name, %2$s the activity name. -#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:491 +#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:494 #, php-format msgid "Remove subscription for %1$s on %2$s" msgstr "" @@ -127,14 +127,14 @@ msgid "Group" msgstr "" #: ../lib/GaletteActivities/Entity/Activity.php:428 -#: ../lib/GaletteActivities/Entity/Subscription.php:579 +#: ../lib/GaletteActivities/Entity/Subscription.php:583 #: ../tempcache/activities.html.twig:100 ../tempcache/activities.html.twig:181 #: ../tempcache/subscription.html.twig:71 msgid "Creation date" msgstr "" #: ../lib/GaletteActivities/Entity/Activity.php:432 -#: ../lib/GaletteActivities/Entity/Subscription.php:591 +#: ../lib/GaletteActivities/Entity/Subscription.php:595 #: ../tempcache/subscription.html.twig:121 msgid "Comment" msgstr "Comentari" @@ -167,26 +167,30 @@ msgstr "" msgid "Subscription updated" msgstr "" -#: ../lib/GaletteActivities/Entity/Subscription.php:563 -msgid "Member" +#: ../lib/GaletteActivities/Entity/Subscription.php:328 +msgid "Subscription already exists for this member and activity" msgstr "" #: ../lib/GaletteActivities/Entity/Subscription.php:567 -msgid "Is paid" +msgid "Member" msgstr "" #: ../lib/GaletteActivities/Entity/Subscription.php:571 +msgid "Is paid" +msgstr "" + +#: ../lib/GaletteActivities/Entity/Subscription.php:575 #: ../tempcache/subscriptions.html.twig:102 #: ../tempcache/subscriptions.html.twig:448 #: ../tempcache/subscription.html.twig:138 msgid "Amount" msgstr "" -#: ../lib/GaletteActivities/Entity/Subscription.php:575 +#: ../lib/GaletteActivities/Entity/Subscription.php:579 msgid "Payment method" msgstr "" -#: ../lib/GaletteActivities/Entity/Subscription.php:583 +#: ../lib/GaletteActivities/Entity/Subscription.php:587 #: ../tempcache/subscriptions.html.twig:102 #: ../tempcache/subscriptions.html.twig:432 #: ../tempcache/subscription.html.twig:77 diff --git a/lang/activities_de_DE.utf8.po b/lang/activities_de_DE.utf8.po index 01964da..3e00a73 100644 --- a/lang/activities_de_DE.utf8.po +++ b/lang/activities_de_DE.utf8.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-08-25 14:51+0200\n" -"PO-Revision-Date: 2024-08-25 14:56+0200\n" +"POT-Creation-Date: 2024-08-26 07:53+0200\n" +"PO-Revision-Date: 2024-08-26 07:55+0200\n" "Last-Translator: Johan Cwiklinski \n" "Language-Team: German \n" @@ -26,7 +26,7 @@ msgid "Activities management" msgstr "Aktivitätsverwaltung" #: ../lib/GaletteActivities/Controllers/Crud/ActivitiesController.php:199 -#: ../lib/GaletteActivities/Entity/Subscription.php:559 +#: ../lib/GaletteActivities/Entity/Subscription.php:563 #: ../tempcache/subscriptions.html.twig:102 #: ../tempcache/subscriptions.html.twig:124 #: ../tempcache/subscription.html.twig:109 @@ -75,19 +75,19 @@ msgstr "Neue Buchung erfolgreich hinzugefügt." msgid "Subscription has been modified." msgstr "Aktivität wurde verändert." -#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:378 +#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:382 #, fuzzy msgid "An error occurred while storing the subscription." msgstr "Fehler beim Speichern der Buchung." -#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:388 +#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:391 #, fuzzy #| msgid "Do not forget to store the booking" msgid "Do not forget to store the subscription" msgstr "Vergessen Sie nicht die Buchung zu speichern" #. TRANS: %1$s is the member name, %2$s the activity name. -#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:491 +#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:494 #, fuzzy, php-format msgid "Remove subscription for %1$s on %2$s" msgstr "Lösche Buchung für %1$s bei %2$s" @@ -144,14 +144,14 @@ msgid "Group" msgstr "keine Gruppe" #: ../lib/GaletteActivities/Entity/Activity.php:428 -#: ../lib/GaletteActivities/Entity/Subscription.php:579 +#: ../lib/GaletteActivities/Entity/Subscription.php:583 #: ../tempcache/activities.html.twig:100 ../tempcache/activities.html.twig:181 #: ../tempcache/subscription.html.twig:71 msgid "Creation date" msgstr "Erstelldatum" #: ../lib/GaletteActivities/Entity/Activity.php:432 -#: ../lib/GaletteActivities/Entity/Subscription.php:591 +#: ../lib/GaletteActivities/Entity/Subscription.php:595 #: ../tempcache/subscription.html.twig:121 msgid "Comment" msgstr "Kommentar" @@ -193,30 +193,36 @@ msgstr "Hinzufügen der Buchung gescheitert." msgid "Subscription updated" msgstr "Aktivität aktualisiert" -#: ../lib/GaletteActivities/Entity/Subscription.php:563 +#: ../lib/GaletteActivities/Entity/Subscription.php:328 +#, fuzzy +#| msgid "Begin date is mandatory" +msgid "Subscription already exists for this member and activity" +msgstr "Startdatum ist erforderlich" + +#: ../lib/GaletteActivities/Entity/Subscription.php:567 #, fuzzy #| msgid "Members as CSV" msgid "Member" msgstr "Mitglied" -#: ../lib/GaletteActivities/Entity/Subscription.php:567 +#: ../lib/GaletteActivities/Entity/Subscription.php:571 #, fuzzy #| msgid "%1$s paid" msgid "Is paid" msgstr "%1$s bezahlt" -#: ../lib/GaletteActivities/Entity/Subscription.php:571 +#: ../lib/GaletteActivities/Entity/Subscription.php:575 #: ../tempcache/subscriptions.html.twig:102 #: ../tempcache/subscriptions.html.twig:448 #: ../tempcache/subscription.html.twig:138 msgid "Amount" msgstr "Betrag" -#: ../lib/GaletteActivities/Entity/Subscription.php:575 +#: ../lib/GaletteActivities/Entity/Subscription.php:579 msgid "Payment method" msgstr "" -#: ../lib/GaletteActivities/Entity/Subscription.php:583 +#: ../lib/GaletteActivities/Entity/Subscription.php:587 #: ../tempcache/subscriptions.html.twig:102 #: ../tempcache/subscriptions.html.twig:432 #: ../tempcache/subscription.html.twig:77 diff --git a/lang/activities_en_US.po b/lang/activities_en_US.po index 0dde078..f7d17e4 100644 --- a/lang/activities_en_US.po +++ b/lang/activities_en_US.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-08-25 14:51+0200\n" -"PO-Revision-Date: 2024-08-25 14:51+0200\n" +"POT-Creation-Date: 2024-08-26 07:53+0200\n" +"PO-Revision-Date: 2024-08-26 07:53+0200\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" "Language: en_US\n" @@ -22,7 +22,7 @@ msgid "Activities management" msgstr "Activities management" #: ../lib/GaletteActivities/Controllers/Crud/ActivitiesController.php:199 -#: ../lib/GaletteActivities/Entity/Subscription.php:559 +#: ../lib/GaletteActivities/Entity/Subscription.php:563 #: ../tempcache/subscriptions.html.twig:102 #: ../tempcache/subscriptions.html.twig:124 #: ../tempcache/subscription.html.twig:109 @@ -64,16 +64,16 @@ msgstr "New subscription has been successfully added." msgid "Subscription has been modified." msgstr "Subscription has been modified." -#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:378 +#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:382 msgid "An error occurred while storing the subscription." msgstr "An error occurred while storing the subscription." -#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:388 +#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:391 msgid "Do not forget to store the subscription" msgstr "Do not forget to store the subscription" #. TRANS: %1$s is the member name, %2$s the activity name. -#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:491 +#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:494 #, php-format msgid "Remove subscription for %1$s on %2$s" msgstr "Remove subscription for %1$s on %2$s" @@ -128,14 +128,14 @@ msgid "Group" msgstr "Group" #: ../lib/GaletteActivities/Entity/Activity.php:428 -#: ../lib/GaletteActivities/Entity/Subscription.php:579 +#: ../lib/GaletteActivities/Entity/Subscription.php:583 #: ../tempcache/activities.html.twig:100 ../tempcache/activities.html.twig:181 #: ../tempcache/subscription.html.twig:71 msgid "Creation date" msgstr "Creation date" #: ../lib/GaletteActivities/Entity/Activity.php:432 -#: ../lib/GaletteActivities/Entity/Subscription.php:591 +#: ../lib/GaletteActivities/Entity/Subscription.php:595 #: ../tempcache/subscription.html.twig:121 msgid "Comment" msgstr "Comment" @@ -168,26 +168,30 @@ msgstr "Fail to add new subscription." msgid "Subscription updated" msgstr "Subscription updated" -#: ../lib/GaletteActivities/Entity/Subscription.php:563 +#: ../lib/GaletteActivities/Entity/Subscription.php:328 +msgid "Subscription already exists for this member and activity" +msgstr "Subscription already exists for this member and activity" + +#: ../lib/GaletteActivities/Entity/Subscription.php:567 msgid "Member" msgstr "Member" -#: ../lib/GaletteActivities/Entity/Subscription.php:567 +#: ../lib/GaletteActivities/Entity/Subscription.php:571 msgid "Is paid" msgstr "Is paid" -#: ../lib/GaletteActivities/Entity/Subscription.php:571 +#: ../lib/GaletteActivities/Entity/Subscription.php:575 #: ../tempcache/subscriptions.html.twig:102 #: ../tempcache/subscriptions.html.twig:448 #: ../tempcache/subscription.html.twig:138 msgid "Amount" msgstr "Amount" -#: ../lib/GaletteActivities/Entity/Subscription.php:575 +#: ../lib/GaletteActivities/Entity/Subscription.php:579 msgid "Payment method" msgstr "Payment method" -#: ../lib/GaletteActivities/Entity/Subscription.php:583 +#: ../lib/GaletteActivities/Entity/Subscription.php:587 #: ../tempcache/subscriptions.html.twig:102 #: ../tempcache/subscriptions.html.twig:432 #: ../tempcache/subscription.html.twig:77 diff --git a/lang/activities_es.utf8.po b/lang/activities_es.utf8.po index 772df15..0ddcec4 100644 --- a/lang/activities_es.utf8.po +++ b/lang/activities_es.utf8.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-08-25 14:51+0200\n" -"PO-Revision-Date: 2024-08-25 14:56+0200\n" +"POT-Creation-Date: 2024-08-26 07:53+0200\n" +"PO-Revision-Date: 2024-08-26 07:55+0200\n" "Last-Translator: Johan Cwiklinski \n" "Language-Team: Spanish \n" @@ -29,7 +29,7 @@ msgid "Activities management" msgstr "Gestión de actividades" #: ../lib/GaletteActivities/Controllers/Crud/ActivitiesController.php:199 -#: ../lib/GaletteActivities/Entity/Subscription.php:559 +#: ../lib/GaletteActivities/Entity/Subscription.php:563 #: ../tempcache/subscriptions.html.twig:102 #: ../tempcache/subscriptions.html.twig:124 #: ../tempcache/subscription.html.twig:109 @@ -77,20 +77,20 @@ msgstr "La reserva nueva ha sido agregada correctamente." msgid "Subscription has been modified." msgstr "Ha sido modificada la actividad." -#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:378 +#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:382 #, fuzzy #| msgid "An error occurred while storing the booking." msgid "An error occurred while storing the subscription." msgstr "Ha ocurrido un error al almacenar la reserva." -#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:388 +#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:391 #, fuzzy #| msgid "Do not forget to store the booking" msgid "Do not forget to store the subscription" msgstr "No olvide almacenar la reserva" #. TRANS: %1$s is the member name, %2$s the activity name. -#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:491 +#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:494 #, fuzzy, php-format #| msgid "Remove booking for %1$s on %2$s" msgid "Remove subscription for %1$s on %2$s" @@ -146,14 +146,14 @@ msgid "Group" msgstr "Grupo" #: ../lib/GaletteActivities/Entity/Activity.php:428 -#: ../lib/GaletteActivities/Entity/Subscription.php:579 +#: ../lib/GaletteActivities/Entity/Subscription.php:583 #: ../tempcache/activities.html.twig:100 ../tempcache/activities.html.twig:181 #: ../tempcache/subscription.html.twig:71 msgid "Creation date" msgstr "Fecha de creación" #: ../lib/GaletteActivities/Entity/Activity.php:432 -#: ../lib/GaletteActivities/Entity/Subscription.php:591 +#: ../lib/GaletteActivities/Entity/Subscription.php:595 #: ../tempcache/subscription.html.twig:121 msgid "Comment" msgstr "Comentario" @@ -196,30 +196,36 @@ msgstr "Error al agrega una reserva nueva." msgid "Subscription updated" msgstr "Actividad actualizada" -#: ../lib/GaletteActivities/Entity/Subscription.php:563 +#: ../lib/GaletteActivities/Entity/Subscription.php:328 +#, fuzzy +#| msgid "Begin date is mandatory" +msgid "Subscription already exists for this member and activity" +msgstr "Fecha de inicio obligatoria" + +#: ../lib/GaletteActivities/Entity/Subscription.php:567 #, fuzzy #| msgid "Members as CSV" msgid "Member" msgstr "Miembros como *.csv" -#: ../lib/GaletteActivities/Entity/Subscription.php:567 +#: ../lib/GaletteActivities/Entity/Subscription.php:571 #, fuzzy #| msgid "%1$s paid" msgid "Is paid" msgstr "%1$s pagado" -#: ../lib/GaletteActivities/Entity/Subscription.php:571 +#: ../lib/GaletteActivities/Entity/Subscription.php:575 #: ../tempcache/subscriptions.html.twig:102 #: ../tempcache/subscriptions.html.twig:448 #: ../tempcache/subscription.html.twig:138 msgid "Amount" msgstr "Monto" -#: ../lib/GaletteActivities/Entity/Subscription.php:575 +#: ../lib/GaletteActivities/Entity/Subscription.php:579 msgid "Payment method" msgstr "" -#: ../lib/GaletteActivities/Entity/Subscription.php:583 +#: ../lib/GaletteActivities/Entity/Subscription.php:587 #: ../tempcache/subscriptions.html.twig:102 #: ../tempcache/subscriptions.html.twig:432 #: ../tempcache/subscription.html.twig:77 diff --git a/lang/activities_fr_FR.utf8.po b/lang/activities_fr_FR.utf8.po index a2e3cdd..2402916 100644 --- a/lang/activities_fr_FR.utf8.po +++ b/lang/activities_fr_FR.utf8.po @@ -4,8 +4,8 @@ msgid "" msgstr "" "Project-Id-Version: Galette Events plugin\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-08-25 14:51+0200\n" -"PO-Revision-Date: 2024-08-25 15:02+0200\n" +"POT-Creation-Date: 2024-08-26 07:53+0200\n" +"PO-Revision-Date: 2024-08-26 07:54+0200\n" "Last-Translator: Johan Cwiklinski \n" "Language-Team: French \n" @@ -21,7 +21,7 @@ msgid "Activities management" msgstr "Gestion des activités" #: ../lib/GaletteActivities/Controllers/Crud/ActivitiesController.php:199 -#: ../lib/GaletteActivities/Entity/Subscription.php:559 +#: ../lib/GaletteActivities/Entity/Subscription.php:563 #: ../tempcache/subscriptions.html.twig:102 #: ../tempcache/subscriptions.html.twig:124 #: ../tempcache/subscription.html.twig:109 @@ -63,16 +63,16 @@ msgstr "La nouvelle souscription a été ajoutée avec succès." msgid "Subscription has been modified." msgstr "La souscription a été modifiée." -#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:378 +#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:382 msgid "An error occurred while storing the subscription." msgstr "Une erreur est survenue à l'enregistrement de la souscription." -#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:388 +#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:391 msgid "Do not forget to store the subscription" msgstr "N'oubliez pas d'enregistrer la souscription" #. TRANS: %1$s is the member name, %2$s the activity name. -#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:491 +#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:494 #, php-format msgid "Remove subscription for %1$s on %2$s" msgstr "Supprimer la souscription pour %1$s sur %2$s" @@ -127,14 +127,14 @@ msgid "Group" msgstr "Groupe" #: ../lib/GaletteActivities/Entity/Activity.php:428 -#: ../lib/GaletteActivities/Entity/Subscription.php:579 +#: ../lib/GaletteActivities/Entity/Subscription.php:583 #: ../tempcache/activities.html.twig:100 ../tempcache/activities.html.twig:181 #: ../tempcache/subscription.html.twig:71 msgid "Creation date" msgstr "Date de création" #: ../lib/GaletteActivities/Entity/Activity.php:432 -#: ../lib/GaletteActivities/Entity/Subscription.php:591 +#: ../lib/GaletteActivities/Entity/Subscription.php:595 #: ../tempcache/subscription.html.twig:121 msgid "Comment" msgstr "Commentaire" @@ -167,26 +167,30 @@ msgstr "Erreur à l'ajout de la nouvelle souscription." msgid "Subscription updated" msgstr "Souscription mise à jour" -#: ../lib/GaletteActivities/Entity/Subscription.php:563 +#: ../lib/GaletteActivities/Entity/Subscription.php:328 +msgid "Subscription already exists for this member and activity" +msgstr "Une souscription existe déjà pour cet adhérent et cette activité" + +#: ../lib/GaletteActivities/Entity/Subscription.php:567 msgid "Member" msgstr "Adhérent" -#: ../lib/GaletteActivities/Entity/Subscription.php:567 +#: ../lib/GaletteActivities/Entity/Subscription.php:571 msgid "Is paid" msgstr "Est payée" -#: ../lib/GaletteActivities/Entity/Subscription.php:571 +#: ../lib/GaletteActivities/Entity/Subscription.php:575 #: ../tempcache/subscriptions.html.twig:102 #: ../tempcache/subscriptions.html.twig:448 #: ../tempcache/subscription.html.twig:138 msgid "Amount" msgstr "Montant" -#: ../lib/GaletteActivities/Entity/Subscription.php:575 +#: ../lib/GaletteActivities/Entity/Subscription.php:579 msgid "Payment method" msgstr "Méthode de paiement" -#: ../lib/GaletteActivities/Entity/Subscription.php:583 +#: ../lib/GaletteActivities/Entity/Subscription.php:587 #: ../tempcache/subscriptions.html.twig:102 #: ../tempcache/subscriptions.html.twig:432 #: ../tempcache/subscription.html.twig:77 diff --git a/lang/activities_it_IT.utf8.po b/lang/activities_it_IT.utf8.po index eea1f8f..14eddd5 100644 --- a/lang/activities_it_IT.utf8.po +++ b/lang/activities_it_IT.utf8.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-08-25 14:51+0200\n" -"PO-Revision-Date: 2024-08-25 14:56+0200\n" +"POT-Creation-Date: 2024-08-26 07:53+0200\n" +"PO-Revision-Date: 2024-08-26 07:55+0200\n" "Last-Translator: Johan Cwiklinski \n" "Language-Team: Italian \n" @@ -23,7 +23,7 @@ msgid "Activities management" msgstr "Gestione attività" #: ../lib/GaletteActivities/Controllers/Crud/ActivitiesController.php:199 -#: ../lib/GaletteActivities/Entity/Subscription.php:559 +#: ../lib/GaletteActivities/Entity/Subscription.php:563 #: ../tempcache/subscriptions.html.twig:102 #: ../tempcache/subscriptions.html.twig:124 #: ../tempcache/subscription.html.twig:109 @@ -71,21 +71,21 @@ msgstr "È stata aggiunta una nuova prenotazione." msgid "Subscription has been modified." msgstr "L'attività è stata modificata." -#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:378 +#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:382 #, fuzzy #| msgid "An error occurred while storing the booking." msgid "An error occurred while storing the subscription." msgstr "" "Si è verificato un errore durante la memorizzazione della prenotazione." -#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:388 +#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:391 #, fuzzy #| msgid "Do not forget to store the booking" msgid "Do not forget to store the subscription" msgstr "Non dimenticate di memorizzare la prenotazione" #. TRANS: %1$s is the member name, %2$s the activity name. -#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:491 +#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:494 #, fuzzy, php-format #| msgid "Remove booking for %1$s on %2$s" msgid "Remove subscription for %1$s on %2$s" @@ -141,14 +141,14 @@ msgid "Group" msgstr "Gruppo" #: ../lib/GaletteActivities/Entity/Activity.php:428 -#: ../lib/GaletteActivities/Entity/Subscription.php:579 +#: ../lib/GaletteActivities/Entity/Subscription.php:583 #: ../tempcache/activities.html.twig:100 ../tempcache/activities.html.twig:181 #: ../tempcache/subscription.html.twig:71 msgid "Creation date" msgstr "Data di creazione" #: ../lib/GaletteActivities/Entity/Activity.php:432 -#: ../lib/GaletteActivities/Entity/Subscription.php:591 +#: ../lib/GaletteActivities/Entity/Subscription.php:595 #: ../tempcache/subscription.html.twig:121 msgid "Comment" msgstr "Commento" @@ -191,30 +191,36 @@ msgstr "Fallita aggiunta nuova prenotazione." msgid "Subscription updated" msgstr "Attività aggiornata" -#: ../lib/GaletteActivities/Entity/Subscription.php:563 +#: ../lib/GaletteActivities/Entity/Subscription.php:328 +#, fuzzy +#| msgid "Begin date is mandatory" +msgid "Subscription already exists for this member and activity" +msgstr "La data di inizio è obbligatoria" + +#: ../lib/GaletteActivities/Entity/Subscription.php:567 #, fuzzy #| msgid "Members as CSV" msgid "Member" msgstr "Membri come CSV" -#: ../lib/GaletteActivities/Entity/Subscription.php:567 +#: ../lib/GaletteActivities/Entity/Subscription.php:571 #, fuzzy #| msgid "%1$s paid" msgid "Is paid" msgstr "%1$s pagata" -#: ../lib/GaletteActivities/Entity/Subscription.php:571 +#: ../lib/GaletteActivities/Entity/Subscription.php:575 #: ../tempcache/subscriptions.html.twig:102 #: ../tempcache/subscriptions.html.twig:448 #: ../tempcache/subscription.html.twig:138 msgid "Amount" msgstr "Importo" -#: ../lib/GaletteActivities/Entity/Subscription.php:575 +#: ../lib/GaletteActivities/Entity/Subscription.php:579 msgid "Payment method" msgstr "" -#: ../lib/GaletteActivities/Entity/Subscription.php:583 +#: ../lib/GaletteActivities/Entity/Subscription.php:587 #: ../tempcache/subscriptions.html.twig:102 #: ../tempcache/subscriptions.html.twig:432 #: ../tempcache/subscription.html.twig:77 diff --git a/lang/activities_nb_NO.utf8.po b/lang/activities_nb_NO.utf8.po index 715e483..0babdb4 100644 --- a/lang/activities_nb_NO.utf8.po +++ b/lang/activities_nb_NO.utf8.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-08-25 14:51+0200\n" -"PO-Revision-Date: 2024-08-25 14:57+0200\n" +"POT-Creation-Date: 2024-08-26 07:53+0200\n" +"PO-Revision-Date: 2024-08-26 07:56+0200\n" "Last-Translator: Johan Cwiklinski \n" "Language-Team: none\n" "Language: nb_NO\n" @@ -18,7 +18,7 @@ msgid "Activities management" msgstr "" #: ../lib/GaletteActivities/Controllers/Crud/ActivitiesController.php:199 -#: ../lib/GaletteActivities/Entity/Subscription.php:559 +#: ../lib/GaletteActivities/Entity/Subscription.php:563 #: ../tempcache/subscriptions.html.twig:102 #: ../tempcache/subscriptions.html.twig:124 #: ../tempcache/subscription.html.twig:109 @@ -60,16 +60,16 @@ msgstr "" msgid "Subscription has been modified." msgstr "" -#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:378 +#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:382 msgid "An error occurred while storing the subscription." msgstr "" -#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:388 +#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:391 msgid "Do not forget to store the subscription" msgstr "" #. TRANS: %1$s is the member name, %2$s the activity name. -#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:491 +#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:494 #, php-format msgid "Remove subscription for %1$s on %2$s" msgstr "" @@ -124,14 +124,14 @@ msgid "Group" msgstr "" #: ../lib/GaletteActivities/Entity/Activity.php:428 -#: ../lib/GaletteActivities/Entity/Subscription.php:579 +#: ../lib/GaletteActivities/Entity/Subscription.php:583 #: ../tempcache/activities.html.twig:100 ../tempcache/activities.html.twig:181 #: ../tempcache/subscription.html.twig:71 msgid "Creation date" msgstr "" #: ../lib/GaletteActivities/Entity/Activity.php:432 -#: ../lib/GaletteActivities/Entity/Subscription.php:591 +#: ../lib/GaletteActivities/Entity/Subscription.php:595 #: ../tempcache/subscription.html.twig:121 msgid "Comment" msgstr "" @@ -164,26 +164,30 @@ msgstr "" msgid "Subscription updated" msgstr "" -#: ../lib/GaletteActivities/Entity/Subscription.php:563 -msgid "Member" +#: ../lib/GaletteActivities/Entity/Subscription.php:328 +msgid "Subscription already exists for this member and activity" msgstr "" #: ../lib/GaletteActivities/Entity/Subscription.php:567 -msgid "Is paid" +msgid "Member" msgstr "" #: ../lib/GaletteActivities/Entity/Subscription.php:571 +msgid "Is paid" +msgstr "" + +#: ../lib/GaletteActivities/Entity/Subscription.php:575 #: ../tempcache/subscriptions.html.twig:102 #: ../tempcache/subscriptions.html.twig:448 #: ../tempcache/subscription.html.twig:138 msgid "Amount" msgstr "" -#: ../lib/GaletteActivities/Entity/Subscription.php:575 +#: ../lib/GaletteActivities/Entity/Subscription.php:579 msgid "Payment method" msgstr "" -#: ../lib/GaletteActivities/Entity/Subscription.php:583 +#: ../lib/GaletteActivities/Entity/Subscription.php:587 #: ../tempcache/subscriptions.html.twig:102 #: ../tempcache/subscriptions.html.twig:432 #: ../tempcache/subscription.html.twig:77 diff --git a/lang/activities_oc.utf8.po b/lang/activities_oc.utf8.po index b6e038d..51b5b1e 100644 --- a/lang/activities_oc.utf8.po +++ b/lang/activities_oc.utf8.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-08-25 14:51+0200\n" -"PO-Revision-Date: 2024-08-25 14:57+0200\n" +"POT-Creation-Date: 2024-08-26 07:53+0200\n" +"PO-Revision-Date: 2024-08-26 07:56+0200\n" "Last-Translator: Johan Cwiklinski \n" "Language-Team: Occitan \n" @@ -23,7 +23,7 @@ msgid "Activities management" msgstr "" #: ../lib/GaletteActivities/Controllers/Crud/ActivitiesController.php:199 -#: ../lib/GaletteActivities/Entity/Subscription.php:559 +#: ../lib/GaletteActivities/Entity/Subscription.php:563 #: ../tempcache/subscriptions.html.twig:102 #: ../tempcache/subscriptions.html.twig:124 #: ../tempcache/subscription.html.twig:109 @@ -65,16 +65,16 @@ msgstr "" msgid "Subscription has been modified." msgstr "" -#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:378 +#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:382 msgid "An error occurred while storing the subscription." msgstr "" -#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:388 +#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:391 msgid "Do not forget to store the subscription" msgstr "" #. TRANS: %1$s is the member name, %2$s the activity name. -#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:491 +#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:494 #, php-format msgid "Remove subscription for %1$s on %2$s" msgstr "" @@ -129,14 +129,14 @@ msgid "Group" msgstr "" #: ../lib/GaletteActivities/Entity/Activity.php:428 -#: ../lib/GaletteActivities/Entity/Subscription.php:579 +#: ../lib/GaletteActivities/Entity/Subscription.php:583 #: ../tempcache/activities.html.twig:100 ../tempcache/activities.html.twig:181 #: ../tempcache/subscription.html.twig:71 msgid "Creation date" msgstr "Data de creacion" #: ../lib/GaletteActivities/Entity/Activity.php:432 -#: ../lib/GaletteActivities/Entity/Subscription.php:591 +#: ../lib/GaletteActivities/Entity/Subscription.php:595 #: ../tempcache/subscription.html.twig:121 msgid "Comment" msgstr "Comentari" @@ -177,26 +177,32 @@ msgstr "" msgid "Subscription updated" msgstr "Data de creacion" -#: ../lib/GaletteActivities/Entity/Subscription.php:563 +#: ../lib/GaletteActivities/Entity/Subscription.php:328 +#, fuzzy +#| msgid "Begin date is mandatory" +msgid "Subscription already exists for this member and activity" +msgstr "Lo jorn de començament es demandat" + +#: ../lib/GaletteActivities/Entity/Subscription.php:567 msgid "Member" msgstr "" -#: ../lib/GaletteActivities/Entity/Subscription.php:567 +#: ../lib/GaletteActivities/Entity/Subscription.php:571 msgid "Is paid" msgstr "" -#: ../lib/GaletteActivities/Entity/Subscription.php:571 +#: ../lib/GaletteActivities/Entity/Subscription.php:575 #: ../tempcache/subscriptions.html.twig:102 #: ../tempcache/subscriptions.html.twig:448 #: ../tempcache/subscription.html.twig:138 msgid "Amount" msgstr "Montant" -#: ../lib/GaletteActivities/Entity/Subscription.php:575 +#: ../lib/GaletteActivities/Entity/Subscription.php:579 msgid "Payment method" msgstr "" -#: ../lib/GaletteActivities/Entity/Subscription.php:583 +#: ../lib/GaletteActivities/Entity/Subscription.php:587 #: ../tempcache/subscriptions.html.twig:102 #: ../tempcache/subscriptions.html.twig:432 #: ../tempcache/subscription.html.twig:77 diff --git a/lang/activities_ota.utf8.po b/lang/activities_ota.utf8.po index 6c9497e..8857369 100644 --- a/lang/activities_ota.utf8.po +++ b/lang/activities_ota.utf8.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-08-25 14:51+0200\n" -"PO-Revision-Date: 2024-08-25 14:57+0200\n" +"POT-Creation-Date: 2024-08-26 07:53+0200\n" +"PO-Revision-Date: 2024-08-26 07:56+0200\n" "Last-Translator: Johan Cwiklinski \n" "Language-Team: none\n" "Language: ota\n" @@ -18,7 +18,7 @@ msgid "Activities management" msgstr "" #: ../lib/GaletteActivities/Controllers/Crud/ActivitiesController.php:199 -#: ../lib/GaletteActivities/Entity/Subscription.php:559 +#: ../lib/GaletteActivities/Entity/Subscription.php:563 #: ../tempcache/subscriptions.html.twig:102 #: ../tempcache/subscriptions.html.twig:124 #: ../tempcache/subscription.html.twig:109 @@ -60,16 +60,16 @@ msgstr "" msgid "Subscription has been modified." msgstr "" -#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:378 +#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:382 msgid "An error occurred while storing the subscription." msgstr "" -#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:388 +#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:391 msgid "Do not forget to store the subscription" msgstr "" #. TRANS: %1$s is the member name, %2$s the activity name. -#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:491 +#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:494 #, php-format msgid "Remove subscription for %1$s on %2$s" msgstr "" @@ -124,14 +124,14 @@ msgid "Group" msgstr "" #: ../lib/GaletteActivities/Entity/Activity.php:428 -#: ../lib/GaletteActivities/Entity/Subscription.php:579 +#: ../lib/GaletteActivities/Entity/Subscription.php:583 #: ../tempcache/activities.html.twig:100 ../tempcache/activities.html.twig:181 #: ../tempcache/subscription.html.twig:71 msgid "Creation date" msgstr "" #: ../lib/GaletteActivities/Entity/Activity.php:432 -#: ../lib/GaletteActivities/Entity/Subscription.php:591 +#: ../lib/GaletteActivities/Entity/Subscription.php:595 #: ../tempcache/subscription.html.twig:121 msgid "Comment" msgstr "" @@ -164,26 +164,30 @@ msgstr "" msgid "Subscription updated" msgstr "" -#: ../lib/GaletteActivities/Entity/Subscription.php:563 -msgid "Member" +#: ../lib/GaletteActivities/Entity/Subscription.php:328 +msgid "Subscription already exists for this member and activity" msgstr "" #: ../lib/GaletteActivities/Entity/Subscription.php:567 -msgid "Is paid" +msgid "Member" msgstr "" #: ../lib/GaletteActivities/Entity/Subscription.php:571 +msgid "Is paid" +msgstr "" + +#: ../lib/GaletteActivities/Entity/Subscription.php:575 #: ../tempcache/subscriptions.html.twig:102 #: ../tempcache/subscriptions.html.twig:448 #: ../tempcache/subscription.html.twig:138 msgid "Amount" msgstr "" -#: ../lib/GaletteActivities/Entity/Subscription.php:575 +#: ../lib/GaletteActivities/Entity/Subscription.php:579 msgid "Payment method" msgstr "" -#: ../lib/GaletteActivities/Entity/Subscription.php:583 +#: ../lib/GaletteActivities/Entity/Subscription.php:587 #: ../tempcache/subscriptions.html.twig:102 #: ../tempcache/subscriptions.html.twig:432 #: ../tempcache/subscription.html.twig:77 diff --git a/lang/activities_pt.utf8.po b/lang/activities_pt.utf8.po index bbe9358..f5411b5 100644 --- a/lang/activities_pt.utf8.po +++ b/lang/activities_pt.utf8.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-08-25 14:51+0200\n" -"PO-Revision-Date: 2024-08-25 14:54+0200\n" +"POT-Creation-Date: 2024-08-26 07:53+0200\n" +"PO-Revision-Date: 2024-08-26 07:54+0200\n" "Last-Translator: Johan Cwiklinski \n" "Language-Team: none\n" "Language: pt\n" @@ -22,7 +22,7 @@ msgid "Activities management" msgstr "" #: ../lib/GaletteActivities/Controllers/Crud/ActivitiesController.php:199 -#: ../lib/GaletteActivities/Entity/Subscription.php:559 +#: ../lib/GaletteActivities/Entity/Subscription.php:563 #: ../tempcache/subscriptions.html.twig:102 #: ../tempcache/subscriptions.html.twig:124 #: ../tempcache/subscription.html.twig:109 @@ -64,16 +64,16 @@ msgstr "" msgid "Subscription has been modified." msgstr "" -#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:378 +#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:382 msgid "An error occurred while storing the subscription." msgstr "" -#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:388 +#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:391 msgid "Do not forget to store the subscription" msgstr "" #. TRANS: %1$s is the member name, %2$s the activity name. -#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:491 +#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:494 #, php-format msgid "Remove subscription for %1$s on %2$s" msgstr "" @@ -128,14 +128,14 @@ msgid "Group" msgstr "" #: ../lib/GaletteActivities/Entity/Activity.php:428 -#: ../lib/GaletteActivities/Entity/Subscription.php:579 +#: ../lib/GaletteActivities/Entity/Subscription.php:583 #: ../tempcache/activities.html.twig:100 ../tempcache/activities.html.twig:181 #: ../tempcache/subscription.html.twig:71 msgid "Creation date" msgstr "" #: ../lib/GaletteActivities/Entity/Activity.php:432 -#: ../lib/GaletteActivities/Entity/Subscription.php:591 +#: ../lib/GaletteActivities/Entity/Subscription.php:595 #: ../tempcache/subscription.html.twig:121 msgid "Comment" msgstr "" @@ -168,26 +168,30 @@ msgstr "" msgid "Subscription updated" msgstr "" -#: ../lib/GaletteActivities/Entity/Subscription.php:563 -msgid "Member" +#: ../lib/GaletteActivities/Entity/Subscription.php:328 +msgid "Subscription already exists for this member and activity" msgstr "" #: ../lib/GaletteActivities/Entity/Subscription.php:567 -msgid "Is paid" +msgid "Member" msgstr "" #: ../lib/GaletteActivities/Entity/Subscription.php:571 +msgid "Is paid" +msgstr "" + +#: ../lib/GaletteActivities/Entity/Subscription.php:575 #: ../tempcache/subscriptions.html.twig:102 #: ../tempcache/subscriptions.html.twig:448 #: ../tempcache/subscription.html.twig:138 msgid "Amount" msgstr "" -#: ../lib/GaletteActivities/Entity/Subscription.php:575 +#: ../lib/GaletteActivities/Entity/Subscription.php:579 msgid "Payment method" msgstr "" -#: ../lib/GaletteActivities/Entity/Subscription.php:583 +#: ../lib/GaletteActivities/Entity/Subscription.php:587 #: ../tempcache/subscriptions.html.twig:102 #: ../tempcache/subscriptions.html.twig:432 #: ../tempcache/subscription.html.twig:77 diff --git a/lang/activities_ru.utf8.po b/lang/activities_ru.utf8.po index e4c8950..868ede1 100644 --- a/lang/activities_ru.utf8.po +++ b/lang/activities_ru.utf8.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-08-25 14:51+0200\n" -"PO-Revision-Date: 2024-08-25 14:54+0200\n" +"POT-Creation-Date: 2024-08-26 07:53+0200\n" +"PO-Revision-Date: 2024-08-26 07:54+0200\n" "Last-Translator: Johan Cwiklinski \n" "Language-Team: Russian \n" @@ -24,7 +24,7 @@ msgid "Activities management" msgstr "" #: ../lib/GaletteActivities/Controllers/Crud/ActivitiesController.php:199 -#: ../lib/GaletteActivities/Entity/Subscription.php:559 +#: ../lib/GaletteActivities/Entity/Subscription.php:563 #: ../tempcache/subscriptions.html.twig:102 #: ../tempcache/subscriptions.html.twig:124 #: ../tempcache/subscription.html.twig:109 @@ -66,16 +66,16 @@ msgstr "" msgid "Subscription has been modified." msgstr "" -#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:378 +#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:382 msgid "An error occurred while storing the subscription." msgstr "" -#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:388 +#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:391 msgid "Do not forget to store the subscription" msgstr "" #. TRANS: %1$s is the member name, %2$s the activity name. -#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:491 +#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:494 #, php-format msgid "Remove subscription for %1$s on %2$s" msgstr "" @@ -130,14 +130,14 @@ msgid "Group" msgstr "" #: ../lib/GaletteActivities/Entity/Activity.php:428 -#: ../lib/GaletteActivities/Entity/Subscription.php:579 +#: ../lib/GaletteActivities/Entity/Subscription.php:583 #: ../tempcache/activities.html.twig:100 ../tempcache/activities.html.twig:181 #: ../tempcache/subscription.html.twig:71 msgid "Creation date" msgstr "" #: ../lib/GaletteActivities/Entity/Activity.php:432 -#: ../lib/GaletteActivities/Entity/Subscription.php:591 +#: ../lib/GaletteActivities/Entity/Subscription.php:595 #: ../tempcache/subscription.html.twig:121 msgid "Comment" msgstr "" @@ -170,26 +170,30 @@ msgstr "" msgid "Subscription updated" msgstr "" -#: ../lib/GaletteActivities/Entity/Subscription.php:563 -msgid "Member" +#: ../lib/GaletteActivities/Entity/Subscription.php:328 +msgid "Subscription already exists for this member and activity" msgstr "" #: ../lib/GaletteActivities/Entity/Subscription.php:567 -msgid "Is paid" +msgid "Member" msgstr "" #: ../lib/GaletteActivities/Entity/Subscription.php:571 +msgid "Is paid" +msgstr "" + +#: ../lib/GaletteActivities/Entity/Subscription.php:575 #: ../tempcache/subscriptions.html.twig:102 #: ../tempcache/subscriptions.html.twig:448 #: ../tempcache/subscription.html.twig:138 msgid "Amount" msgstr "" -#: ../lib/GaletteActivities/Entity/Subscription.php:575 +#: ../lib/GaletteActivities/Entity/Subscription.php:579 msgid "Payment method" msgstr "" -#: ../lib/GaletteActivities/Entity/Subscription.php:583 +#: ../lib/GaletteActivities/Entity/Subscription.php:587 #: ../tempcache/subscriptions.html.twig:102 #: ../tempcache/subscriptions.html.twig:432 #: ../tempcache/subscription.html.twig:77 diff --git a/lang/activities_si.utf8.po b/lang/activities_si.utf8.po index fd3900e..0886de6 100644 --- a/lang/activities_si.utf8.po +++ b/lang/activities_si.utf8.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-08-25 14:51+0200\n" -"PO-Revision-Date: 2024-08-25 14:55+0200\n" +"POT-Creation-Date: 2024-08-26 07:53+0200\n" +"PO-Revision-Date: 2024-08-26 07:54+0200\n" "Last-Translator: Johan Cwiklinski \n" "Language-Team: none\n" "Language: si\n" @@ -18,7 +18,7 @@ msgid "Activities management" msgstr "" #: ../lib/GaletteActivities/Controllers/Crud/ActivitiesController.php:199 -#: ../lib/GaletteActivities/Entity/Subscription.php:559 +#: ../lib/GaletteActivities/Entity/Subscription.php:563 #: ../tempcache/subscriptions.html.twig:102 #: ../tempcache/subscriptions.html.twig:124 #: ../tempcache/subscription.html.twig:109 @@ -60,16 +60,16 @@ msgstr "" msgid "Subscription has been modified." msgstr "" -#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:378 +#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:382 msgid "An error occurred while storing the subscription." msgstr "" -#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:388 +#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:391 msgid "Do not forget to store the subscription" msgstr "" #. TRANS: %1$s is the member name, %2$s the activity name. -#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:491 +#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:494 #, php-format msgid "Remove subscription for %1$s on %2$s" msgstr "" @@ -124,14 +124,14 @@ msgid "Group" msgstr "" #: ../lib/GaletteActivities/Entity/Activity.php:428 -#: ../lib/GaletteActivities/Entity/Subscription.php:579 +#: ../lib/GaletteActivities/Entity/Subscription.php:583 #: ../tempcache/activities.html.twig:100 ../tempcache/activities.html.twig:181 #: ../tempcache/subscription.html.twig:71 msgid "Creation date" msgstr "" #: ../lib/GaletteActivities/Entity/Activity.php:432 -#: ../lib/GaletteActivities/Entity/Subscription.php:591 +#: ../lib/GaletteActivities/Entity/Subscription.php:595 #: ../tempcache/subscription.html.twig:121 msgid "Comment" msgstr "" @@ -164,26 +164,30 @@ msgstr "" msgid "Subscription updated" msgstr "" -#: ../lib/GaletteActivities/Entity/Subscription.php:563 -msgid "Member" +#: ../lib/GaletteActivities/Entity/Subscription.php:328 +msgid "Subscription already exists for this member and activity" msgstr "" #: ../lib/GaletteActivities/Entity/Subscription.php:567 -msgid "Is paid" +msgid "Member" msgstr "" #: ../lib/GaletteActivities/Entity/Subscription.php:571 +msgid "Is paid" +msgstr "" + +#: ../lib/GaletteActivities/Entity/Subscription.php:575 #: ../tempcache/subscriptions.html.twig:102 #: ../tempcache/subscriptions.html.twig:448 #: ../tempcache/subscription.html.twig:138 msgid "Amount" msgstr "" -#: ../lib/GaletteActivities/Entity/Subscription.php:575 +#: ../lib/GaletteActivities/Entity/Subscription.php:579 msgid "Payment method" msgstr "" -#: ../lib/GaletteActivities/Entity/Subscription.php:583 +#: ../lib/GaletteActivities/Entity/Subscription.php:587 #: ../tempcache/subscriptions.html.twig:102 #: ../tempcache/subscriptions.html.twig:432 #: ../tempcache/subscription.html.twig:77 diff --git a/lang/activities_tr.utf8.po b/lang/activities_tr.utf8.po index f734b6d..e2e3257 100644 --- a/lang/activities_tr.utf8.po +++ b/lang/activities_tr.utf8.po @@ -3,8 +3,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-08-25 14:51+0200\n" -"PO-Revision-Date: 2024-08-25 14:55+0200\n" +"POT-Creation-Date: 2024-08-26 07:53+0200\n" +"PO-Revision-Date: 2024-08-26 07:54+0200\n" "Last-Translator: Johan Cwiklinski \n" "Language-Team: Turkish \n" @@ -20,7 +20,7 @@ msgid "Activities management" msgstr "" #: ../lib/GaletteActivities/Controllers/Crud/ActivitiesController.php:199 -#: ../lib/GaletteActivities/Entity/Subscription.php:559 +#: ../lib/GaletteActivities/Entity/Subscription.php:563 #: ../tempcache/subscriptions.html.twig:102 #: ../tempcache/subscriptions.html.twig:124 #: ../tempcache/subscription.html.twig:109 @@ -62,16 +62,16 @@ msgstr "" msgid "Subscription has been modified." msgstr "" -#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:378 +#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:382 msgid "An error occurred while storing the subscription." msgstr "" -#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:388 +#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:391 msgid "Do not forget to store the subscription" msgstr "" #. TRANS: %1$s is the member name, %2$s the activity name. -#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:491 +#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:494 #, php-format msgid "Remove subscription for %1$s on %2$s" msgstr "" @@ -126,14 +126,14 @@ msgid "Group" msgstr "" #: ../lib/GaletteActivities/Entity/Activity.php:428 -#: ../lib/GaletteActivities/Entity/Subscription.php:579 +#: ../lib/GaletteActivities/Entity/Subscription.php:583 #: ../tempcache/activities.html.twig:100 ../tempcache/activities.html.twig:181 #: ../tempcache/subscription.html.twig:71 msgid "Creation date" msgstr "" #: ../lib/GaletteActivities/Entity/Activity.php:432 -#: ../lib/GaletteActivities/Entity/Subscription.php:591 +#: ../lib/GaletteActivities/Entity/Subscription.php:595 #: ../tempcache/subscription.html.twig:121 msgid "Comment" msgstr "" @@ -166,26 +166,30 @@ msgstr "" msgid "Subscription updated" msgstr "" -#: ../lib/GaletteActivities/Entity/Subscription.php:563 -msgid "Member" +#: ../lib/GaletteActivities/Entity/Subscription.php:328 +msgid "Subscription already exists for this member and activity" msgstr "" #: ../lib/GaletteActivities/Entity/Subscription.php:567 -msgid "Is paid" +msgid "Member" msgstr "" #: ../lib/GaletteActivities/Entity/Subscription.php:571 +msgid "Is paid" +msgstr "" + +#: ../lib/GaletteActivities/Entity/Subscription.php:575 #: ../tempcache/subscriptions.html.twig:102 #: ../tempcache/subscriptions.html.twig:448 #: ../tempcache/subscription.html.twig:138 msgid "Amount" msgstr "" -#: ../lib/GaletteActivities/Entity/Subscription.php:575 +#: ../lib/GaletteActivities/Entity/Subscription.php:579 msgid "Payment method" msgstr "" -#: ../lib/GaletteActivities/Entity/Subscription.php:583 +#: ../lib/GaletteActivities/Entity/Subscription.php:587 #: ../tempcache/subscriptions.html.twig:102 #: ../tempcache/subscriptions.html.twig:432 #: ../tempcache/subscription.html.twig:77 diff --git a/lang/activities_uk.utf8.po b/lang/activities_uk.utf8.po index db9ff92..067b0dc 100644 --- a/lang/activities_uk.utf8.po +++ b/lang/activities_uk.utf8.po @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-08-25 14:51+0200\n" -"PO-Revision-Date: 2024-08-25 14:55+0200\n" +"POT-Creation-Date: 2024-08-26 07:53+0200\n" +"PO-Revision-Date: 2024-08-26 07:54+0200\n" "Last-Translator: Johan Cwiklinski \n" "Language-Team: Ukrainian \n" @@ -23,7 +23,7 @@ msgid "Activities management" msgstr "Управління діяльностями" #: ../lib/GaletteActivities/Controllers/Crud/ActivitiesController.php:199 -#: ../lib/GaletteActivities/Entity/Subscription.php:559 +#: ../lib/GaletteActivities/Entity/Subscription.php:563 #: ../tempcache/subscriptions.html.twig:102 #: ../tempcache/subscriptions.html.twig:124 #: ../tempcache/subscription.html.twig:109 @@ -71,20 +71,20 @@ msgstr "Нове бронювання успішно додано." msgid "Subscription has been modified." msgstr "Діяльність змінено." -#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:378 +#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:382 #, fuzzy #| msgid "An error occurred while storing the booking." msgid "An error occurred while storing the subscription." msgstr "Під час зберігання бронювання сталася помилка." -#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:388 +#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:391 #, fuzzy #| msgid "Do not forget to store the booking" msgid "Do not forget to store the subscription" msgstr "Не забудьте зберегти бронювання" #. TRANS: %1$s is the member name, %2$s the activity name. -#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:491 +#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:494 #, fuzzy, php-format #| msgid "Remove booking for %1$s on %2$s" msgid "Remove subscription for %1$s on %2$s" @@ -140,14 +140,14 @@ msgid "Group" msgstr "Група" #: ../lib/GaletteActivities/Entity/Activity.php:428 -#: ../lib/GaletteActivities/Entity/Subscription.php:579 +#: ../lib/GaletteActivities/Entity/Subscription.php:583 #: ../tempcache/activities.html.twig:100 ../tempcache/activities.html.twig:181 #: ../tempcache/subscription.html.twig:71 msgid "Creation date" msgstr "Дата створення" #: ../lib/GaletteActivities/Entity/Activity.php:432 -#: ../lib/GaletteActivities/Entity/Subscription.php:591 +#: ../lib/GaletteActivities/Entity/Subscription.php:595 #: ../tempcache/subscription.html.twig:121 msgid "Comment" msgstr "Коментар" @@ -190,30 +190,36 @@ msgstr "Не вдалося додати нове бронювання." msgid "Subscription updated" msgstr "Діяльність оновлено" -#: ../lib/GaletteActivities/Entity/Subscription.php:563 +#: ../lib/GaletteActivities/Entity/Subscription.php:328 +#, fuzzy +#| msgid "Begin date is mandatory" +msgid "Subscription already exists for this member and activity" +msgstr "Дата початку є обов’язковою" + +#: ../lib/GaletteActivities/Entity/Subscription.php:567 #, fuzzy #| msgid "Members as CSV" msgid "Member" msgstr "Члени як CSV" -#: ../lib/GaletteActivities/Entity/Subscription.php:567 +#: ../lib/GaletteActivities/Entity/Subscription.php:571 #, fuzzy #| msgid "%1$s paid" msgid "Is paid" msgstr "%1$s оплачено" -#: ../lib/GaletteActivities/Entity/Subscription.php:571 +#: ../lib/GaletteActivities/Entity/Subscription.php:575 #: ../tempcache/subscriptions.html.twig:102 #: ../tempcache/subscriptions.html.twig:448 #: ../tempcache/subscription.html.twig:138 msgid "Amount" msgstr "Сума" -#: ../lib/GaletteActivities/Entity/Subscription.php:575 +#: ../lib/GaletteActivities/Entity/Subscription.php:579 msgid "Payment method" msgstr "" -#: ../lib/GaletteActivities/Entity/Subscription.php:583 +#: ../lib/GaletteActivities/Entity/Subscription.php:587 #: ../tempcache/subscriptions.html.twig:102 #: ../tempcache/subscriptions.html.twig:432 #: ../tempcache/subscription.html.twig:77 diff --git a/lang/ar.utf8/LC_MESSAGES/activities.mo b/lang/ar.utf8/LC_MESSAGES/activities.mo index 4c39a028de7e4268addc5e837132eb975cc35394..211bc15d3aadc8d750457a0b936215d34c4112d0 100644 GIT binary patch delta 18 acmX@idYE;>S9UW619K}=lZ}6lGXelXRtE9_ delta 18 acmX@idYE;>S9VhcLlY}gndN)soh)R0AtyCWtyE}HE(!``f`TbW8cZ!6BWW?#A}C10 zOSNdDP>ZA@m_-nXM$)2MCIvR9mn8)*# zf8P@}!OaF zp(gZd^?ibwaHE+o<3=pvFD7Nx*nlDAll7t!960poQ4?B1 zRjiO~w_*r0h;K)@(LiC$$5W`%T|gx=hMVwO%6q7#c#1{1fcozTDgmvBo^!AnT~vZ$ zRNy`=#~YX^=4P531$c=n=?B#NZ>Yrnpl0G^nKk+-C#r;9L{lO$)Sehe&F}&8i_M`* z{|1@7eMU{}J8Dn-%C^L6hXSH1KsBmE8!F>2RLM_bE%smtCs2E09=rqw}c`?np64T01iBzGMtS;pN z)KZ*4?TG~Hzq_aerc=+)PGD7{~EvmYH4KbaTxz-Tt_%Fi1)bxY61lUBbg&ItF0`dr**|e~0W3H6+x< zAaw{jC=}hiSZ#PH!b{;r2qeNo1$7A&D(KLqpzm*+Vc+@8%=_;9KF{;M%U!Pv;pZ0j zfpL{-yJ_7Cv(wn?a^srz%=X|6cH<)M#P`^No0!IA(rgE2u>pO|;6cpcVB9}~&Aeaw z-yhl}4_Q9UAU}J;tq&J4z;)b)>695i>)@sZ3fP4EaSN8v#}lae&Y{NLL@b%auHkcO6(MBD;{ARzD51-6Dok8@%vv?V9o507A)XC zEaNV$VyKC)^Pp1Rk2~g30WG02c!fpBY!y|y1gj{3PSjZ#MrC#e8DbNtl20N@+e1`B zk5OmgY23fsXkmSUuknCisE89pqf)n`N|(a`E2y(@1GObns0AYAXLH<0+7{5q7pVC@ zqQ-qk1@;?t7Me2DUm5v?r;cINSr|d>@m16o+(Vs(S=7QSr~u!g#(h9lYy-964O)|<=#L4*aR diff --git a/lang/fr_FR.utf8/LC_MESSAGES/activities.mo b/lang/fr_FR.utf8/LC_MESSAGES/activities.mo index 00a366c607f691333567bffd1964af6ef4bfbdb2..9f864788fe932d91f57554449640ef33bc18fe75 100644 GIT binary patch delta 1321 zcmXxjOGs2v9LMo9H9peJ($dr(M=d2aYr?dAMCv(PTMoC(XZUT!U znu?$>-DM95CkWcK7zu(1BEs4ffry(n(IShe?{Bor-1(e)?s@$G=bSsg{YP2!bB_C# z;cDaF#9g(*7%w)u`Qw^MF=jJP;x>GVc{qoK_!~1YFV&b0Sd8gdhik9}i}2X;`#xOD z^XSt1sJTI59Tk(v&&2uLi7(KD3z&_CX~ys~75r&}J(z_JxC%S498aLeyNGIc6&2WR zEWpR8gkB}MgnM$ld5Aw?NpaKk_+6|%>X$&>tHC&AoxC5V{GMz;w zw18T%Jfhu#9!zI`bDV+(@?s8lqL%JFDv%LekC&Fci`t5(n2#S&{l1|B(0=GS3-_T# z1?WXh+=pB7GDbI2ct}ALBv4EG5mi5r3hXZ`6L+RD<1UsHHPAC=Qy}lr;!iBc0tTUr zX+@otBS>tf3l&&Ds{crqi6%3+zufRSYOmg+#W~c{r?4Cin1#*Qff{HGiN)MQP4EDf z=`?C3X0Q_9p%VIoYM;k}(pHpYv;Jz(L`60FQHSIXmf{^Lh)HnyR9lfaW+QuoAQix*-&SLUwz+_+?b#}pcP|wY%0KBLH zJ9A?d?rK*{%kr$0r~ix-vc5pK^>s!3L;lEcJUgSn zl~!wa*VXT>iSNq%n%aIU;Mj0*Fx(aL4@CUIz|t^|?M_UcO-$H<;9$shIT7pY?oCXE UoIu3#Kt;s)KWbtsmYp;E4|wdG6aWAK delta 1192 zcmXZbNoW&M9LMp0Y?hjsn#LtIaY@oNLAuZsOKn_|C?ZABgHRAbsh|)lE*Eh@BTB{P zV9KBuZ4r9XODmCH^jPuWLIsg}Q1Bw62p)=vAo%^o88Y*E^Jd=r|Nrkz7PDVEs-L3X zJH}DwT+5kRVs-$#yj(bHKC^W=jv1WB)%XtM_#K1j_nWQ4R&2%`wqP$Nu;@NNh!O5j z|9@V!D>Pc^7)O3K#ibh`VICK7IR*n}{4CBz0n!-8PF#wEn8Tf@`9@LiT|^~z4cqWO zs-W3Mf0asTsPb>P0t1YqC`;fbOd*eK7?t25)O$x!i*ybZ@DeV=8g9f1RHZLa1udXf z%ulxKF@?>YNGk5Q}Fh9icZCw@RXb} z@5#2UbSnqtKghX_Q#qIu_O*M;PTm(wZPz_Vij)6AgctCIiGb_89f`Pe}sp)1e)@{rHJR=1@ delta 20 bcmX>gctCIiGb_8Pf}x3(so7>O)@{rHJPZXq diff --git a/lang/nb_NO.utf8/LC_MESSAGES/activities.mo b/lang/nb_NO.utf8/LC_MESSAGES/activities.mo index 41898461550578fac3320a14fdcd5ec6f98a205a..809a01d3e0554c084cde297f01dfd76220adc5e3 100644 GIT binary patch delta 17 YcmZo+ZegC#z;32sU~Xk*#tKFNJKhB^ delta 20 bcmdnWx|MZ<86&%?f}x3(srhDG#tKFNJI4hr diff --git a/lang/ota.utf8/LC_MESSAGES/activities.mo b/lang/ota.utf8/LC_MESSAGES/activities.mo index 98991cbd20b87d43153b15e67c55e01f55f49964..0b7d0c2ff87e68c0acfa78f3ae0f644f1b9a7a7d 100644 GIT binary patch delta 17 YcmZo-ZepI$z;32sU~Xkh($ diff --git a/lang/pt.utf8/LC_MESSAGES/activities.mo b/lang/pt.utf8/LC_MESSAGES/activities.mo index 1da6f363d881084a2d636098de048ff4efaf79a4..9c9ba970d9c919bd09b788ed1d04ff99f91a5383 100644 GIT binary patch delta 14 Vcmeyz^p9ym1B;o0f%(LiUjQrx1>pby delta 14 Vcmeyz^p9ym1BOJv diff --git a/lang/ru.utf8/LC_MESSAGES/activities.mo b/lang/ru.utf8/LC_MESSAGES/activities.mo index 27cace438bb77c19812fc988a765324d6653be82..bc362131dcaa7788bd07984c6f25707dcf58ab72 100644 GIT binary patch delta 15 WcmdnMvVmp7ToyA01M`gw`xyZ$wgou= delta 15 WcmdnMvVmp7TozLWLz9gQ`xyZ$r3E$s diff --git a/lang/si.utf8/LC_MESSAGES/activities.mo b/lang/si.utf8/LC_MESSAGES/activities.mo index 71ae6dbd5941076542e6b49d1d67a321ef54684c..a6879271b36673d6b251627cddfdea90d508e28e 100644 GIT binary patch delta 17 YcmZo*ZeX6!z;32sU~XkFj{pDw delta 17 YcmZo*ZeX6!z;3EwXkuk*IBe?zMgTZ>1#|!a diff --git a/lang/uk.utf8/LC_MESSAGES/activities.mo b/lang/uk.utf8/LC_MESSAGES/activities.mo index 9b8454d2f099959a691eb676671f311107f61029..e44838a898a40a71dba4fcc2a09ad479c31f8af4 100644 GIT binary patch delta 20 bcmX>ndQNl$Gb_89f`Pe}smW$8)+4L{KHmj# delta 20 bcmX>ndQNl$Gb_8Pf}x3(sp)1e)+4L{KF9@c diff --git a/lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php b/lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php index f4b69eb..51ec817 100644 --- a/lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php +++ b/lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php @@ -375,9 +375,12 @@ public function doEdit(Request $request, Response $response, int $id = null, str } } elseif ($store === false) { //something went wrong :'( - $error_detected[] = _T("An error occurred while storing the subscription.", "activities"); - } else { - $error_detected[] = $store; + $errors = $subscription->getErrors(); + if (count($errors)) { + $error_detected = array_merge($error_detected, $errors); + } else { + $error_detected[] = _T("An error occurred while storing the subscription.", "activities"); + } } } diff --git a/lib/GaletteActivities/Entity/Subscription.php b/lib/GaletteActivities/Entity/Subscription.php index a2095c3..ebad40e 100644 --- a/lib/GaletteActivities/Entity/Subscription.php +++ b/lib/GaletteActivities/Entity/Subscription.php @@ -256,15 +256,15 @@ public function store(): bool try { $this->zdb->connection->beginTransaction(); $values = array( - Activity::PK => $this->id_activity, - Adherent::PK => $this->id_member, - 'is_paid' => ($this->paid ?: - ($this->zdb->isPostgres() ? 'false' : 0)), - 'payment_method' => $this->payment_method, - 'payment_amount' => $this->payment_amount, + Activity::PK => $this->id_activity, + Adherent::PK => $this->id_member, + 'is_paid' => ($this->paid ?: + ($this->zdb->isPostgres() ? 'false' : 0)), + 'payment_method' => $this->payment_method, + 'payment_amount' => $this->payment_amount, 'subscription_date' => $this->subscription_date, - 'end_date' => $this->end_date, - 'comment' => $this->comment + 'end_date' => $this->end_date, + 'comment' => $this->comment ); if (!isset($this->id) || $this->id == '') { @@ -323,6 +323,10 @@ public function store(): bool $this->zdb->connection->commit(); return true; + } catch (\OverflowException $e) { + $this->zdb->connection->rollBack(); + $this->errors[] = _T('Subscription already exists for this member and activity', 'activities'); + return false; } catch (\Exception $e) { $this->zdb->connection->rollBack(); Analog::log( diff --git a/tests/GaletteActivities/Entity/tests/units/Activity.php b/tests/GaletteActivities/Entity/tests/units/Activity.php index c12486e..076f567 100644 --- a/tests/GaletteActivities/Entity/tests/units/Activity.php +++ b/tests/GaletteActivities/Entity/tests/units/Activity.php @@ -60,8 +60,8 @@ public function testEmpty(): void $activity = new \GaletteActivities\Entity\Activity($this->zdb); $this->assertNull($activity->getId()); - $this->assertSame('',$activity->getName()); - $this->assertSame('',$activity->getCreationDate()); + $this->assertSame('', $activity->getName()); + $this->assertSame('', $activity->getCreationDate()); $this->assertNull($activity->getPrice()); $this->assertSame('', $activity->getComment()); } diff --git a/tests/GaletteActivities/Entity/tests/units/Subscription.php b/tests/GaletteActivities/Entity/tests/units/Subscription.php index f160082..59daf61 100644 --- a/tests/GaletteActivities/Entity/tests/units/Subscription.php +++ b/tests/GaletteActivities/Entity/tests/units/Subscription.php @@ -192,7 +192,7 @@ public function testCrud(): void $subscription_id = $subscription->getId(); //member is not part of any group - $this->assertCount(0,$member_one->getGroups()); + $this->assertCount(0, $member_one->getGroups()); $this->assertFalse($subscription->isPaid()); //by default, amount is set to activity price @@ -247,6 +247,24 @@ public function testCrud(): void $member_one->loadGroups(); $groups = $member_one->getGroups(); $this->assertCount(1, $groups); + + //no duplicate on subscriptions + $subscription = new \GaletteActivities\Entity\Subscription($this->zdb); + $data = [ + 'activity' => $gactivity_id, + 'member' => $member_one->id, + 'subscription_date' => (new \DateTime())->format('Y-m-d'), + 'end_date' => (new \DateTime())->modify('+1 year')->format('Y-m-d'), + 'comment' => 'Comment ' . $this->seed, + ]; + $this->assertTrue($subscription->check($data)); + $this->assertFalse($subscription->store()); + $this->assertSame( + [ + 'Subscription already exists for this member and activity' + ], + $subscription->getErrors() + ); } /** diff --git a/tests/TestsBootstrap.php b/tests/TestsBootstrap.php index 6a3cda2..3a7bb74 100644 --- a/tests/TestsBootstrap.php +++ b/tests/TestsBootstrap.php @@ -1,5 +1,7 @@