Skip to content

Commit

Permalink
Merge branch 'release/2.1.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
trasher committed Oct 20, 2024
2 parents 331dfc5 + af76b46 commit 2249b83
Show file tree
Hide file tree
Showing 17 changed files with 489 additions and 495 deletions.
1 change: 1 addition & 0 deletions .composer-require-checker.config.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@

"// Galette constants (not detected as they are dynamically declared)",
"GALETTE_ATTACHMENTS_PATH",
"GALETTE_ADAPTATIVE_CARDS",
"GALETTE_BASE_PATH",
"GALETTE_CACHE_DIR",
"GALETTE_CARD_COLS",
Expand Down
10 changes: 6 additions & 4 deletions .github/workflows/ci-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -214,15 +214,17 @@ jobs:
POSTGRES_HOST: localhost
POSTGRES_PORT: 5432
run: |
PGPASSWORD=g@l3tte psql -d galette_tests -a -f galette-core/galette/install/scripts/pgsql.sql -U galette_tests -h localhost
PGPASSWORD=g@l3tte psql -d galette_tests -a -f galette-core/galette/plugins/plugin-events/scripts/pgsql.sql -U galette_tests -h localhost
cd galette-core
bin/console galette:install -v --dbtype=pgsql --dbhost=localhost --dbname=galette_tests --dbuser=galette_tests --dbpass=g@l3tte --admin=admin --password=admin --no-interaction -w
bin/console galette:plugins:install-db --all
if: env.skip != 'true' && startsWith(matrix.db-image, 'postgres')

- name: Init for MariaDB
run: |
cd galette-core
mysql -e 'create database IF NOT EXISTS galette_tests;' -u galette_tests --password=g@l3tte -h 127.0.0.1 -P 3306
mysql -e 'use galette_tests; source galette-core/galette/install/scripts/mysql.sql;' -u galette_tests --password=g@l3tte -h 127.0.0.1 -P 3306
mysql -e 'use galette_tests; source galette-core/galette/plugins/plugin-events/scripts/mysql.sql;' -u galette_tests --password=g@l3tte -h 127.0.0.1 -P 3306
bin/console galette:install -v --dbtype=mysql --dbhost=127.0.0.1 --dbname=galette_tests --dbuser=galette_tests --dbpass=g@l3tte --admin=admin --password=admin --no-interaction -w
bin/console galette:plugins:install-db --all
if: env.skip != 'true' && (startsWith(matrix.db-image, 'mysql') || startsWith(matrix.db-image, 'mariadb'))

- name: Unit tests
Expand Down
6 changes: 3 additions & 3 deletions _define.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@
'Galette Events', //Name
'Events management', //Short description
'Johan Cwiklinski', //Author
'2.1.2', //Version
'1.1.0', //Galette compatible version
'2.1.3', //Version
'1.1.4', //Galette compatible version
'events', //routing name and translation domain
'2024-07-09', //Release date
'2024-10-20', //Release date
[ //Permissions needed
'events_events' => 'member',
'events_bookings' => 'member',
Expand Down
Binary file modified lang/ar.utf8/LC_MESSAGES/events.mo
Binary file not shown.
Binary file modified lang/es.utf8/LC_MESSAGES/events.mo
Binary file not shown.
32 changes: 16 additions & 16 deletions lang/events_ar.utf8.po
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2024-07-02 21:38+0200\n"
"PO-Revision-Date: 2024-02-06 17:01+0000\n"
"PO-Revision-Date: 2024-09-14 15:09+0000\n"
"Last-Translator: ButterflyOfFire <[email protected]>\n"
"Language-Team: Arabic <https://hosted.weblate.org/projects/galette/events-"
"plugin/ar/>\n"
"Language-Team: Arabic <https://hosted.weblate.org/projects/galette/"
"events-plugin/ar/>\n"
"Language: ar\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
"&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
"X-Generator: Weblate 5.4-dev\n"
"X-Generator: Weblate 5.8-dev\n"

#: ../lib/GaletteEvents/Booking.php:192
msgid "Event is mandatory"
Expand All @@ -34,7 +34,7 @@ msgstr ""

#: ../lib/GaletteEvents/Booking.php:262
msgid "Member is mandatory"
msgstr ""
msgstr "العضو إلزامي"

#: ../lib/GaletteEvents/Booking.php:274
msgid "There must be at least one person"
Expand Down Expand Up @@ -106,19 +106,19 @@ msgstr ""

#: ../lib/GaletteEvents/Controllers/Crud/ActivitiesController.php:125
msgid "Activities management"
msgstr ""
msgstr "إدارة الأنشطة"

#: ../lib/GaletteEvents/Controllers/Crud/ActivitiesController.php:196
msgid "Activity"
msgstr ""
msgstr "النشاط"

#: ../lib/GaletteEvents/Controllers/Crud/ActivitiesController.php:257
msgid "New activity has been successfully added."
msgstr ""

#: ../lib/GaletteEvents/Controllers/Crud/ActivitiesController.php:259
msgid "Activity has been modified."
msgstr ""
msgstr "تم تعديل النشاط."

#: ../lib/GaletteEvents/Controllers/Crud/ActivitiesController.php:263
msgid "An error occurred while storing the activity."
Expand All @@ -128,7 +128,7 @@ msgstr ""
#: ../lib/GaletteEvents/Controllers/Crud/ActivitiesController.php:348
#, php-format
msgid "Remove activity %1$s"
msgstr ""
msgstr "حذف النشاط %1$s"

#: ../lib/GaletteEvents/Controllers/Crud/EventsController.php:130
msgid "Events management"
Expand Down Expand Up @@ -265,7 +265,7 @@ msgstr ""

#: ../lib/GaletteEvents/Event.php:255 ../lib/GaletteEvents/Activity.php:174
msgid "Name is mandatory"
msgstr ""
msgstr "الاسم إلزامي"

#: ../lib/GaletteEvents/Event.php:271
msgid "Please select a group you own!"
Expand Down Expand Up @@ -320,7 +320,7 @@ msgstr ""

#: ../tempcache/event.html.twig:64 ../tempcache/activity.html.twig:64
msgid "General information"
msgstr ""
msgstr "معلومات عامة"

#: ../tempcache/event.html.twig:71
msgid "Is open"
Expand Down Expand Up @@ -416,7 +416,7 @@ msgstr ""

#: ../tempcache/booking.html.twig:287
msgid "Financial information"
msgstr ""
msgstr "معلومات مالية"

#: ../tempcache/booking.html.twig:294 ../tempcache/bookings.html.twig:141
#: ../tempcache/bookings.html.twig:272 ../tempcache/bookings.html.twig:429
Expand Down Expand Up @@ -506,7 +506,7 @@ msgstr ""

#: ../tempcache/bookings.html.twig:500
msgid "Remove from database"
msgstr ""
msgstr "حذف من قاعدة البيانات"

#: ../tempcache/bookings.html.twig:533
msgid "No booking has been found"
Expand All @@ -525,7 +525,7 @@ msgstr[5] ""

#: ../tempcache/activities.html.twig:90
msgid "New activity"
msgstr ""
msgstr "نشاط جديد"

#: ../tempcache/activities.html.twig:104 ../tempcache/activities.html.twig:157
msgid "Creation date"
Expand Down Expand Up @@ -556,7 +556,7 @@ msgstr ""

#: ../tempcache/activities.html.twig:245
msgid "No activity has been found"
msgstr ""
msgstr "لم يعثر على أي نشاط"

#: ../tempcache/events.html.twig:62
#, php-format
Expand Down
47 changes: 24 additions & 23 deletions lang/events_es.utf8.po
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,24 @@
# Germe the fur star <[email protected]>, 2021.
# Cow <[email protected]>, 2022.
# Javier <[email protected]>, 2022.
# gallegonovato <[email protected]>, 2022, 2023.
# gallegonovato <[email protected]>, 2022, 2023, 2024.
# ventura vicenta memba moule <[email protected]>, 2023.
# Kamborio <[email protected]>, 2024.
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2024-07-02 21:38+0200\n"
"PO-Revision-Date: 2023-12-07 12:04+0000\n"
"Last-Translator: gallegonovato <[email protected]>\n"
"Language-Team: Spanish <https://hosted.weblate.org/projects/galette/events-"
"plugin/es/>\n"
"PO-Revision-Date: 2024-10-17 11:16+0000\n"
"Last-Translator: Kamborio <[email protected]>\n"
"Language-Team: Spanish <https://hosted.weblate.org/projects/galette/"
"events-plugin/es/>\n"
"Language: es\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Weblate 5.3-dev\n"
"X-Generator: Weblate 5.8-rc\n"

#: ../lib/GaletteEvents/Booking.php:192
msgid "Event is mandatory"
Expand All @@ -40,7 +41,7 @@ msgstr "Especifique la cantidad si la reserva ha sido abonada ;)"

#: ../lib/GaletteEvents/Booking.php:262
msgid "Member is mandatory"
msgstr "Miembro es obligatorio"
msgstr "El miembro es obligatorio"

#: ../lib/GaletteEvents/Booking.php:274
msgid "There must be at least one person"
Expand Down Expand Up @@ -120,15 +121,15 @@ msgstr "Actividad"

#: ../lib/GaletteEvents/Controllers/Crud/ActivitiesController.php:257
msgid "New activity has been successfully added."
msgstr "Ha sido agregada correctamente una actividad nueva."
msgstr "La nueva actividad se ha añadido con éxito."

#: ../lib/GaletteEvents/Controllers/Crud/ActivitiesController.php:259
msgid "Activity has been modified."
msgstr "Ha sido modificada la actividad."
msgstr "La actividad ha sido modificada."

#: ../lib/GaletteEvents/Controllers/Crud/ActivitiesController.php:263
msgid "An error occurred while storing the activity."
msgstr "Ha ocurrido un error mientras almacenaba la actividad."
msgstr "Ha ocurrido un error mientras guardaba la actividad."

#. TRANS %1$s is activity name
#: ../lib/GaletteEvents/Controllers/Crud/ActivitiesController.php:348
Expand Down Expand Up @@ -199,7 +200,7 @@ msgstr "Número de personas"
#: ../lib/GaletteEvents/Controllers/CsvController.php:96
#: ../tempcache/booking.html.twig:301
msgid "Amount"
msgstr "Monto"
msgstr "Cantidad"

#: ../lib/GaletteEvents/Controllers/CsvController.php:98
#: ../tempcache/booking.html.twig:313
Expand Down Expand Up @@ -271,7 +272,7 @@ msgstr "La fecha debe ser posterior o igual a la fecha de inicio"

#: ../lib/GaletteEvents/Event.php:255 ../lib/GaletteEvents/Activity.php:174
msgid "Name is mandatory"
msgstr "Nombre es obligatorio"
msgstr "El nombre es obligatorio"

#: ../lib/GaletteEvents/Event.php:271
msgid "Please select a group you own!"
Expand Down Expand Up @@ -314,11 +315,11 @@ msgstr "Crear reserva de evento"

#: ../lib/GaletteEvents/Activity.php:242
msgid "Activity added"
msgstr "Actividad agregada"
msgstr "Actividad aañadida"

#: ../lib/GaletteEvents/Activity.php:247
msgid "Fail to add new activity."
msgstr "Error al agregar actividad nueva."
msgstr "Error al añadir la nueva actividad."

#: ../lib/GaletteEvents/Activity.php:266
msgid "Activity updated"
Expand All @@ -339,7 +340,7 @@ msgstr "Nombre"

#: ../tempcache/event.html.twig:84
msgid "Color"
msgstr ""
msgstr "Color"

#: ../tempcache/event.html.twig:122
msgid "Limit to group"
Expand Down Expand Up @@ -422,13 +423,13 @@ msgstr "Ninguna actividad para evento seleccionado"

#: ../tempcache/booking.html.twig:287
msgid "Financial information"
msgstr "Informaciones financieras"
msgstr "Información financiera"

#: ../tempcache/booking.html.twig:294 ../tempcache/bookings.html.twig:141
#: ../tempcache/bookings.html.twig:272 ../tempcache/bookings.html.twig:429
#: ../tempcache/bookings.html.twig:441 ../tempcache/bookings.html.twig:452
msgid "Paid"
msgstr "Remunerado"
msgstr "Pagado"

#: ../tempcache/bookings.html.twig:61
msgid "No booking selected"
Expand Down Expand Up @@ -483,7 +484,7 @@ msgstr "Selección..."

#: ../tempcache/bookings.html.twig:198
msgid "All payment types"
msgstr "Todos los tipos de abonación"
msgstr "Todos los tipos de pago"

#: ../tempcache/bookings.html.twig:204 ../tempcache/bookings.html.twig:206
#: ../tempcache/events.html.twig:104 ../tempcache/events.html.twig:187
Expand All @@ -497,7 +498,7 @@ msgstr "Reserva abonada:"
#: ../tempcache/bookings.html.twig:288 ../tempcache/bookings.html.twig:431
#: ../tempcache/bookings.html.twig:443 ../tempcache/bookings.html.twig:458
msgid "Not paid"
msgstr "No renumerado"
msgstr "No pagado"

#: ../tempcache/bookings.html.twig:340
#, php-format
Expand Down Expand Up @@ -525,7 +526,7 @@ msgstr[1] "%1$s actividades"

#: ../tempcache/activities.html.twig:90
msgid "New activity"
msgstr "Crear actividad"
msgstr "Nueva actividad"

#: ../tempcache/activities.html.twig:104 ../tempcache/activities.html.twig:157
msgid "Creation date"
Expand All @@ -547,12 +548,12 @@ msgstr "Inactiva"
#: ../tempcache/activities.html.twig:207 ../tempcache/events.html.twig:257
#, php-format
msgid "%1$s: edit information"
msgstr "%1$s: editar informaciones"
msgstr "%1$s: editar información"

#: ../tempcache/activities.html.twig:209 ../tempcache/events.html.twig:270
#, php-format
msgid "%1$s: remove from database"
msgstr "%1$s: quitar desde BdD"
msgstr "%1$s: borrar de la base de datos"

#: ../tempcache/activities.html.twig:245
msgid "No activity has been found"
Expand Down
6 changes: 3 additions & 3 deletions lang/events_fr_FR.utf8.po
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ msgstr ""
"Project-Id-Version: Galette Events plugin\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2024-07-02 21:38+0200\n"
"PO-Revision-Date: 2024-07-02 19:43+0000\n"
"PO-Revision-Date: 2024-09-15 07:51+0000\n"
"Last-Translator: Johan Cwiklinski <[email protected]>\n"
"Language-Team: French <https://hosted.weblate.org/projects/galette/"
"events-plugin/fr/>\n"
Expand All @@ -14,7 +14,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n > 1;\n"
"X-Generator: Weblate 5.7-dev\n"
"X-Generator: Weblate 5.8-dev\n"

#: ../lib/GaletteEvents/Booking.php:192
msgid "Event is mandatory"
Expand Down Expand Up @@ -331,7 +331,7 @@ msgstr "Nom"

#: ../tempcache/event.html.twig:84
msgid "Color"
msgstr "Coleur"
msgstr "Couleur"

#: ../tempcache/event.html.twig:122
msgid "Limit to group"
Expand Down
16 changes: 8 additions & 8 deletions lang/events_oc.utf8.po
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2024-07-02 21:38+0200\n"
"PO-Revision-Date: 2024-03-20 16:21+0000\n"
"PO-Revision-Date: 2024-10-15 19:28+0000\n"
"Last-Translator: Pèire Bréchet <[email protected]>\n"
"Language-Team: Occitan <https://hosted.weblate.org/projects/galette/events-"
"plugin/oc/>\n"
"Language-Team: Occitan <https://hosted.weblate.org/projects/galette/"
"events-plugin/oc/>\n"
"Language: oc\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n > 1;\n"
"X-Generator: Weblate 5.5-dev\n"
"X-Generator: Weblate 5.8-rc\n"

#: ../lib/GaletteEvents/Booking.php:192
msgid "Event is mandatory"
Expand Down Expand Up @@ -193,7 +193,7 @@ msgstr ""
#: ../lib/GaletteEvents/Controllers/CsvController.php:96
#: ../tempcache/booking.html.twig:301
msgid "Amount"
msgstr "Montant"
msgstr "Soma"

#: ../lib/GaletteEvents/Controllers/CsvController.php:98
#: ../tempcache/booking.html.twig:313
Expand Down Expand Up @@ -422,7 +422,7 @@ msgstr ""
#: ../tempcache/bookings.html.twig:272 ../tempcache/bookings.html.twig:429
#: ../tempcache/bookings.html.twig:441 ../tempcache/bookings.html.twig:452
msgid "Paid"
msgstr ""
msgstr "Pagat"

#: ../tempcache/bookings.html.twig:61
msgid "No booking selected"
Expand Down Expand Up @@ -609,4 +609,4 @@ msgstr ""

#: ../tempcache/calendar.html.twig:93
msgid "Today"
msgstr ""
msgstr "Uei"
Binary file modified lang/fr_FR.utf8/LC_MESSAGES/events.mo
Binary file not shown.
Binary file modified lang/oc.utf8/LC_MESSAGES/events.mo
Binary file not shown.
Loading

0 comments on commit 2249b83

Please sign in to comment.