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 4c39a02..211bc15 100644 Binary files a/lang/ar.utf8/LC_MESSAGES/activities.mo and b/lang/ar.utf8/LC_MESSAGES/activities.mo differ diff --git a/lang/br.utf8/LC_MESSAGES/activities.mo b/lang/br.utf8/LC_MESSAGES/activities.mo index 27f9ad2..81e83d7 100644 Binary files a/lang/br.utf8/LC_MESSAGES/activities.mo and b/lang/br.utf8/LC_MESSAGES/activities.mo differ diff --git a/lang/ca.utf8/LC_MESSAGES/activities.mo b/lang/ca.utf8/LC_MESSAGES/activities.mo index 3d4533c..22012bc 100644 Binary files a/lang/ca.utf8/LC_MESSAGES/activities.mo and b/lang/ca.utf8/LC_MESSAGES/activities.mo differ diff --git a/lang/de_DE.utf8/LC_MESSAGES/activities.mo b/lang/de_DE.utf8/LC_MESSAGES/activities.mo index 8742022..9107b1d 100644 Binary files a/lang/de_DE.utf8/LC_MESSAGES/activities.mo and b/lang/de_DE.utf8/LC_MESSAGES/activities.mo differ diff --git a/lang/en_US/LC_MESSAGES/activities.mo b/lang/en_US/LC_MESSAGES/activities.mo index e9ec6b9..da51c62 100644 Binary files a/lang/en_US/LC_MESSAGES/activities.mo and b/lang/en_US/LC_MESSAGES/activities.mo differ diff --git a/lang/es.utf8/LC_MESSAGES/activities.mo b/lang/es.utf8/LC_MESSAGES/activities.mo index 172db35..1f2994c 100644 Binary files a/lang/es.utf8/LC_MESSAGES/activities.mo and b/lang/es.utf8/LC_MESSAGES/activities.mo differ diff --git a/lang/fr_FR.utf8/LC_MESSAGES/activities.mo b/lang/fr_FR.utf8/LC_MESSAGES/activities.mo index 00a366c..9f86478 100644 Binary files a/lang/fr_FR.utf8/LC_MESSAGES/activities.mo and b/lang/fr_FR.utf8/LC_MESSAGES/activities.mo differ diff --git a/lang/it_IT.utf8/LC_MESSAGES/activities.mo b/lang/it_IT.utf8/LC_MESSAGES/activities.mo index f239afb..e294859 100644 Binary files a/lang/it_IT.utf8/LC_MESSAGES/activities.mo and b/lang/it_IT.utf8/LC_MESSAGES/activities.mo differ diff --git a/lang/nb_NO.utf8/LC_MESSAGES/activities.mo b/lang/nb_NO.utf8/LC_MESSAGES/activities.mo index 4189846..809a01d 100644 Binary files a/lang/nb_NO.utf8/LC_MESSAGES/activities.mo and b/lang/nb_NO.utf8/LC_MESSAGES/activities.mo differ diff --git a/lang/oc.utf8/LC_MESSAGES/activities.mo b/lang/oc.utf8/LC_MESSAGES/activities.mo index 24c093e..1799038 100644 Binary files a/lang/oc.utf8/LC_MESSAGES/activities.mo and b/lang/oc.utf8/LC_MESSAGES/activities.mo differ diff --git a/lang/ota.utf8/LC_MESSAGES/activities.mo b/lang/ota.utf8/LC_MESSAGES/activities.mo index 98991cb..0b7d0c2 100644 Binary files a/lang/ota.utf8/LC_MESSAGES/activities.mo and b/lang/ota.utf8/LC_MESSAGES/activities.mo differ diff --git a/lang/pt.utf8/LC_MESSAGES/activities.mo b/lang/pt.utf8/LC_MESSAGES/activities.mo index 1da6f36..9c9ba97 100644 Binary files a/lang/pt.utf8/LC_MESSAGES/activities.mo and b/lang/pt.utf8/LC_MESSAGES/activities.mo differ diff --git a/lang/ru.utf8/LC_MESSAGES/activities.mo b/lang/ru.utf8/LC_MESSAGES/activities.mo index 27cace4..bc36213 100644 Binary files a/lang/ru.utf8/LC_MESSAGES/activities.mo and b/lang/ru.utf8/LC_MESSAGES/activities.mo differ diff --git a/lang/si.utf8/LC_MESSAGES/activities.mo b/lang/si.utf8/LC_MESSAGES/activities.mo index 71ae6db..a687927 100644 Binary files a/lang/si.utf8/LC_MESSAGES/activities.mo and b/lang/si.utf8/LC_MESSAGES/activities.mo differ diff --git a/lang/tr.utf8/LC_MESSAGES/activities.mo b/lang/tr.utf8/LC_MESSAGES/activities.mo index fe457a1..d947709 100644 Binary files a/lang/tr.utf8/LC_MESSAGES/activities.mo and b/lang/tr.utf8/LC_MESSAGES/activities.mo differ diff --git a/lang/uk.utf8/LC_MESSAGES/activities.mo b/lang/uk.utf8/LC_MESSAGES/activities.mo index 9b8454d..e44838a 100644 Binary files a/lang/uk.utf8/LC_MESSAGES/activities.mo and b/lang/uk.utf8/LC_MESSAGES/activities.mo differ 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 @@