From c7ba0039f5cd1b7c57111738538be547a57c09e6 Mon Sep 17 00:00:00 2001
From: Thomas Citharel <thomas.citharel@framasoft.org>
Date: Mon, 9 Oct 2023 13:35:23 +0000
Subject: [PATCH 1/2] Translated using Weblate (French)
Currently translated at 100.0% (353 of 353 strings)
Translation: Mobilizon/Backend
Translate-URL: https://weblate.framasoft.org/projects/mobilizon/backend/fr/
---
priv/gettext/fr/LC_MESSAGES/default.po | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/priv/gettext/fr/LC_MESSAGES/default.po b/priv/gettext/fr/LC_MESSAGES/default.po
index b7dfcc03a..24bd1fb06 100644
--- a/priv/gettext/fr/LC_MESSAGES/default.po
+++ b/priv/gettext/fr/LC_MESSAGES/default.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"POT-Creation-Date: \n"
-"PO-Revision-Date: 2023-02-08 02:24+0000\n"
+"PO-Revision-Date: 2023-10-09 13:35+0000\n"
"Last-Translator: Thomas Citharel <thomas.citharel@framasoft.org>\n"
"Language-Team: French <https://weblate.framasoft.org/projects/mobilizon/"
"backend/fr/>\n"
@@ -19,7 +19,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 4.15.2\n"
+"X-Generator: Weblate 5.0.1\n"
#: lib/web/templates/email/password_reset.html.heex:66
#, elixir-autogen, elixir-format
@@ -1730,7 +1730,7 @@ msgstr ""
#: lib/web/email/actor.ex:43
#, elixir-autogen, elixir-format
msgid "Your participation to %{event} has been cancelled!"
-msgstr "Votre participation à l'événement %{title} a été annulée !"
+msgstr "Votre participation à l'événement %{event} a été annulée !"
#: lib/web/templates/email/actor_suspension_participants.html.heex:50
#: lib/web/templates/email/actor_suspension_participants.text.eex:3
From 2ecdf05bf9973855353f68c424da184cb6b12fa0 Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Mon, 9 Oct 2023 17:33:02 +0200
Subject: [PATCH 2/2] fix(docker): allow to configure SMTP TLS
The :tls configuration was not configurable with ENV variables, so it couldn't be changed to
:always, :never or :if_available
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
---
config/docker.exs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/config/docker.exs b/config/docker.exs
index 7d363172e..cef88c266 100644
--- a/config/docker.exs
+++ b/config/docker.exs
@@ -49,7 +49,7 @@ config :mobilizon, Mobilizon.Web.Email.Mailer,
port: System.get_env("MOBILIZON_SMTP_PORT", "25"),
username: System.get_env("MOBILIZON_SMTP_USERNAME", nil),
password: System.get_env("MOBILIZON_SMTP_PASSWORD", nil),
- tls: :if_available,
+ tls: System.get_env("MOBILIZON_SMTP_TLS", :if_available),
allowed_tls_versions: [:"tlsv1.2", :"tlsv1.3"],
tls_options: [
verify: :verify_peer,
@@ -58,7 +58,7 @@ config :mobilizon, Mobilizon.Web.Email.Mailer,
server_name_indication: ~c"#{System.get_env("MOBILIZON_SMTP_SERVER", "localhost")}",
depth: 99
],
- ssl: System.get_env("MOBILIZON_SMTP_SSL", "false"),
+ ssl: System.get_env("MOBILIZON_SMTP_SSL", false),
retries: 1,
no_mx_lookups: false,
auth: :if_available