Merge pull request #19 from yaal-coop/issue-18-confname

BBB %%CONFNAME%% variable substitution
numerique-gouv · Aug 16, 2023 · a667e05 · a667e05
2 parents fcb38d4 + 7485133
commit a667e05
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 6 deletions.
diff --git a/web/flaskr/forms.py b/web/flaskr/forms.py
@@ -73,8 +73,9 @@ class MeetingForm(FlaskForm):
             "Ce texte apparait comme message de bienvenue sur le tchat public"
         ),
         default=lazy_gettext(
-            "Bienvenue dans %(this_meeting)s <u><strong> %%CONFNAME%% </strong></u>.",
+            "Bienvenue dans %(this_meeting)s %(meeting_name)s.",
             this_meeting=current_app.config["WORDING_THIS_MEETING"],
+            meeting_name="<u><strong> %%CONFNAME%% </strong></u>",
         ),
         render_kw={"rows": 3},
         validators=[

diff --git a/web/translations/en/LC_MESSAGES/messages.po b/web/translations/en/LC_MESSAGES/messages.po
@@ -43,8 +43,8 @@ msgstr "This text is displayed as a welcome message on the public chat"
 
 #: web/flaskr/forms.py:75
 #, python-format
-msgid "Bienvenue dans %(this_meeting)s <u><strong> %%CONFNAME%% </strong></u>."
-msgstr "Welcome in this meeting <u><strong> %%CONFNAME%% </strong></u>."
+msgid "Bienvenue dans %(this_meeting)s %(meeting_name)s."
+msgstr "Welcome in this meeting %(meeting_name)s."
 
 #: web/flaskr/forms.py:81
 msgid "Le texte est trop long"

diff --git a/web/translations/fr/LC_MESSAGES/messages.po b/web/translations/fr/LC_MESSAGES/messages.po
@@ -43,7 +43,7 @@ msgstr ""
 
 #: web/flaskr/forms.py:75
 #, python-format
-msgid "Bienvenue dans %(this_meeting)s <u><strong> %%CONFNAME%% </strong></u>."
+msgid "Bienvenue dans %(this_meeting)s %(meeting_name)s."
 msgstr ""
 
 #: web/flaskr/forms.py:81

diff --git a/web/translations/messages.pot b/web/translations/messages.pot
@@ -42,7 +42,7 @@ msgstr ""
 
 #: web/flaskr/forms.py:75
 #, python-format
-msgid "Bienvenue dans %(this_meeting)s <u><strong> %%CONFNAME%% </strong></u>."
+msgid "Bienvenue dans %(this_meeting)s %(meeting_name)s."
 msgstr ""
 
 #: web/flaskr/forms.py:81

diff --git a/web/translations/uk/LC_MESSAGES/messages.po b/web/translations/uk/LC_MESSAGES/messages.po
@@ -44,7 +44,7 @@ msgstr ""
 
 #: web/flaskr/forms.py:75
 #, python-format
-msgid "Bienvenue dans %(this_meeting)s <u><strong> %%CONFNAME%% </strong></u>."
+msgid "Bienvenue dans %(this_meeting)s %(meeting_name)s."
 msgstr ""
 
 #: web/flaskr/forms.py:81