Skip to content

Commit

Permalink
Merge branch 'release/2.1.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
trasher committed Oct 20, 2024
2 parents 080fffc + 6a4c9a2 commit 8f99e55
Show file tree
Hide file tree
Showing 9 changed files with 38 additions and 32 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 @@ -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-objectslend/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-objectslend/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
4 changes: 2 additions & 2 deletions _define.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@
'Galette Objects Lend', //Name
'Manage rent/lend of object', //Short description
'Mélissa Djebel, Johan Cwiklinski', //Author
'2.1.1', //Version
'2.1.2', //Version
'1.1.0', //Galette version compatibility
'objectslend', //routing name and translation domain
'2024-07-06', //Date
'2024-10-20', //Date
[
'objectslend_preferences' => 'admin',
'store_objectlend_preferences' => 'admin',
Expand Down
Binary file modified lang/es.utf8/LC_MESSAGES/objectslend.mo
Binary file not shown.
31 changes: 16 additions & 15 deletions lang/objectslend_es.utf8.po
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,23 @@
# Alonso Arteaga <alon.arte.r@gmail.com>, 2021.
# noelia <zizizhuji1@gmail.com>, 2021.
# Cow <javier.fserrador@gmail.com>, 2022.
# gallegonovato <fran-carro@hotmail.es>, 2022, 2023.
# gallegonovato <fran-carro@hotmail.es>, 2022, 2023, 2024.
# 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:16+0100\n"
"PO-Revision-Date: 2023-12-07 12:05+0000\n"
"Last-Translator: gallegonovato <fran-carro@hotmail.es>\n"
"PO-Revision-Date: 2024-10-17 17:16+0000\n"
"Last-Translator: Kamborio <Kamborio15@users.noreply.hosted.weblate.org>\n"
"Language-Team: Spanish <https://hosted.weblate.org/projects/galette/"
"objectslend-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"

#. TRANS: this is a filename
#: ../lib/GaletteObjectsLend/IO/PdfObject.php:58
Expand Down Expand Up @@ -226,7 +227,7 @@ msgstr "Disponible"

#: ../lib/GaletteObjectsLend/Entity/LendStatus.php:144
msgid "Status has not been added :("
msgstr "Estado que no ha sido añadido :("
msgstr "No se ha añadido el estado :("

#: ../lib/GaletteObjectsLend/Entity/LendObject.php:349
msgid "Object has not been added :("
Expand Down Expand Up @@ -276,7 +277,7 @@ msgstr "Editar estado %status"

#: ../lib/GaletteObjectsLend/Controllers/Crud/StatusController.php:228
msgid "New status"
msgstr "Estado nuevo"
msgstr "Nuevo estado"

#: ../lib/GaletteObjectsLend/Controllers/Crud/StatusController.php:268
msgid "An error occurred while storing the status."
Expand Down Expand Up @@ -349,7 +350,7 @@ msgstr "Estado actualizado"

#: ../lib/GaletteObjectsLend/Controllers/Crud/ObjectsController.php:545
msgid "Successfully cloned from #%id.<br/>You can now edit it."
msgstr "Clonado correcto desde nº %id.<br>Ahora puede editarlo."
msgstr "Clonado con éxito desde nº %id.<br/>Ahora puedes editarlo."

#: ../lib/GaletteObjectsLend/Controllers/Crud/ObjectsController.php:551
msgid "An error occurred cloning object :("
Expand Down Expand Up @@ -400,7 +401,7 @@ msgstr "Va a quitar %count objetos."

#: ../lib/GaletteObjectsLend/PluginGaletteObjectslend.php:48
msgid "Objects lend"
msgstr "Lente de objetos"
msgstr "Préstamo de objetos"

#: ../lib/GaletteObjectsLend/PluginGaletteObjectslend.php:71
msgid "Borrow status"
Expand All @@ -412,7 +413,7 @@ msgstr "Categorías de objeto"

#: ../lib/GaletteObjectsLend/PluginGaletteObjectslend.php:85
msgid "Preferences"
msgstr "Preferencias"
msgstr "Ajustes"

#: ../lib/GaletteObjectsLend/Filters/ObjectsList.php:257
msgid "Name/description"
Expand Down Expand Up @@ -441,8 +442,8 @@ msgid ""
"Check if the object is available to be borrowed;<br/>uncheck if object is "
"already borrowed and should be given back"
msgstr ""
"Marque si el objeto está disponible para ser alquilado;<br>desmarque si el "
"objeto ya está alquilado y debería ser devuelto"
"Marca si el objeto está disponible para ser prestado;<br/>desmarca si el "
"objeto ya se ha prestado y debería devolverse"

#: ../tempcache/status_edit.html.twig:80
#: ../tempcache/categories_list.html.twig:131
Expand Down Expand Up @@ -589,9 +590,9 @@ msgid ""
"Will permit to see fullsize image clicking on thumbnails.<br/>If disabled, "
"only thumbnails will be displayed, but full images are still kept."
msgstr ""
"Permitirá ver imagen en pantalla completa pulsando en huellas.<br>Si "
"deshabilitó, solamente huelllas serán representadas, pero las imágenes "
"completas aún están conservadas."
"Permitirá ver la imagen en pantalla completa haciendo clic en las "
"miniaturas.<br/>Si se desactivó, solo se mostrarán las miniaturas, pero las "
"imágenes completas todavía se mantendrán."

#: ../tempcache/preferences.html.twig:196
msgid "View category:"
Expand Down
10 changes: 5 additions & 5 deletions lang/objectslend_oc.utf8.po
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
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:16+0100\n"
"PO-Revision-Date: 2024-05-01 13:07+0000\n"
"PO-Revision-Date: 2024-10-15 19:28+0000\n"
"Last-Translator: Pèire Bréchet <oxytanistzero@tutanota.com>\n"
"Language-Team: Occitan <https://hosted.weblate.org/projects/galette/"
"objectslend-plugin/oc/>\n"
Expand All @@ -16,7 +16,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.5.3-dev\n"
"X-Generator: Weblate 5.8-rc\n"

#. TRANS: this is a filename
#: ../lib/GaletteObjectsLend/IO/PdfObject.php:58
Expand All @@ -29,7 +29,7 @@ msgstr "Ficha de l’objècte"

#: ../lib/GaletteObjectsLend/IO/PdfObject.php:72
msgid "Labels"
msgstr ""
msgstr "Etiquetas"

#: ../lib/GaletteObjectsLend/IO/PdfObject.php:136
#: ../lib/GaletteObjectsLend/IO/PdfObjects.php:159
Expand Down Expand Up @@ -707,7 +707,7 @@ msgstr ""

#: ../tempcache/category_edit.html.twig:81
msgid "Picture:"
msgstr ""
msgstr "Fòto :"

#: ../tempcache/category_edit.html.twig:103
msgid "Category photo"
Expand Down
14 changes: 8 additions & 6 deletions lang/objectslend_pt.utf8.po
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,23 @@
# This file is distributed under the same license as the PACKAGE package.
# Languages add-on <noreply-addon-languages@weblate.org>, 2024.
# Manuela Silva <mmsrs@sky.com>, 2024.
# Gustavo Lorenzato dos Santos <gustavolorenzatodossantos@gmail.com>, 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:16+0100\n"
"PO-Revision-Date: 2024-04-29 04:34+0000\n"
"Last-Translator: Manuela Silva <mmsrs@sky.com>\n"
"PO-Revision-Date: 2024-09-20 15:40+0000\n"
"Last-Translator: Gustavo Lorenzato dos Santos "
"<gustavolorenzatodossantos@gmail.com>\n"
"Language-Team: Portuguese <https://hosted.weblate.org/projects/galette/"
"objectslend-plugin/pt/>\n"
"Language: pt\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.1\n"
"X-Generator: Weblate 5.8-dev\n"

#. TRANS: this is a filename
#: ../lib/GaletteObjectsLend/IO/PdfObject.php:58
Expand Down Expand Up @@ -157,7 +159,7 @@ msgstr ""
#: ../tempcache/objects_list.html.twig:200
#: ../tempcache/objects_list.html.twig:644
msgid "Status"
msgstr ""
msgstr "Status"

#: ../lib/GaletteObjectsLend/IO/PdfObject.php:195
#: ../tempcache/objects_edit.html.twig:342
Expand Down Expand Up @@ -223,7 +225,7 @@ msgstr ""

#: ../lib/GaletteObjectsLend/Entity/LendStatus.php:144
msgid "Status has not been added :("
msgstr ""
msgstr "Status não foi adicionado :("

#: ../lib/GaletteObjectsLend/Entity/LendObject.php:349
msgid "Object has not been added :("
Expand Down
Binary file modified lang/oc.utf8/LC_MESSAGES/objectslend.mo
Binary file not shown.
Binary file modified lang/pt.utf8/LC_MESSAGES/objectslend.mo
Binary file not shown.

0 comments on commit 8f99e55

Please sign in to comment.