diff --git a/lang/activities.pot b/lang/activities.pot index c229ec3..24a516e 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: 2026-09-27 07:07+0200\n" +"POT-Creation-Date: 2026-09-27 18:39+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,228 +18,228 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" -#: ../lib/GaletteActivities/Entity/Subscription.php:172 +#: ../lib/GaletteActivities/Entity/Subscription.php:112 msgid "Activity is mandatory" msgstr "" #. TRANS: %1$s is the activity ID -#: ../lib/GaletteActivities/Entity/Subscription.php:178 -#: ../lib/GaletteActivities/Controllers/Crud/ActivitiesController.php:160 +#: ../lib/GaletteActivities/Entity/Subscription.php:119 +#: ../lib/GaletteActivities/Controllers/Crud/ActivitiesController.php:57 #, php-format msgid "No activity #%1$s." msgstr "" -#: ../lib/GaletteActivities/Entity/Subscription.php:200 +#: ../lib/GaletteActivities/Entity/Subscription.php:141 msgid "Amount must be a number." msgstr "" -#: ../lib/GaletteActivities/Entity/Subscription.php:220 +#: ../lib/GaletteActivities/Entity/Subscription.php:161 msgid "Member is mandatory" msgstr "" -#: ../lib/GaletteActivities/Entity/Subscription.php:236 +#: ../lib/GaletteActivities/Entity/Subscription.php:177 msgid "Subscription date is mandatory" msgstr "" -#: ../lib/GaletteActivities/Entity/Subscription.php:242 +#: ../lib/GaletteActivities/Entity/Subscription.php:183 msgid "End date is mandatory" msgstr "" -#: ../lib/GaletteActivities/Entity/Subscription.php:251 +#: ../lib/GaletteActivities/Entity/Subscription.php:192 msgid "End date must not be before subscription date." msgstr "" -#: ../lib/GaletteActivities/Entity/Subscription.php:287 -#: ../lib/GaletteActivities/Entity/Subscription.php:370 +#: ../lib/GaletteActivities/Entity/Subscription.php:196 msgid "Subscription already exists for this member and activity" msgstr "" -#: ../lib/GaletteActivities/Entity/Subscription.php:327 -msgid "Subscription added" +#: ../lib/GaletteActivities/Entity/Subscription.php:248 +msgid "Fail to add new subscription." msgstr "" -#: ../lib/GaletteActivities/Entity/Subscription.php:331 -msgid "Fail to add new subscription." +#: ../lib/GaletteActivities/Entity/Subscription.php:257 +msgid "Subscription added" msgstr "" -#: ../lib/GaletteActivities/Entity/Subscription.php:350 +#: ../lib/GaletteActivities/Entity/Subscription.php:273 msgid "Subscription updated" msgstr "" -#: ../lib/GaletteActivities/Entity/Subscription.php:606 -#: ../lib/GaletteActivities/Controllers/Crud/ActivitiesController.php:170 +#: ../lib/GaletteActivities/Entity/Subscription.php:507 +#: ../lib/GaletteActivities/Controllers/Crud/ActivitiesController.php:142 #: ../templates/default/subscriptions.html.twig:39 #: ../templates/default/subscriptions.html.twig:76 #: ../templates/default/subscription.html.twig:46 msgid "Activity" msgstr "" -#: ../lib/GaletteActivities/Entity/Subscription.php:610 +#: ../lib/GaletteActivities/Entity/Subscription.php:511 msgid "Member" msgstr "" -#: ../lib/GaletteActivities/Entity/Subscription.php:614 +#: ../lib/GaletteActivities/Entity/Subscription.php:515 msgid "Is paid" msgstr "" -#: ../lib/GaletteActivities/Entity/Subscription.php:618 +#: ../lib/GaletteActivities/Entity/Subscription.php:519 #: ../templates/default/subscriptions.html.twig:39 #: ../templates/default/subscriptions.html.twig:201 #: ../templates/default/subscription.html.twig:75 msgid "Amount" msgstr "" -#: ../lib/GaletteActivities/Entity/Subscription.php:622 +#: ../lib/GaletteActivities/Entity/Subscription.php:523 msgid "Payment method" msgstr "" -#: ../lib/GaletteActivities/Entity/Subscription.php:626 -#: ../lib/GaletteActivities/Entity/Activity.php:392 +#: ../lib/GaletteActivities/Entity/Subscription.php:527 +#: ../lib/GaletteActivities/Entity/Activity.php:316 #: ../templates/default/subscription.html.twig:19 ../templates/default/activities.html.twig:39 #: ../templates/default/activities.html.twig:68 msgid "Creation date" msgstr "" -#: ../lib/GaletteActivities/Entity/Subscription.php:630 +#: ../lib/GaletteActivities/Entity/Subscription.php:531 #: ../templates/default/subscriptions.html.twig:39 #: ../templates/default/subscriptions.html.twig:199 #: ../templates/default/subscription.html.twig:26 msgid "Subscription date" msgstr "" -#: ../lib/GaletteActivities/Entity/Subscription.php:638 -#: ../lib/GaletteActivities/Entity/Activity.php:396 +#: ../lib/GaletteActivities/Entity/Subscription.php:539 +#: ../lib/GaletteActivities/Entity/Activity.php:320 #: ../templates/default/subscription.html.twig:61 msgid "Comment" msgstr "" -#: ../lib/GaletteActivities/Entity/Activity.php:160 +#: ../lib/GaletteActivities/Entity/Activity.php:97 msgid "Name is mandatory" msgstr "" -#: ../lib/GaletteActivities/Entity/Activity.php:162 +#: ../lib/GaletteActivities/Entity/Activity.php:99 msgid "Name is too long" msgstr "" -#: ../lib/GaletteActivities/Entity/Activity.php:169 +#: ../lib/GaletteActivities/Entity/Activity.php:106 msgid "Type is too long" msgstr "" -#: ../lib/GaletteActivities/Entity/Activity.php:184 +#: ../lib/GaletteActivities/Entity/Activity.php:121 msgid "Price must be a number." msgstr "" -#: ../lib/GaletteActivities/Entity/Activity.php:249 -msgid "Activity added" +#: ../lib/GaletteActivities/Entity/Activity.php:171 +msgid "Fail to add new activity." msgstr "" -#: ../lib/GaletteActivities/Entity/Activity.php:254 -msgid "Fail to add new activity." +#: ../lib/GaletteActivities/Entity/Activity.php:180 +msgid "Activity added" msgstr "" -#: ../lib/GaletteActivities/Entity/Activity.php:273 +#: ../lib/GaletteActivities/Entity/Activity.php:196 msgid "Activity updated" msgstr "" -#: ../lib/GaletteActivities/Entity/Activity.php:376 +#: ../lib/GaletteActivities/Entity/Activity.php:300 #: ../templates/default/activities.html.twig:39 msgid "Name" msgstr "" -#: ../lib/GaletteActivities/Entity/Activity.php:380 +#: ../lib/GaletteActivities/Entity/Activity.php:304 #: ../templates/default/activities.html.twig:39 ../templates/default/activities.html.twig:66 msgid "Type" msgstr "" -#: ../lib/GaletteActivities/Entity/Activity.php:384 +#: ../lib/GaletteActivities/Entity/Activity.php:308 #: ../templates/default/activities.html.twig:39 ../templates/default/activities.html.twig:67 msgid "Price" msgstr "" -#: ../lib/GaletteActivities/Entity/Activity.php:388 +#: ../lib/GaletteActivities/Entity/Activity.php:312 #: ../templates/default/activities.html.twig:39 ../templates/default/activities.html.twig:69 msgid "Group" msgstr "" -#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:112 -msgid "Subscriptions management" -msgstr "" - #. TRANS: %1$s is the subscription ID -#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:227 +#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:60 #, php-format msgid "No subscription #%1$s." msgstr "" -#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:240 +#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:131 +msgid "Subscriptions management" +msgstr "" + +#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:210 #: ../templates/default/subscriptions.html.twig:109 msgid "Subscription" msgstr "" -#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:343 +#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:289 +msgid "Do not forget to store the subscription" +msgstr "" + +#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:298 msgid "New subscription has been successfully added." msgstr "" -#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:345 +#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:299 msgid "Subscription has been modified." msgstr "" -#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:353 +#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:300 msgid "An error occurred while storing the subscription." msgstr "" -#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:362 -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:461 +#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:383 #, php-format msgid "Remove subscription for %1$s on %2$s" msgstr "" -#: ../lib/GaletteActivities/Controllers/Crud/ActivitiesController.php:97 +#: ../lib/GaletteActivities/Controllers/Crud/ActivitiesController.php:104 msgid "Activities management" msgstr "" -#: ../lib/GaletteActivities/Controllers/Crud/ActivitiesController.php:236 +#: ../lib/GaletteActivities/Controllers/Crud/ActivitiesController.php:191 msgid "New activity has been successfully added." msgstr "" -#: ../lib/GaletteActivities/Controllers/Crud/ActivitiesController.php:238 +#: ../lib/GaletteActivities/Controllers/Crud/ActivitiesController.php:192 msgid "Activity has been modified." msgstr "" -#: ../lib/GaletteActivities/Controllers/Crud/ActivitiesController.php:242 +#: ../lib/GaletteActivities/Controllers/Crud/ActivitiesController.php:193 msgid "An error occurred while storing the activity." msgstr "" #. TRANS %1$s is activity name -#: ../lib/GaletteActivities/Controllers/Crud/ActivitiesController.php:321 +#: ../lib/GaletteActivities/Controllers/Crud/ActivitiesController.php:258 #, php-format msgid "Remove activity %1$s" msgstr "" #. TRANS: %1$s is the number of subscriptions -#: ../lib/GaletteActivities/Controllers/Crud/ActivitiesController.php:342 +#: ../lib/GaletteActivities/Controllers/Crud/ActivitiesController.php:281 #, php-format msgid "%1$s subscription to this activity will be removed as well." msgid_plural "%1$s subscriptions to this activity will be removed as well." msgstr[0] "" msgstr[1] "" -#: ../lib/GaletteActivities/PluginGaletteActivities.php:47 #: ../lib/GaletteActivities/PluginGaletteActivities.php:51 +#: ../lib/GaletteActivities/PluginGaletteActivities.php:55 msgid "Activities" msgstr "" -#: ../lib/GaletteActivities/PluginGaletteActivities.php:58 +#: ../lib/GaletteActivities/PluginGaletteActivities.php:62 msgid "Subscriptions" msgstr "" -#. TRANS %membername will be replaced with current member name -#: ../lib/GaletteActivities/PluginGaletteActivities.php:103 -msgid "New subscription for %membername" +#. TRANS: %1$s is the member name +#: ../lib/GaletteActivities/PluginGaletteActivities.php:102 +#, php-format +msgid "New subscription for %1$s" msgstr "" #: ../templates/default/subscriptions.html.twig:19 @@ -264,7 +264,7 @@ msgstr "" #: ../templates/default/subscriptions.html.twig:202 #: ../templates/default/subscriptions.html.twig:203 #: ../templates/default/subscriptions.html.twig:206 -#: ../templates/default/subscription.html.twig:87 +#: ../templates/default/subscription.html.twig:92 msgid "Paid" msgstr "" @@ -300,7 +300,7 @@ msgstr "" #: ../templates/default/subscriptions.html.twig:177 #, php-format -msgid "Found subscriptions total %f" +msgid "Found subscriptions total %1$s" msgstr "" #: ../templates/default/subscriptions.html.twig:215 @@ -331,12 +331,12 @@ msgstr "" msgid "General information" msgstr "" -#: ../templates/default/activity.html.twig:47 +#: ../templates/default/activity.html.twig:49 msgid "Attach to group" msgstr "" -#: ../templates/default/activity.html.twig:47 -msgid "Group to attach members that subscribes to activity." +#: ../templates/default/activity.html.twig:49 +msgid "Subscribed members join this group, and are never removed from it." msgstr "" #: ../templates/default/activities.html.twig:19 diff --git a/lang/activities_ar.utf8.po b/lang/activities_ar.utf8.po index bf1f00e..724e956 100644 --- a/lang/activities_ar.utf8.po +++ b/lang/activities_ar.utf8.po @@ -88,9 +88,10 @@ msgstr "النشاطات" msgid "Subscriptions" msgstr "" -#. TRANS %membername will be replaced with current member name +#. TRANS: %1$s is the member name #: ../lib/GaletteActivities/PluginGaletteActivities.php:117 -msgid "New subscription for %membername" +#, php-format +msgid "New subscription for %1$s" msgstr "" #: ../lib/GaletteActivities/Entity/Activity.php:182 @@ -306,7 +307,7 @@ msgstr "" #: ../tempcache/subscriptions.html.twig:350 #, php-format -msgid "Found subscriptions total %f" +msgid "Found subscriptions total %1$s" msgstr "" #: ../tempcache/subscriptions.html.twig:506 diff --git a/lang/activities_br.utf8.po b/lang/activities_br.utf8.po index ceac940..1e0a977 100644 --- a/lang/activities_br.utf8.po +++ b/lang/activities_br.utf8.po @@ -88,9 +88,10 @@ msgstr "" msgid "Subscriptions" msgstr "" -#. TRANS %membername will be replaced with current member name +#. TRANS: %1$s is the member name #: ../lib/GaletteActivities/PluginGaletteActivities.php:117 -msgid "New subscription for %membername" +#, php-format +msgid "New subscription for %1$s" msgstr "" #: ../lib/GaletteActivities/Entity/Activity.php:182 @@ -294,7 +295,7 @@ msgstr "" #: ../tempcache/subscriptions.html.twig:350 #, php-format -msgid "Found subscriptions total %f" +msgid "Found subscriptions total %1$s" msgstr "" #: ../tempcache/subscriptions.html.twig:506 diff --git a/lang/activities_ca.utf8.po b/lang/activities_ca.utf8.po index 6e4fa86..2b37170 100644 --- a/lang/activities_ca.utf8.po +++ b/lang/activities_ca.utf8.po @@ -86,9 +86,10 @@ msgstr "Activitats" msgid "Subscriptions" msgstr "" -#. TRANS %membername will be replaced with current member name +#. TRANS: %1$s is the member name #: ../lib/GaletteActivities/PluginGaletteActivities.php:117 -msgid "New subscription for %membername" +#, php-format +msgid "New subscription for %1$s" msgstr "" #: ../lib/GaletteActivities/Entity/Activity.php:182 @@ -288,7 +289,7 @@ msgstr "No pagat" #: ../tempcache/subscriptions.html.twig:350 #, php-format -msgid "Found subscriptions total %f" +msgid "Found subscriptions total %1$s" msgstr "" #: ../tempcache/subscriptions.html.twig:506 diff --git a/lang/activities_de_DE.utf8.po b/lang/activities_de_DE.utf8.po index bfe90af..fd30446 100644 --- a/lang/activities_de_DE.utf8.po +++ b/lang/activities_de_DE.utf8.po @@ -92,10 +92,11 @@ msgstr "Aktivitäten" msgid "Subscriptions" msgstr "Abonnements" -#. TRANS %membername will be replaced with current member name +#. TRANS: %1$s is the member name #: ../lib/GaletteActivities/PluginGaletteActivities.php:117 -msgid "New subscription for %membername" -msgstr "Neues Abonnement für %membername" +#, php-format +msgid "New subscription for %1$s" +msgstr "Neues Abonnement für %1$s" #: ../lib/GaletteActivities/Entity/Activity.php:182 msgid "Name is mandatory" @@ -292,8 +293,8 @@ msgstr "Nicht bezahlt" #: ../tempcache/subscriptions.html.twig:350 #, php-format -msgid "Found subscriptions total %f" -msgstr "Gefundene Abonnements insgesamt %f" +msgid "Found subscriptions total %1$s" +msgstr "Gefundene Abonnements insgesamt %1$s" #: ../tempcache/subscriptions.html.twig:506 msgid "Edit subscription" diff --git a/lang/activities_en_US.po b/lang/activities_en_US.po index 94679cb..999dea2 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: 2026-09-27 07:07+0200\n" -"PO-Revision-Date: 2026-09-27 07:07+0200\n" +"POT-Creation-Date: 2026-09-27 18:39+0200\n" +"PO-Revision-Date: 2026-09-27 18:39+0200\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" "Language: en_US\n" @@ -17,233 +17,233 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../lib/GaletteActivities/Entity/Subscription.php:172 +#: ../lib/GaletteActivities/Entity/Subscription.php:112 msgid "Activity is mandatory" msgstr "Activity is mandatory" #. TRANS: %1$s is the activity ID -#: ../lib/GaletteActivities/Entity/Subscription.php:178 -#: ../lib/GaletteActivities/Controllers/Crud/ActivitiesController.php:160 +#: ../lib/GaletteActivities/Entity/Subscription.php:119 +#: ../lib/GaletteActivities/Controllers/Crud/ActivitiesController.php:57 #, php-format msgid "No activity #%1$s." msgstr "No activity #%1$s." -#: ../lib/GaletteActivities/Entity/Subscription.php:200 +#: ../lib/GaletteActivities/Entity/Subscription.php:141 msgid "Amount must be a number." msgstr "Amount must be a number." -#: ../lib/GaletteActivities/Entity/Subscription.php:220 +#: ../lib/GaletteActivities/Entity/Subscription.php:161 msgid "Member is mandatory" msgstr "Member is mandatory" -#: ../lib/GaletteActivities/Entity/Subscription.php:236 +#: ../lib/GaletteActivities/Entity/Subscription.php:177 msgid "Subscription date is mandatory" msgstr "Subscription date is mandatory" -#: ../lib/GaletteActivities/Entity/Subscription.php:242 +#: ../lib/GaletteActivities/Entity/Subscription.php:183 msgid "End date is mandatory" msgstr "End date is mandatory" -#: ../lib/GaletteActivities/Entity/Subscription.php:251 +#: ../lib/GaletteActivities/Entity/Subscription.php:192 msgid "End date must not be before subscription date." msgstr "End date must not be before subscription date." -#: ../lib/GaletteActivities/Entity/Subscription.php:287 -#: ../lib/GaletteActivities/Entity/Subscription.php:370 +#: ../lib/GaletteActivities/Entity/Subscription.php:196 msgid "Subscription already exists for this member and activity" msgstr "Subscription already exists for this member and activity" -#: ../lib/GaletteActivities/Entity/Subscription.php:327 -msgid "Subscription added" -msgstr "Subscription added" - -#: ../lib/GaletteActivities/Entity/Subscription.php:331 +#: ../lib/GaletteActivities/Entity/Subscription.php:248 msgid "Fail to add new subscription." msgstr "Fail to add new subscription." -#: ../lib/GaletteActivities/Entity/Subscription.php:350 +#: ../lib/GaletteActivities/Entity/Subscription.php:257 +msgid "Subscription added" +msgstr "Subscription added" + +#: ../lib/GaletteActivities/Entity/Subscription.php:273 msgid "Subscription updated" msgstr "Subscription updated" -#: ../lib/GaletteActivities/Entity/Subscription.php:606 -#: ../lib/GaletteActivities/Controllers/Crud/ActivitiesController.php:170 +#: ../lib/GaletteActivities/Entity/Subscription.php:507 +#: ../lib/GaletteActivities/Controllers/Crud/ActivitiesController.php:142 #: ../templates/default/subscriptions.html.twig:39 #: ../templates/default/subscriptions.html.twig:76 #: ../templates/default/subscription.html.twig:46 msgid "Activity" msgstr "Activity" -#: ../lib/GaletteActivities/Entity/Subscription.php:610 +#: ../lib/GaletteActivities/Entity/Subscription.php:511 msgid "Member" msgstr "Member" -#: ../lib/GaletteActivities/Entity/Subscription.php:614 +#: ../lib/GaletteActivities/Entity/Subscription.php:515 msgid "Is paid" msgstr "Is paid" -#: ../lib/GaletteActivities/Entity/Subscription.php:618 +#: ../lib/GaletteActivities/Entity/Subscription.php:519 #: ../templates/default/subscriptions.html.twig:39 #: ../templates/default/subscriptions.html.twig:201 #: ../templates/default/subscription.html.twig:75 msgid "Amount" msgstr "Amount" -#: ../lib/GaletteActivities/Entity/Subscription.php:622 +#: ../lib/GaletteActivities/Entity/Subscription.php:523 msgid "Payment method" msgstr "Payment method" -#: ../lib/GaletteActivities/Entity/Subscription.php:626 -#: ../lib/GaletteActivities/Entity/Activity.php:392 +#: ../lib/GaletteActivities/Entity/Subscription.php:527 +#: ../lib/GaletteActivities/Entity/Activity.php:316 #: ../templates/default/subscription.html.twig:19 #: ../templates/default/activities.html.twig:39 #: ../templates/default/activities.html.twig:68 msgid "Creation date" msgstr "Creation date" -#: ../lib/GaletteActivities/Entity/Subscription.php:630 +#: ../lib/GaletteActivities/Entity/Subscription.php:531 #: ../templates/default/subscriptions.html.twig:39 #: ../templates/default/subscriptions.html.twig:199 #: ../templates/default/subscription.html.twig:26 msgid "Subscription date" msgstr "Subscription date" -#: ../lib/GaletteActivities/Entity/Subscription.php:638 -#: ../lib/GaletteActivities/Entity/Activity.php:396 +#: ../lib/GaletteActivities/Entity/Subscription.php:539 +#: ../lib/GaletteActivities/Entity/Activity.php:320 #: ../templates/default/subscription.html.twig:61 msgid "Comment" msgstr "Comment" -#: ../lib/GaletteActivities/Entity/Activity.php:160 +#: ../lib/GaletteActivities/Entity/Activity.php:97 msgid "Name is mandatory" msgstr "Name is mandatory" -#: ../lib/GaletteActivities/Entity/Activity.php:162 +#: ../lib/GaletteActivities/Entity/Activity.php:99 msgid "Name is too long" msgstr "Name is too long" -#: ../lib/GaletteActivities/Entity/Activity.php:169 +#: ../lib/GaletteActivities/Entity/Activity.php:106 msgid "Type is too long" msgstr "Type is too long" -#: ../lib/GaletteActivities/Entity/Activity.php:184 +#: ../lib/GaletteActivities/Entity/Activity.php:121 msgid "Price must be a number." msgstr "Price must be a number." -#: ../lib/GaletteActivities/Entity/Activity.php:249 -msgid "Activity added" -msgstr "Activity added" - -#: ../lib/GaletteActivities/Entity/Activity.php:254 +#: ../lib/GaletteActivities/Entity/Activity.php:171 msgid "Fail to add new activity." msgstr "Fail to add new activity." -#: ../lib/GaletteActivities/Entity/Activity.php:273 +#: ../lib/GaletteActivities/Entity/Activity.php:180 +msgid "Activity added" +msgstr "Activity added" + +#: ../lib/GaletteActivities/Entity/Activity.php:196 msgid "Activity updated" msgstr "Activity updated" -#: ../lib/GaletteActivities/Entity/Activity.php:376 +#: ../lib/GaletteActivities/Entity/Activity.php:300 #: ../templates/default/activities.html.twig:39 msgid "Name" msgstr "Name" -#: ../lib/GaletteActivities/Entity/Activity.php:380 +#: ../lib/GaletteActivities/Entity/Activity.php:304 #: ../templates/default/activities.html.twig:39 #: ../templates/default/activities.html.twig:66 msgid "Type" msgstr "Type" -#: ../lib/GaletteActivities/Entity/Activity.php:384 +#: ../lib/GaletteActivities/Entity/Activity.php:308 #: ../templates/default/activities.html.twig:39 #: ../templates/default/activities.html.twig:67 msgid "Price" msgstr "Price" -#: ../lib/GaletteActivities/Entity/Activity.php:388 +#: ../lib/GaletteActivities/Entity/Activity.php:312 #: ../templates/default/activities.html.twig:39 #: ../templates/default/activities.html.twig:69 msgid "Group" msgstr "Group" -#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:112 -msgid "Subscriptions management" -msgstr "Subscriptions management" - #. TRANS: %1$s is the subscription ID -#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:227 +#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:60 #, php-format msgid "No subscription #%1$s." msgstr "No subscription #%1$s." -#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:240 +#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:131 +msgid "Subscriptions management" +msgstr "Subscriptions management" + +#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:210 #: ../templates/default/subscriptions.html.twig:109 msgid "Subscription" msgstr "Subscription" -#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:343 +#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:289 +msgid "Do not forget to store the subscription" +msgstr "Do not forget to store the subscription" + +#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:298 msgid "New subscription has been successfully added." msgstr "New subscription has been successfully added." -#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:345 +#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:299 msgid "Subscription has been modified." msgstr "Subscription has been modified." -#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:353 +#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:300 msgid "An error occurred while storing the subscription." msgstr "An error occurred while storing the subscription." -#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:362 -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:461 +#: ../lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php:383 #, php-format msgid "Remove subscription for %1$s on %2$s" msgstr "Remove subscription for %1$s on %2$s" -#: ../lib/GaletteActivities/Controllers/Crud/ActivitiesController.php:97 +#: ../lib/GaletteActivities/Controllers/Crud/ActivitiesController.php:104 msgid "Activities management" msgstr "Activities management" -#: ../lib/GaletteActivities/Controllers/Crud/ActivitiesController.php:236 +#: ../lib/GaletteActivities/Controllers/Crud/ActivitiesController.php:191 msgid "New activity has been successfully added." msgstr "New activity has been successfully added." -#: ../lib/GaletteActivities/Controllers/Crud/ActivitiesController.php:238 +#: ../lib/GaletteActivities/Controllers/Crud/ActivitiesController.php:192 msgid "Activity has been modified." msgstr "Activity has been modified." -#: ../lib/GaletteActivities/Controllers/Crud/ActivitiesController.php:242 +#: ../lib/GaletteActivities/Controllers/Crud/ActivitiesController.php:193 msgid "An error occurred while storing the activity." msgstr "An error occurred while storing the activity." #. TRANS %1$s is activity name -#: ../lib/GaletteActivities/Controllers/Crud/ActivitiesController.php:321 +#: ../lib/GaletteActivities/Controllers/Crud/ActivitiesController.php:258 #, php-format msgid "Remove activity %1$s" msgstr "Remove activity %1$s" #. TRANS: %1$s is the number of subscriptions -#: ../lib/GaletteActivities/Controllers/Crud/ActivitiesController.php:342 +#: ../lib/GaletteActivities/Controllers/Crud/ActivitiesController.php:281 #, php-format msgid "%1$s subscription to this activity will be removed as well." msgid_plural "%1$s subscriptions to this activity will be removed as well." msgstr[0] "%1$s subscription to this activity will be removed as well." msgstr[1] "%1$s subscriptions to this activity will be removed as well." -#: ../lib/GaletteActivities/PluginGaletteActivities.php:47 #: ../lib/GaletteActivities/PluginGaletteActivities.php:51 +#: ../lib/GaletteActivities/PluginGaletteActivities.php:55 msgid "Activities" msgstr "Activities" -#: ../lib/GaletteActivities/PluginGaletteActivities.php:58 +#: ../lib/GaletteActivities/PluginGaletteActivities.php:62 msgid "Subscriptions" msgstr "Subscriptions" -#. TRANS %membername will be replaced with current member name -#: ../lib/GaletteActivities/PluginGaletteActivities.php:103 -msgid "New subscription for %membername" -msgstr "New subscription for %membername" +#. TRANS: %1$s is the member name +#: ../lib/GaletteActivities/PluginGaletteActivities.php:102 +#, php-format +msgid "New subscription for %1$s" +msgstr "New subscription for %1$s" #: ../templates/default/subscriptions.html.twig:19 #, php-format @@ -267,7 +267,7 @@ msgstr "End date" #: ../templates/default/subscriptions.html.twig:202 #: ../templates/default/subscriptions.html.twig:203 #: ../templates/default/subscriptions.html.twig:206 -#: ../templates/default/subscription.html.twig:87 +#: ../templates/default/subscription.html.twig:92 msgid "Paid" msgstr "Paid" @@ -303,8 +303,8 @@ msgstr "Not paid" #: ../templates/default/subscriptions.html.twig:177 #, php-format -msgid "Found subscriptions total %f" -msgstr "Found subscriptions total %f" +msgid "Found subscriptions total %1$s" +msgstr "Found subscriptions total %1$s" #: ../templates/default/subscriptions.html.twig:215 msgid "Edit subscription" @@ -334,13 +334,13 @@ msgstr "Financial information" msgid "General information" msgstr "General information" -#: ../templates/default/activity.html.twig:47 +#: ../templates/default/activity.html.twig:49 msgid "Attach to group" msgstr "Attach to group" -#: ../templates/default/activity.html.twig:47 -msgid "Group to attach members that subscribes to activity." -msgstr "Group to attach members that subscribes to activity." +#: ../templates/default/activity.html.twig:49 +msgid "Subscribed members join this group, and are never removed from it." +msgstr "Subscribed members join this group, and are never removed from it." #: ../templates/default/activities.html.twig:19 #, php-format diff --git a/lang/activities_es.utf8.po b/lang/activities_es.utf8.po index c09d066..1da3354 100644 --- a/lang/activities_es.utf8.po +++ b/lang/activities_es.utf8.po @@ -94,10 +94,11 @@ msgstr "Actividades" msgid "Subscriptions" msgstr "Suscripciones" -#. TRANS %membername will be replaced with current member name +#. TRANS: %1$s is the member name #: ../lib/GaletteActivities/PluginGaletteActivities.php:117 -msgid "New subscription for %membername" -msgstr "Nueva suscripción para %membername" +#, php-format +msgid "New subscription for %1$s" +msgstr "Nueva suscripción para %1$s" #: ../lib/GaletteActivities/Entity/Activity.php:182 msgid "Name is mandatory" @@ -294,8 +295,8 @@ msgstr "No pagado" #: ../tempcache/subscriptions.html.twig:350 #, php-format -msgid "Found subscriptions total %f" -msgstr "Se encontraron un total de %f suscripciones" +msgid "Found subscriptions total %1$s" +msgstr "Se encontraron un total de %1$s suscripciones" #: ../tempcache/subscriptions.html.twig:506 msgid "Edit subscription" diff --git a/lang/activities_fr_FR.utf8.po b/lang/activities_fr_FR.utf8.po index b6504cc..65fd9f9 100644 --- a/lang/activities_fr_FR.utf8.po +++ b/lang/activities_fr_FR.utf8.po @@ -86,10 +86,11 @@ msgstr "Activités" msgid "Subscriptions" msgstr "Souscriptions" -#. TRANS %membername will be replaced with current member name +#. TRANS: %1$s is the member name #: ../lib/GaletteActivities/PluginGaletteActivities.php:117 -msgid "New subscription for %membername" -msgstr "Nouvelle souscription pour %membername" +#, php-format +msgid "New subscription for %1$s" +msgstr "Nouvelle souscription pour %1$s" #: ../lib/GaletteActivities/Entity/Activity.php:182 msgid "Name is mandatory" @@ -286,8 +287,8 @@ msgstr "Non payée" #: ../tempcache/subscriptions.html.twig:350 #, php-format -msgid "Found subscriptions total %f" -msgstr "Total des souscriptions trouvées : %f" +msgid "Found subscriptions total %1$s" +msgstr "Total des souscriptions trouvées : %1$s" #: ../tempcache/subscriptions.html.twig:506 msgid "Edit subscription" diff --git a/lang/activities_it_IT.utf8.po b/lang/activities_it_IT.utf8.po index e928715..b99ad61 100644 --- a/lang/activities_it_IT.utf8.po +++ b/lang/activities_it_IT.utf8.po @@ -88,10 +88,11 @@ msgstr "Attività" msgid "Subscriptions" msgstr "Iscrizioni" -#. TRANS %membername will be replaced with current member name +#. TRANS: %1$s is the member name #: ../lib/GaletteActivities/PluginGaletteActivities.php:117 -msgid "New subscription for %membername" -msgstr "Nuova iscrizione per %membername" +#, php-format +msgid "New subscription for %1$s" +msgstr "Nuova iscrizione per %1$s" #: ../lib/GaletteActivities/Entity/Activity.php:182 msgid "Name is mandatory" @@ -288,8 +289,8 @@ msgstr "Non pagato" #: ../tempcache/subscriptions.html.twig:350 #, php-format -msgid "Found subscriptions total %f" -msgstr "Totale iscrizioni trovate %f" +msgid "Found subscriptions total %1$s" +msgstr "Totale iscrizioni trovate %1$s" #: ../tempcache/subscriptions.html.twig:506 msgid "Edit subscription" diff --git a/lang/activities_nb_NO.utf8.po b/lang/activities_nb_NO.utf8.po index 2cf3640..d639ea2 100644 --- a/lang/activities_nb_NO.utf8.po +++ b/lang/activities_nb_NO.utf8.po @@ -84,9 +84,10 @@ msgstr "" msgid "Subscriptions" msgstr "" -#. TRANS %membername will be replaced with current member name +#. TRANS: %1$s is the member name #: ../lib/GaletteActivities/PluginGaletteActivities.php:117 -msgid "New subscription for %membername" +#, php-format +msgid "New subscription for %1$s" msgstr "" #: ../lib/GaletteActivities/Entity/Activity.php:182 @@ -284,7 +285,7 @@ msgstr "" #: ../tempcache/subscriptions.html.twig:350 #, php-format -msgid "Found subscriptions total %f" +msgid "Found subscriptions total %1$s" msgstr "" #: ../tempcache/subscriptions.html.twig:506 diff --git a/lang/activities_oc.utf8.po b/lang/activities_oc.utf8.po index 60ee0a8..ac3537a 100644 --- a/lang/activities_oc.utf8.po +++ b/lang/activities_oc.utf8.po @@ -88,9 +88,10 @@ msgstr "Activitats" msgid "Subscriptions" msgstr "" -#. TRANS %membername will be replaced with current member name +#. TRANS: %1$s is the member name #: ../lib/GaletteActivities/PluginGaletteActivities.php:117 -msgid "New subscription for %membername" +#, php-format +msgid "New subscription for %1$s" msgstr "" #: ../lib/GaletteActivities/Entity/Activity.php:182 @@ -306,7 +307,7 @@ msgstr "" #: ../tempcache/subscriptions.html.twig:350 #, php-format -msgid "Found subscriptions total %f" +msgid "Found subscriptions total %1$s" msgstr "" #: ../tempcache/subscriptions.html.twig:506 diff --git a/lang/activities_ota.utf8.po b/lang/activities_ota.utf8.po index 825368b..ad11200 100644 --- a/lang/activities_ota.utf8.po +++ b/lang/activities_ota.utf8.po @@ -84,9 +84,10 @@ msgstr "" msgid "Subscriptions" msgstr "" -#. TRANS %membername will be replaced with current member name +#. TRANS: %1$s is the member name #: ../lib/GaletteActivities/PluginGaletteActivities.php:117 -msgid "New subscription for %membername" +#, php-format +msgid "New subscription for %1$s" msgstr "" #: ../lib/GaletteActivities/Entity/Activity.php:182 @@ -284,7 +285,7 @@ msgstr "" #: ../tempcache/subscriptions.html.twig:350 #, php-format -msgid "Found subscriptions total %f" +msgid "Found subscriptions total %1$s" msgstr "" #: ../tempcache/subscriptions.html.twig:506 diff --git a/lang/activities_pt.utf8.po b/lang/activities_pt.utf8.po index 06e1e73..a08e053 100644 --- a/lang/activities_pt.utf8.po +++ b/lang/activities_pt.utf8.po @@ -88,10 +88,11 @@ msgstr "Atividades" msgid "Subscriptions" msgstr "Assinaturas" -#. TRANS %membername will be replaced with current member name +#. TRANS: %1$s is the member name #: ../lib/GaletteActivities/PluginGaletteActivities.php:117 -msgid "New subscription for %membername" -msgstr "Nova inscrição para %membername" +#, php-format +msgid "New subscription for %1$s" +msgstr "Nova inscrição para %1$s" #: ../lib/GaletteActivities/Entity/Activity.php:182 msgid "Name is mandatory" @@ -288,8 +289,8 @@ msgstr "Não pago" #: ../tempcache/subscriptions.html.twig:350 #, php-format -msgid "Found subscriptions total %f" -msgstr "Encontrado um total de %f subscrições" +msgid "Found subscriptions total %1$s" +msgstr "Encontrado um total de %1$s subscrições" #: ../tempcache/subscriptions.html.twig:506 msgid "Edit subscription" diff --git a/lang/activities_pt_BR.utf8.po b/lang/activities_pt_BR.utf8.po index c086893..96bd82c 100644 --- a/lang/activities_pt_BR.utf8.po +++ b/lang/activities_pt_BR.utf8.po @@ -89,10 +89,11 @@ msgstr "Atividades" msgid "Subscriptions" msgstr "Assinaturas" -#. TRANS %membername will be replaced with current member name +#. TRANS: %1$s is the member name #: ../lib/GaletteActivities/PluginGaletteActivities.php:117 -msgid "New subscription for %membername" -msgstr "Nova inscrição para %membername" +#, php-format +msgid "New subscription for %1$s" +msgstr "Nova inscrição para %1$s" #: ../lib/GaletteActivities/Entity/Activity.php:182 msgid "Name is mandatory" @@ -289,7 +290,7 @@ msgstr "Não pago" #: ../tempcache/subscriptions.html.twig:350 #, php-format -msgid "Found subscriptions total %f" +msgid "Found subscriptions total %1$s" msgstr "" #: ../tempcache/subscriptions.html.twig:506 diff --git a/lang/activities_ru.utf8.po b/lang/activities_ru.utf8.po index b18e882..b845544 100644 --- a/lang/activities_ru.utf8.po +++ b/lang/activities_ru.utf8.po @@ -89,10 +89,11 @@ msgstr "Активность" msgid "Subscriptions" msgstr "Подписки" -#. TRANS %membername will be replaced with current member name +#. TRANS: %1$s is the member name #: ../lib/GaletteActivities/PluginGaletteActivities.php:117 -msgid "New subscription for %membername" -msgstr "Новая подписка для %membername" +#, php-format +msgid "New subscription for %1$s" +msgstr "Новая подписка для %1$s" #: ../lib/GaletteActivities/Entity/Activity.php:182 msgid "Name is mandatory" @@ -291,8 +292,8 @@ msgstr "Не оплачено" #: ../tempcache/subscriptions.html.twig:350 #, php-format -msgid "Found subscriptions total %f" -msgstr "Всего найдено подписок %f" +msgid "Found subscriptions total %1$s" +msgstr "Всего найдено подписок %1$s" #: ../tempcache/subscriptions.html.twig:506 msgid "Edit subscription" diff --git a/lang/activities_si.utf8.po b/lang/activities_si.utf8.po index a3d86f7..4a2954a 100644 --- a/lang/activities_si.utf8.po +++ b/lang/activities_si.utf8.po @@ -84,9 +84,10 @@ msgstr "" msgid "Subscriptions" msgstr "" -#. TRANS %membername will be replaced with current member name +#. TRANS: %1$s is the member name #: ../lib/GaletteActivities/PluginGaletteActivities.php:117 -msgid "New subscription for %membername" +#, php-format +msgid "New subscription for %1$s" msgstr "" #: ../lib/GaletteActivities/Entity/Activity.php:182 @@ -284,7 +285,7 @@ msgstr "" #: ../tempcache/subscriptions.html.twig:350 #, php-format -msgid "Found subscriptions total %f" +msgid "Found subscriptions total %1$s" msgstr "" #: ../tempcache/subscriptions.html.twig:506 diff --git a/lang/activities_sl.utf8.po b/lang/activities_sl.utf8.po index 85fb731..e18c5b6 100644 --- a/lang/activities_sl.utf8.po +++ b/lang/activities_sl.utf8.po @@ -90,10 +90,11 @@ msgstr "Dejavnosti" msgid "Subscriptions" msgstr "Naročnine" -#. TRANS %membername will be replaced with current member name +#. TRANS: %1$s is the member name #: ../lib/GaletteActivities/PluginGaletteActivities.php:117 -msgid "New subscription for %membername" -msgstr "Nova naročnina za %membername" +#, php-format +msgid "New subscription for %1$s" +msgstr "Nova naročnina za %1$s" #: ../lib/GaletteActivities/Entity/Activity.php:182 msgid "Name is mandatory" @@ -294,8 +295,8 @@ msgstr "Ni plačano" #: ../tempcache/subscriptions.html.twig:350 #, php-format -msgid "Found subscriptions total %f" -msgstr "Najdenih naročnin skupaj %f" +msgid "Found subscriptions total %1$s" +msgstr "Najdenih naročnin skupaj %1$s" #: ../tempcache/subscriptions.html.twig:506 msgid "Edit subscription" diff --git a/lang/activities_ta.utf8.po b/lang/activities_ta.utf8.po index a1a0483..f13e969 100644 --- a/lang/activities_ta.utf8.po +++ b/lang/activities_ta.utf8.po @@ -89,9 +89,10 @@ msgstr "செயல்பாடுகள்" msgid "Subscriptions" msgstr "சந்தாக்கள்" -#. TRANS %membername will be replaced with current member name +#. TRANS: %1$s is the member name #: ../lib/GaletteActivities/PluginGaletteActivities.php:117 -msgid "New subscription for %membername" +#, fuzzy, php-format +msgid "New subscription for %1$s" msgstr "%உறுப்பினர் பெயருக்கான புதிய சந்தா" #: ../lib/GaletteActivities/Entity/Activity.php:182 @@ -289,8 +290,8 @@ msgstr "" #: ../tempcache/subscriptions.html.twig:350 #, php-format -msgid "Found subscriptions total %f" -msgstr "மொத்தம் %f சந்தாக்கள் கிடைத்தன" +msgid "Found subscriptions total %1$s" +msgstr "மொத்தம் %1$s சந்தாக்கள் கிடைத்தன" #: ../tempcache/subscriptions.html.twig:506 msgid "Edit subscription" diff --git a/lang/activities_tr.utf8.po b/lang/activities_tr.utf8.po index 4b7b017..f585c17 100644 --- a/lang/activities_tr.utf8.po +++ b/lang/activities_tr.utf8.po @@ -85,9 +85,10 @@ msgstr "" msgid "Subscriptions" msgstr "" -#. TRANS %membername will be replaced with current member name +#. TRANS: %1$s is the member name #: ../lib/GaletteActivities/PluginGaletteActivities.php:117 -msgid "New subscription for %membername" +#, php-format +msgid "New subscription for %1$s" msgstr "" #: ../lib/GaletteActivities/Entity/Activity.php:182 @@ -285,7 +286,7 @@ msgstr "" #: ../tempcache/subscriptions.html.twig:350 #, php-format -msgid "Found subscriptions total %f" +msgid "Found subscriptions total %1$s" msgstr "" #: ../tempcache/subscriptions.html.twig:506 diff --git a/lang/activities_uk.utf8.po b/lang/activities_uk.utf8.po index 1a27a85..f5452d0 100644 --- a/lang/activities_uk.utf8.po +++ b/lang/activities_uk.utf8.po @@ -88,10 +88,11 @@ msgstr "Діяльності" msgid "Subscriptions" msgstr "підписки" -#. TRANS %membername will be replaced with current member name +#. TRANS: %1$s is the member name #: ../lib/GaletteActivities/PluginGaletteActivities.php:117 -msgid "New subscription for %membername" -msgstr "Нова підписка на %membername" +#, php-format +msgid "New subscription for %1$s" +msgstr "Нова підписка на %1$s" #: ../lib/GaletteActivities/Entity/Activity.php:182 msgid "Name is mandatory" @@ -291,8 +292,8 @@ msgstr "Не оплачено" #: ../tempcache/subscriptions.html.twig:350 #, php-format -msgid "Found subscriptions total %f" -msgstr "Загальна кількість знайдених підписок %f" +msgid "Found subscriptions total %1$s" +msgstr "Загальна кількість знайдених підписок %1$s" #: ../tempcache/subscriptions.html.twig:506 msgid "Edit subscription" diff --git a/lang/de_DE.utf8/LC_MESSAGES/activities.mo b/lang/de_DE.utf8/LC_MESSAGES/activities.mo index 3acf966..2815b2b 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/de_DE/LC_MESSAGES/activities.mo b/lang/de_DE/LC_MESSAGES/activities.mo index 760e88c..2815b2b 100644 Binary files a/lang/de_DE/LC_MESSAGES/activities.mo and b/lang/de_DE/LC_MESSAGES/activities.mo differ diff --git a/lang/en_US/LC_MESSAGES/activities.mo b/lang/en_US/LC_MESSAGES/activities.mo index 2be26b0..472ced7 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 6ac36df..a40d22a 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/es/LC_MESSAGES/activities.mo b/lang/es/LC_MESSAGES/activities.mo index 61fb5d2..a40d22a 100644 Binary files a/lang/es/LC_MESSAGES/activities.mo and b/lang/es/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 65a793a..f44887b 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/fr_FR/LC_MESSAGES/activities.mo b/lang/fr_FR/LC_MESSAGES/activities.mo index dca07e9..f44887b 100644 Binary files a/lang/fr_FR/LC_MESSAGES/activities.mo and b/lang/fr_FR/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 b2aee29..18e69fd 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/it_IT/LC_MESSAGES/activities.mo b/lang/it_IT/LC_MESSAGES/activities.mo index dc14ce0..18e69fd 100644 Binary files a/lang/it_IT/LC_MESSAGES/activities.mo and b/lang/it_IT/LC_MESSAGES/activities.mo differ diff --git a/lang/pt.utf8/LC_MESSAGES/activities.mo b/lang/pt.utf8/LC_MESSAGES/activities.mo index 471c56d..0428e81 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/pt/LC_MESSAGES/activities.mo b/lang/pt/LC_MESSAGES/activities.mo index 8659218..0428e81 100644 Binary files a/lang/pt/LC_MESSAGES/activities.mo and b/lang/pt/LC_MESSAGES/activities.mo differ diff --git a/lang/pt_BR.utf8/LC_MESSAGES/activities.mo b/lang/pt_BR.utf8/LC_MESSAGES/activities.mo index 9c5861a..aea4bfd 100644 Binary files a/lang/pt_BR.utf8/LC_MESSAGES/activities.mo and b/lang/pt_BR.utf8/LC_MESSAGES/activities.mo differ diff --git a/lang/pt_BR/LC_MESSAGES/activities.mo b/lang/pt_BR/LC_MESSAGES/activities.mo index baa6363..aea4bfd 100644 Binary files a/lang/pt_BR/LC_MESSAGES/activities.mo and b/lang/pt_BR/LC_MESSAGES/activities.mo differ diff --git a/lang/ru.utf8/LC_MESSAGES/activities.mo b/lang/ru.utf8/LC_MESSAGES/activities.mo index 8972e67..b15949e 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/ru/LC_MESSAGES/activities.mo b/lang/ru/LC_MESSAGES/activities.mo index 02963a6..b15949e 100644 Binary files a/lang/ru/LC_MESSAGES/activities.mo and b/lang/ru/LC_MESSAGES/activities.mo differ diff --git a/lang/sl.utf8/LC_MESSAGES/activities.mo b/lang/sl.utf8/LC_MESSAGES/activities.mo index 903b030..3fe159e 100644 Binary files a/lang/sl.utf8/LC_MESSAGES/activities.mo and b/lang/sl.utf8/LC_MESSAGES/activities.mo differ diff --git a/lang/sl/LC_MESSAGES/activities.mo b/lang/sl/LC_MESSAGES/activities.mo index d1be82f..3fe159e 100644 Binary files a/lang/sl/LC_MESSAGES/activities.mo and b/lang/sl/LC_MESSAGES/activities.mo differ diff --git a/lang/ta.utf8/LC_MESSAGES/activities.mo b/lang/ta.utf8/LC_MESSAGES/activities.mo index 9766079..0688abd 100644 Binary files a/lang/ta.utf8/LC_MESSAGES/activities.mo and b/lang/ta.utf8/LC_MESSAGES/activities.mo differ diff --git a/lang/ta/LC_MESSAGES/activities.mo b/lang/ta/LC_MESSAGES/activities.mo index 032ee37..0688abd 100644 Binary files a/lang/ta/LC_MESSAGES/activities.mo and b/lang/ta/LC_MESSAGES/activities.mo differ diff --git a/lang/uk.utf8/LC_MESSAGES/activities.mo b/lang/uk.utf8/LC_MESSAGES/activities.mo index 12b5a62..a3c154d 100644 Binary files a/lang/uk.utf8/LC_MESSAGES/activities.mo and b/lang/uk.utf8/LC_MESSAGES/activities.mo differ diff --git a/lang/uk/LC_MESSAGES/activities.mo b/lang/uk/LC_MESSAGES/activities.mo index 2b6c8e8..a3c154d 100644 Binary files a/lang/uk/LC_MESSAGES/activities.mo and b/lang/uk/LC_MESSAGES/activities.mo differ diff --git a/lib/GaletteActivities/Controllers/Crud/ActivitiesController.php b/lib/GaletteActivities/Controllers/Crud/ActivitiesController.php index 2806285..c861125 100644 --- a/lib/GaletteActivities/Controllers/Crud/ActivitiesController.php +++ b/lib/GaletteActivities/Controllers/Crud/ActivitiesController.php @@ -155,7 +155,6 @@ public function edit(Request $request, Response $response, ?int $id = null, stri $response, $this->getTemplate('activity'), [ - 'autocomplete' => true, 'page_title' => $title, 'activity' => $activity, // pseudo random int diff --git a/lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php b/lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php index a83b0cf..7fb8234 100644 --- a/lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php +++ b/lib/GaletteActivities/Controllers/Crud/SubscriptionsController.php @@ -225,7 +225,6 @@ public function edit(Request $request, Response $response, ?int $id = null, stri 'filters' => $m->getFilters(), 'count' => $m->getCount() ]; - $route_params['autocomplete'] = true; //check if current attached member is part of the list if ( @@ -246,7 +245,6 @@ public function edit(Request $request, Response $response, ?int $id = null, stri array_merge( $route_params, [ - 'autocomplete' => true, 'page_title' => $title, 'subscription' => $subscription, 'activities' => $activities->getList(), diff --git a/lib/GaletteActivities/PluginGaletteActivities.php b/lib/GaletteActivities/PluginGaletteActivities.php index 073e993..9210872 100644 --- a/lib/GaletteActivities/PluginGaletteActivities.php +++ b/lib/GaletteActivities/PluginGaletteActivities.php @@ -97,11 +97,10 @@ public function getListActions(Adherent $member): array return [ [ - 'label' => str_replace( - '%membername', - $member->sname, - //TRANS %membername will be replaced with current member name - _T("New subscription for %membername", "activities") + 'label' => sprintf( + //TRANS: %1$s is the member name + _T('New subscription for %1$s', 'activities'), + $member->sname ), 'route' => [ 'name' => 'activities_subscription_add', diff --git a/templates/default/activities.html.twig b/templates/default/activities.html.twig index f51efa4..fc265d2 100644 --- a/templates/default/activities.html.twig +++ b/templates/default/activities.html.twig @@ -64,7 +64,7 @@ {{ activity.getName() }} {{ activity.getType() }} - {% if activity.getPrice() %}{{ activity.getPrice()|number_format(2) }}{% endif %} + {% if activity.getPrice() is not null %}{{ activity.getPrice()|number_format(2) }}{% endif %} {{ activity.getCreationDate()|date(_T("Y-m-d")) }} {% if activity.getGroup() %}{{ activity.getGroup().getFullName() }}{% endif %} diff --git a/templates/default/activity.html.twig b/templates/default/activity.html.twig index 10d9b8f..8376613 100644 --- a/templates/default/activity.html.twig +++ b/templates/default/activity.html.twig @@ -10,7 +10,7 @@
- + {{ _T("General information", "activities") }}
@@ -26,11 +26,16 @@ label: activity.getFieldLabel('type') } %} - {% include "components/forms/text.html.twig" with { + {% embed "components/forms/number.html.twig" with { id: 'price', value: activity.getPrice(), label: activity.getFieldLabel('price') } %} + {# cents are allowed #} + {% block element %} + + {% endblock %} + {% endembed %} {% set group_list_values = {(0): _T("Select a group")} %} {% for group in groups %} @@ -43,7 +48,7 @@ value: group_id, values: group_list_values, label: _T("Attach to group", "activities"), - title: _T("Group to attach members that subscribes to activity.", "activities"), + description: _T("Subscribed members join this group, and are never removed from it.", "activities")|e, raw_labels: true } %} @@ -57,7 +62,7 @@
diff --git a/templates/default/scripts.html.twig b/templates/default/scripts.html.twig new file mode 100644 index 0000000..a08eaff --- /dev/null +++ b/templates/default/scripts.html.twig @@ -0,0 +1,10 @@ +{# + # This file is part of Galette Activities plugin (https://galette.eu). + # SPDX-FileCopyrightText: Copyright © 2024-2026 The Galette Team + # SPDX-License-Identifier: GPL-3.0-or-later + #} + +{# plugin pages only #} +{% if cur_route starts with 'activities_' %} + +{% endif %} diff --git a/templates/default/subscription.html.twig b/templates/default/subscription.html.twig index 412c1b5..1388930 100644 --- a/templates/default/subscription.html.twig +++ b/templates/default/subscription.html.twig @@ -10,7 +10,7 @@
- + {{ _T("Subscription information", "activities") }}
@@ -66,16 +66,21 @@
- + {{ _T("Financial information", "activities") }}
- {% include "components/forms/text.html.twig" with { + {% embed "components/forms/number.html.twig" with { id: 'payment_amount', value: subscription.getAmount(), label: _T("Amount", "activities"), placeholder: subscription.getAmountFromActivity() } %} + {# cents are allowed #} + {% block element %} + + {% endblock %} + {% endembed %}
{% include "components/forms/payment_types.html.twig" with { @@ -95,7 +100,7 @@
@@ -103,11 +108,8 @@ {% endblock %} {% block javascripts %} + {{ parent() }} {% endblock %} diff --git a/templates/default/subscriptions.html.twig b/templates/default/subscriptions.html.twig index 4b046ac..af03d03 100644 --- a/templates/default/subscriptions.html.twig +++ b/templates/default/subscriptions.html.twig @@ -157,7 +157,7 @@