From 6b4ea1a2e77ae10b4cbbf7c280e32c0b719662f0 Mon Sep 17 00:00:00 2001 From: Sabrina Demagny Date: Thu, 10 Oct 2024 16:07:52 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=92=84(mail)=20improve=20mailbox=20creati?= =?UTF-8?q?on=20email?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Remove useless icons, modify text and improve displaying. --- CHANGELOG.md | 1 + src/backend/core/static/images/messagerie.png | Bin 0 -> 1862 bytes src/backend/debug/urls.py | 6 + src/backend/debug/views.py | 14 + .../locale/fr_FR/LC_MESSAGES/django.mo | Bin 474 -> 1347 bytes .../locale/fr_FR/LC_MESSAGES/django.po | 348 +++++++++++++----- src/mail/mjml/new_mailbox.mjml | 43 +-- 7 files changed, 288 insertions(+), 124 deletions(-) create mode 100644 src/backend/core/static/images/messagerie.png diff --git a/CHANGELOG.md b/CHANGELOG.md index 1126a99..735bc9a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,6 +20,7 @@ and this project adheres to ### Fixed +- 💄(mail) improve mailbox creation email #462 - 🐛(frontend) fix update accesses form #448 - 🛂(backend) do not duplicate user when disabled diff --git a/src/backend/core/static/images/messagerie.png b/src/backend/core/static/images/messagerie.png new file mode 100644 index 0000000000000000000000000000000000000000..541b58f9d24446b4ffa0cdeb6aa73e92b175193b GIT binary patch literal 1862 zcmV-M2f6r(P)EX>4Tx04R}tkv&MmKp2MKwo0W|I@m$PAwzYtAXdatt5Adrp;lpV2qvfx%lKwC47$eU8%yAWOYU-v9@P zz*vd0*FE0d*WI^&Yuf$$0cL`7qTKgn>i_@%24YJ`L;wH)0002_L%V+f000SaNLh0L z01ejw01ejxLMWSf00007bV*G`2j~h93k)Q<^M8Z@00lxxL_t(&-tC!NY!p=-hrcsh z3YhM03pV0~oh?EFf@l#M0a1*K7$6A7I|2`iMnkEMfy#^PgWM9KT|}dpsF*-PxQHMU zgBM7n*fu~6M2)EIwvi}=?zAoiZ-B`( z1G;#@CV}TDR4?dH*eJdS4MZJ?vB^z6GatU3ydXY? z@OIcxnET-5Um_9vfTBK3GS4nxYY!g<;?uP2+Coo z2|-A4&R>V#sNg>YVsYw0M>qmZe79eNqAy_M4R*tx#yiEJs{trWFI`E;fGynz#&HPG zveRD$%GW^J#gBjiP6GoJgWPN8?C`)Wiix}k{xxxb&Chg>TmUEJY}o)cZsO)uQ6((+C}0t4^>yw&aWe&Skh6yGkO>fg68 z8A%7KRJ0|+{M;>f=30m0Tw_ACjBXhIS?|;;N*MA zEdCi|kH7K*Fv)^##5XE}zp6igCCIgKejb#!Sk1aHi+`IM54pD!&omY7H?vqNnqwg9 zf%|i9(yhQEsMu{4|4|Cx1Nn@7o5{KWEh_~W5=0dLaxhk1?m(Re{sr`TPw~@?^6kWcAsz?h()k$7r;r# zFTlSEc-F>9A6AJ~3eY8ZqWIsC$mOZ#?>wjc^$Z2Yop`oOm~PYj?I504iET0Cfp=&W zWt&;Zq}R0D?yqL?FL&Ej4+BjCIX{3_Z_TeGcM`vBPe+RV{_0yGkl)%@{BtNDeL{d1 z3wC~d{*p}Q%gfGR{#KS@{sokgGCW~%3iLY@ zVF3(`6Tq)Fuy#mzE{OJ0A}oN4RwWUy09`o(mY+jjnH8K8HG95O9 zWD|h`wA8nu-2tow&LwW1&Mu zTRo6LK>?E#l<_KBsg+;t&%9Sfuu3WitZ1E7{^^&C=4KIQ6-Qn^gxA3P@V2>3bYdiDNVB|QWm0Qo0b#u&OEy@%-B=g zlVqhH`2>}?=g3|-a!2zu5C@K&xpCp|-OY;{gs}9?Z|w2&=K1^g>sNjh7;nIC!k)pd z!G43qL6?Mh3;Y0l2W*3Hf*W89+?~&V0B>Rb98ADpzz+B;7~}p0z6)M^Nr?BsPrzfW zZGvxO{^w;O-UI&zWBeOeX8yOp8<_8bAAtoJzdr}pz+;fWKfsvh^2?^6%dFVefmayR;Ac3Sb3(QHaQKru!l6ZwWGq0v>|PV7Deo8 zld6w7DLR3E76)`7n#H2=6}XInDW1T{aV^pVmA} z|Co!+mVB|vZ(cf~C}Hb?(YmTeg;|vz)d+O}3N|vhS4fg$mZe zX-k<=jpLW`%u?z)Hrf8^YDz=*ZFeW>ZT2?K%4sjPl67kW8w49yNEG-e+^Gts%?f4v z%6Sf}kNRDC?`&U8I%Fp|OosC`qm=FqbV#;~+NnZztt+7lQ%$FSwX;IA*VP3>Ur>8- zC3zy(ojruBoFCDJbGfiXZaz%uv*pk4FW)`qe$sMm?%Z-$7wBZ5vhUgCOO*{Te47UA zBw}r<;1eZ625VW?OmcSA97j3)Pd#%~lA=>3=MY-FA>fIopy-dA$%(name)s" +msgstr "" + #: core/templates/mail/html/invitation.html:160 #: core/templates/mail/text/invitation.txt:3 msgid "La Suite Numérique" @@ -246,7 +285,7 @@ msgstr "" #: core/templates/mail/html/invitation.html:226 #: core/templates/mail/text/invitation.txt:14 msgid "" -"We are delighted to welcome you to our community on Equipes, your new " +"We are delighted to welcome you to our community on Régie, your new " "companion to simplify the management of your groups efficiently, " "intuitively, and securely." msgstr "" @@ -260,7 +299,7 @@ msgstr "" #: core/templates/mail/html/invitation.html:236 #: core/templates/mail/text/invitation.txt:16 -msgid "With Equipes, you will be able to:" +msgid "With Régie, you will be able to:" msgstr "" #: core/templates/mail/html/invitation.html:237 @@ -294,13 +333,13 @@ msgstr "" #: core/templates/mail/html/invitation.html:252 #: core/templates/mail/text/invitation.txt:23 -msgid "Visit Equipes" +msgid "Visit Régie" msgstr "" #: core/templates/mail/html/invitation.html:261 #: core/templates/mail/text/invitation.txt:25 msgid "" -"We are confident that Equipes will help you increase efficiency and " +"We are confident that Régie will help you increase efficiency and " "productivity while strengthening the bond among members." msgstr "" @@ -320,19 +359,126 @@ msgid "" msgstr "" #: core/templates/mail/html/invitation.html:278 +#: core/templates/mail/html/new_mailbox.html:272 #: core/templates/mail/text/invitation.txt:29 +#: core/templates/mail/text/new_mailbox.txt:15 msgid "Sincerely," -msgstr "" +msgstr "Cordialement," #: core/templates/mail/html/invitation.html:279 #: core/templates/mail/text/invitation.txt:31 msgid "The La Suite Numérique Team" +msgstr "L'équipe de La Suite Numérique" + +#: core/templates/mail/html/new_mailbox.html:159 +#: core/templates/mail/text/new_mailbox.txt:3 +msgid "La Messagerie" +msgstr "La Messagerie" + +#: core/templates/mail/html/new_mailbox.html:188 +#: core/templates/mail/text/new_mailbox.txt:5 +msgid "Welcome to La Messagerie" +msgstr "Bienvenue dans La Messagerie" + +#: core/templates/mail/html/new_mailbox.html:193 +#: core/templates/mail/text/new_mailbox.txt:6 +msgid "La Messagerie is the email solution of La Suite." +msgstr "La Messagerie est la solution de mail de La Suite." + +#: core/templates/mail/html/new_mailbox.html:199 +#: core/templates/mail/text/new_mailbox.txt:7 +msgid "Your mailbox has been created." +msgstr "Votre boîte mail a été créée." + +#: core/templates/mail/html/new_mailbox.html:204 +#: core/templates/mail/text/new_mailbox.txt:8 +msgid "Please find below your login info: " +msgstr "Voici vos identifiants de connexion :" + +#: core/templates/mail/html/new_mailbox.html:228 +#: core/templates/mail/text/new_mailbox.txt:10 +msgid "Email address: " +msgstr "Adresse email : " + +#: core/templates/mail/html/new_mailbox.html:233 +#: core/templates/mail/text/new_mailbox.txt:11 +msgid "Temporary password (to be modify on first login): " +msgstr "Mot de passe temporaire (à modifier à la première connexion) :" + +#: core/templates/mail/html/new_mailbox.html:261 +#: core/templates/mail/text/new_mailbox.txt:13 +msgid "Go to La Messagerie" +msgstr "Accéder à La Messagerie" + +#: core/templates/mail/html/new_mailbox.html:273 +#: core/templates/mail/text/new_mailbox.txt:17 +msgid "La Suite Team" +msgstr "L'équipe de La Suite" + +#: core/templates/mail/text/hello.txt:8 +#, python-format +msgid "This mail has been sent to %(email)s by %(name)s [%(href)s]" msgstr "" -#: people/settings.py:133 -msgid "English" +#: mailbox_manager/enums.py:12 +msgid "Viewer" +msgstr "" + +#: mailbox_manager/enums.py:21 +msgid "Enabled" +msgstr "" + +#: mailbox_manager/enums.py:22 +msgid "Failed" +msgstr "" + +#: mailbox_manager/enums.py:23 +msgid "Disabled" +msgstr "" + +#: mailbox_manager/models.py:31 +msgid "Mail domain" +msgstr "" + +#: mailbox_manager/models.py:32 +msgid "Mail domains" +msgstr "" + +#: mailbox_manager/models.py:98 +msgid "User/mail domain relation" +msgstr "" + +#: mailbox_manager/models.py:99 +msgid "User/mail domain relations" +msgstr "" + +#: mailbox_manager/models.py:171 +msgid "local_part" +msgstr "" + +#: mailbox_manager/models.py:185 +msgid "secondary email address" +msgstr "" + +#: mailbox_manager/models.py:190 +msgid "Mailbox" +msgstr "" + +#: mailbox_manager/models.py:191 +msgid "Mailboxes" +msgstr "" + +#: mailbox_manager/utils/dimail.py:137 +msgid "Your new mailbox information" msgstr "" #: people/settings.py:134 +msgid "English" +msgstr "" + +#: people/settings.py:135 msgid "French" msgstr "" + +#~ msgid "Regards," +#~ msgstr "Cordialement," diff --git a/src/mail/mjml/new_mailbox.mjml b/src/mail/mjml/new_mailbox.mjml index d94c31b..4cb07a7 100644 --- a/src/mail/mjml/new_mailbox.mjml +++ b/src/mail/mjml/new_mailbox.mjml @@ -3,39 +3,36 @@ - + - + - + - -

{{ title }}

-
- - -

{% trans "Your new mailbox is ready !" %}

-
- - - - + {% trans "Welcome to La Messagerie" %} + {% trans "La Messagerie is the email solution of La Suite." %} - {% trans "Here are your credentials for your new mailbox ! " %} - {% trans "Email address : "%}{{ mailbox_data.email }} - {% trans "Temporary password : "%}{{ mailbox_data.password }} - {% trans "You can access your mails on " %}{{ webmail_url }}. - - - {% trans "Visit La Régie" %} + {% trans "Your mailbox has been created." %} + {% trans "Please find below your login info: " %} +
+
+ + + {% trans "Email address: "%}{{ mailbox_data.email }} + {% trans "Temporary password (to be modify on first login): "%}{{ mailbox_data.password }} + + + + + + {% trans "Go to La Messagerie" %} -

{% trans "Sincerely," %}

-

{% trans "The La Suite Numérique Team" %}

+

{% trans "La Suite Team" %}