Merge branch 'release/2.1.2'

galette · Oct 20, 2024 · baca26c · baca26c
2 parents 81ccefc + a9441b6
commit baca26c
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 13 deletions.
diff --git a/.github/workflows/ci-linux.yml b/.github/workflows/ci-linux.yml
@@ -205,15 +205,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-paypal/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-paypal/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

diff --git a/_define.php b/_define.php
@@ -25,10 +25,10 @@
     'Galette Paypal',       //Name
     'Paypal integration',   //Short description
     'Johan Cwiklinski',     //Author
-    '2.1.1',                //Version
+    '2.1.2',                //Version
     '1.1.0',                //Galette compatible version
     'paypal',               //routing name and translation domain
-    '2024-07-06',           //Release date
+    '2024-10-20',           //Release date
     [   //Permissions needed
         'paypal_preferences'        => 'staff',
         'store_paypal_preferences'  => 'staff',

diff --git a/lang/es.utf8/LC_MESSAGES/paypal.mo b/lang/es.utf8/LC_MESSAGES/paypal.mo
diff --git a/lang/paypal_es.utf8.po b/lang/paypal_es.utf8.po
@@ -5,21 +5,22 @@
 # Berto Te <Bertote@3fpj.com>, 2021.
 # Johan Cwiklinski <trasher@x-tnd.be>, 2021, 2022, 2023.
 # gallegonovato <fran-carro@hotmail.es>, 2022.
+# Kamborio <Kamborio15@users.noreply.hosted.weblate.org>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Report-Msgid-Bugs-To: translations@galette.eu\n"
 "POT-Creation-Date: 2024-02-08 22:18+0100\n"
-"PO-Revision-Date: 2023-12-09 18:39+0000\n"
-"Last-Translator: Johan Cwiklinski <trasher@x-tnd.be>\n"
-"Language-Team: Spanish <https://hosted.weblate.org/projects/galette/paypal-"
-"plugin/es/>\n"
+"PO-Revision-Date: 2024-10-19 07:02+0000\n"
+"Last-Translator: Kamborio <Kamborio15@users.noreply.hosted.weblate.org>\n"
+"Language-Team: Spanish <https://hosted.weblate.org/projects/galette/"
+"paypal-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/GalettePaypal/Controllers/PaypalController.php:68
 msgid "Paypal payment"
@@ -83,7 +84,7 @@ msgstr "¡Tu pago ha sido procesado!"
 
 #: ../lib/GalettePaypal/PluginGalettePaypal.php:49
 msgid "Paypal"
-msgstr "Paypal"
+msgstr "PayPal"
 
 #: ../lib/GalettePaypal/PluginGalettePaypal.php:80
 msgid "Payment form"