Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Release/2.1.1 #19

Merged
merged 10 commits into from
Jul 6, 2024
Merged

Release/2.1.1 #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
0a2c0a0
Merge branch 'release/2.1.0' into develop
trasher Jun 7, 2024
f268f82
Fix tests
trasher Jun 7, 2024
ad99d5b
Checker configuration
trasher Jun 7, 2024
726fadb
Translated using Weblate (Italian)
ciampix Jun 17, 2024
bba173a
Compile locales
trasher Jun 18, 2024
5bcfad6
Use new Galette 1.1.0 debug
trasher Jun 18, 2024
4b7bbf8
Quick & dirty hack (again) to fix composer checker
trasher Jun 18, 2024
6b47b4d
Translated using Weblate (Italian)
ciampix Jun 19, 2024
a9fbea6
Compile locales
trasher Jun 20, 2024
916674b
Bump version
trasher Jul 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .composer-require-checker.config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
"GALETTE_DOWNLOADS_URI",
"GALETTE_EXPORTS_PATH",
"GALETTE_FILES_PATH",
"GALETTE_HOSTED",
"GALETTE_IMPORTS_PATH",
"GALETTE_LOGS_PATH",
"GALETTE_MODE",
Expand All @@ -58,6 +59,7 @@
"GALETTE_MARIADB_MIN",
"GALETTE_PGSQL_MIN",
"GALETTE_DISPLAY_VERSION",
"GALETTE_TESTS",
"GALETTE_PHP_MIN",

"// Galette db constants (not detected as they are dynamically declared)",
Expand Down Expand Up @@ -102,7 +104,8 @@
"DI\\Attribute\\Inject",

"// Not detected, do not know why.",
"Psr\\Http\\Server\\RequestHandlerInterface"
"Psr\\Http\\Server\\RequestHandlerInterface",
"Install"
],
"scan-files": [
"*.php",
Expand Down
4 changes: 2 additions & 2 deletions _define.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@
'Galette Paypal', //Name
'Paypal integration', //Short description
'Johan Cwiklinski', //Author
'2.1.0', //Version
'2.1.1', //Version
'1.1.0', //Galette compatible version
'paypal', //routing name and translation domain
'2024-06-08', //Release date
'2024-07-06', //Release date
[ //Permissions needed
'paypal_preferences' => 'staff',
'store_paypal_preferences' => 'staff',
Expand Down
Binary file modified lang/it_IT.utf8/LC_MESSAGES/paypal.mo
View file
Open in desktop
Binary file not shown.
19 changes: 10 additions & 9 deletions lang/paypal_it_IT.utf8.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,22 @@
# Luca De Filippo <[email protected]>, 2021.
# Lory ~ <[email protected]>, 2021.
# Johan Cwiklinski <[email protected]>, 2021, 2022, 2023.
# Marco Ciampa <[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-02-08 22:18+0100\n"
"PO-Revision-Date: 2023-12-09 18:39+0000\n"
"Last-Translator: Johan Cwiklinski <[email protected]>\n"
"Language-Team: Italian <https://hosted.weblate.org/projects/galette/paypal-"
"plugin/it/>\n"
"PO-Revision-Date: 2024-06-20 11:09+0000\n"
"Last-Translator: Marco Ciampa <[email protected]>\n"
"Language-Team: Italian <https://hosted.weblate.org/projects/galette/"
"paypal-plugin/it/>\n"
"Language: it_IT\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.6-rc\n"

#: ../lib/GalettePaypal/Controllers/PaypalController.php:68
msgid "Paypal payment"
Expand All @@ -34,15 +35,15 @@ msgstr ""

#: ../lib/GalettePaypal/Controllers/PaypalController.php:80
msgid "Our apologies for the annoyance :("
msgstr ""
msgstr "Ci scusiamo per l'inconveniente :("

#: ../lib/GalettePaypal/Controllers/PaypalController.php:87
msgid ""
"Paypal id has not been defined. Please ask an administrator to add it from "
"plugin preferences."
msgstr ""
"L'ID Paypal non è stato definito. Chiedi a un amministratore di aggiungerlo "
"dalle preferenze del plugin."
"L'ID Paypal non è stato definito. Chiedere a un amministratore di "
"aggiungerlo dalle preferenze del plugin."

#: ../lib/GalettePaypal/Controllers/PaypalController.php:94
msgid "Predefined amounts cannot be loaded, that is not a critical error."
Expand Down
2 changes: 1 addition & 1 deletion templates/default/paypal_form.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

{% block content %}
{% if paypal.isLoaded() and paypal.getId() != null %}
<form action="{% if constant('GALETTE_MODE') == 'DEV' %}https://www.sandbox.paypal.com/fr/cgi-bin/webscr{% else %}https://www.paypal.com/cgi-bin/webscr{% endif %}" method="post" id="paypalform" class="ui form">
<form action="{% if callstatic('\\Galette\\Core\\Galette', 'isDebugEnabled') %}https://www.sandbox.paypal.com/fr/cgi-bin/webscr{% else %}https://www.paypal.com/cgi-bin/webscr{% endif %}" method="post" id="paypalform" class="ui form">
<div class="ui top attached accordion-styled header">
{% if amounts|length == 0 %}
{{ _T("Enter payment reason", "paypal") }}
Expand Down
2 changes: 1 addition & 1 deletion tests/GalettePaypal/tests/units/Paypal.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public function testEmpty(): void

$ctype = new \Galette\Entity\ContributionsTypes($this->zdb);
$ctype_id = $ctype->getIdByLabel('donation in money');
$this->assertSame(
$this->assertEquals(
[
$ctype_id => [
'name' => 'donation in money',
Expand Down