update e-mails

Author: tudoramariei

backend/donations/views/redirections.py

@@ -268,6 +268,8 @@ def post(self, request, ngo_url):
                 {
                     "ngo_address": ngo_address,
                     "ngo_email": ngo.email,
+                    "month_limit": settings.DONATIONS_LIMIT_MONTH_NAME,
+                    "limit": settings.DONATIONS_LIMIT,
                 }
             )
             send_email(

backend/locale/en/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-02-05 13:25+0200\n"
+"POT-Creation-Date: 2025-02-05 18:28+0200\n"
 "PO-Revision-Date: 2024-02-28 15:45+0000\n"
 "Last-Translator: Tudor Amariei <tudor.amariei@commitglobal.org>\n"
 "Language-Team: English <https://translate.commitglobal.org/projects/act4good/"
@@ -256,7 +256,7 @@ msgid "Is accepting forms"
 msgstr "is accepting forms"
 
 #: donations/forms/ngo_account.py:13 donations/models/ngos.py:105
-#: templates/v2/emails/donor/redirection-sans-signature/main.txt:25
+#: templates/v2/emails/donor/redirection-sans-signature/main.txt:26
 #: templates/v2/ngo-account/my-organization/ngo-presentation.html:75
 #: templates/v2/ngo-account/redirections/list-header.html:8
 msgid "Name"
@@ -298,7 +298,7 @@ msgid "Display phone"
 msgstr "display ordering"
 
 #: donations/forms/ngo_account.py:24
-#: templates/v2/emails/donor/redirection-sans-signature/main.txt:26
+#: templates/v2/emails/donor/redirection-sans-signature/main.txt:27
 #, fuzzy
 #| msgid "address"
 msgid "Address"
@@ -334,18 +334,18 @@ msgstr "Your current role isn't supported."
 msgid "The logo size is too large."
 msgstr ""
 
-#: donations/forms/ngo_account.py:77
+#: donations/forms/ngo_account.py:80
 msgid "Slug"
 msgstr ""
 
-#: donations/forms/ngo_account.py:78
+#: donations/forms/ngo_account.py:81
 #: templates/v2/form/redirection-header.html:65
 #, fuzzy
 #| msgid "description"
 msgid "Description"
 msgstr "description"
 
-#: donations/forms/ngo_account.py:79
+#: donations/forms/ngo_account.py:82
 msgid "IBAN"
 msgstr ""
 
@@ -375,7 +375,7 @@ msgstr "initial"
 
 #: donations/forms/redirection.py:18
 #: templates/v2/account/snippets/register-form.html:66
-#: templates/v2/emails/donor/redirection-sans-signature/main.txt:27
+#: templates/v2/emails/donor/redirection-sans-signature/main.txt:28
 #: templates/v2/form/redirection-open.html:58
 #, fuzzy
 #| msgid "email"
@@ -526,7 +526,7 @@ msgid "PDF file"
 msgstr "PDF file"
 
 #: donations/models/donors.py:126 donations/models/jobs.py:52
-#: donations/models/ngos.py:215 partners/models.py:54 users/models.py:84
+#: donations/models/ngos.py:215 partners/models.py:54 users/models.py:86
 msgid "date created"
 msgstr "date created"
 
@@ -667,7 +667,7 @@ msgstr "form with prefilled ngo data"
 msgid "Filename cache"
 msgstr "Filename cache"
 
-#: donations/models/ngos.py:216 partners/models.py:55 users/models.py:85
+#: donations/models/ngos.py:216 partners/models.py:55 users/models.py:87
 msgid "date updated"
 msgstr "date updated"
 
@@ -959,11 +959,11 @@ msgstr ""
 msgid "Successful redirection"
 msgstr "Successful tasks"
 
-#: donations/views/redirections.py:246
+#: donations/views/redirections.py:247
 msgid "Un nou formular de redirecționare"
 msgstr "Un nou formular de redirecționare"
 
-#: donations/views/redirections.py:253 donations/views/redirections.py:274
+#: donations/views/redirections.py:254 donations/views/redirections.py:276
 msgid "Formularul tău de redirecționare"
 msgstr "Formularul tău de redirecționare"
 
@@ -1103,7 +1103,7 @@ msgstr "has custom note"
 msgid "display ordering"
 msgstr "display ordering"
 
-#: redirectioneaza/common/messaging.py:45
+#: redirectioneaza/common/messaging.py:46
 msgid "Invalid email send method. Must be 'async' or 'sync'."
 msgstr "Invalid email send method. Must be 'async' or 'sync'."
 
@@ -1362,7 +1362,7 @@ msgstr ""
 msgid "Donation exports"
 msgstr "Donation exports"
 
-#: redirectioneaza/settings/unfold.py:79 users/models.py:168
+#: redirectioneaza/settings/unfold.py:79 users/models.py:170
 msgid "Groups"
 msgstr "Groups"
 
@@ -1799,6 +1799,62 @@ msgstr ""
 msgid "Redirecționează logo"
 msgstr "Welcome to redirectioneaza.ro"
 
+#: templates/v2/emails/components/extra-hand.html:4
+#: templates/v2/emails/components/extra-hand.txt:3
+msgid "Do you want to give an extra helping hand?"
+msgstr ""
+
+#: templates/v2/emails/components/extra-hand.html:8
+#: templates/v2/emails/components/extra-hand.txt:5
+msgid ""
+"If you want to be a true civic superhero, you can help the organization "
+"collect more forms! Here's how:"
+msgstr ""
+
+#: templates/v2/emails/components/extra-hand.html:17
+#, python-format
+msgid ""
+"Share the <a href=\"%(ngo_url)s\">organization's page</a> on social networks "
+"and encourage your friends to complete the form online for the organization "
+"you believe in, simply and safely, on redirectioneaza.ro."
+msgstr ""
+
+#: templates/v2/emails/components/extra-hand.html:27
+#, python-format
+msgid ""
+"Download the form 230 template for <a href=\"%(ngo_url)s\">%(ngo_name)s</a>, "
+"print multiple copies and convince your colleagues, friends or family to "
+"complete it."
+msgstr ""
+
+#: templates/v2/emails/components/extra-hand.txt:10
+msgid ""
+"Share the organization's page on social networks and encourage your friends "
+"to complete the form online for the organization you believe in, simply and "
+"safely, on redirectioneaza.ro."
+msgstr ""
+
+#: templates/v2/emails/components/extra-hand.txt:19
+#, python-format
+msgid ""
+"Download the form 230 template for %(ngo_name)s, print multiple copies and "
+"convince your colleagues, friends or family to complete it."
+msgstr ""
+
+#: templates/v2/emails/components/misdelivered.html:4
+#, python-format
+msgid ""
+"Did you receive this email by mistake? Please let us know at <a "
+"href=\"mailto:%(contact_email)s\">%(contact_email)s</a>."
+msgstr ""
+
+#: templates/v2/emails/components/misdelivered.txt:3
+#, python-format
+msgid ""
+"Did you receive this email by mistake? Please let us know at "
+"%(contact_email)s."
+msgstr ""
+
 #: templates/v2/emails/components/subcopy.html:6
 #, python-format
 msgid ""
@@ -1838,70 +1894,58 @@ msgstr ""
 #: templates/v2/emails/donor/redirection-sans-signature/main.html:26
 #: templates/v2/emails/donor/redirection-sans-signature/main.txt:15
 msgid ""
-"To complete the redirection, print and sign the form, then send it by "
-"courier or mail to the NGO's address, and they will take care of the "
-"submission, or you can hand it over personally to a representative of the "
-"organization."
+"To complete the redirection, all you need to do is print the form, sign it, "
+"and then choose one of the following options:"
 msgstr ""
 
-#: templates/v2/emails/donor/redirection-sans-signature/main.html:36
-#: templates/v2/emails/donor/redirection-sans-signature/main.txt:23
-#, fuzzy
-#| msgid "NGO Hub organization ID"
-msgid "The organization's contact info"
-msgstr "NGO Hub organization ID"
+#: templates/v2/emails/donor/redirection-sans-signature/main.html:33
+#: templates/v2/emails/donor/redirection-sans-signature/main.txt:20
+msgid ""
+"Send it to the beneficiary NGO, which will then take care of submitting it "
+"to ANAF."
+msgstr ""
 
-#: templates/v2/emails/donor/redirection-sans-signature/main.html:39
+#: templates/v2/emails/donor/redirection-sans-signature/main.html:36
 #, python-format
 msgid ""
-"<dl> <div> <dt>Name:</dt> <dd>%(ngo_name)s</dd> </div> <div> <dt>Address:</"
-"dt> <dd>%(ngo_address)s</dd> </div> <div> <dt>Email:</dt> <dd><a "
-"href=\"mailto:%(ngo_email)s\">%(ngo_email)s</a></dd> </div> </dl>"
+"Send it or submit it directly to the tax office (ANAF) in the area where you "
+"are domiciled, until <strong>%(limit.day)s %(month_limit)s %(limit.year)s</"
+"strong>."
 msgstr ""
 
-#: templates/v2/emails/donor/redirection-sans-signature/main.html:61
-#: templates/v2/emails/donor/redirection-sans-signature/main.txt:29
-#: templates/v2/emails/donor/redirection-with-signature/main.html:24
-#: templates/v2/emails/donor/redirection-with-signature/main.txt:15
-msgid "Do you want to give an extra helping hand?"
+#: templates/v2/emails/donor/redirection-sans-signature/main.html:44
+msgid ""
+"If you want a simpler option, you can always return to redirectioneaza.ro to "
+"complete the form again and sign it online, in which case it will go "
+"directly to the organization in digital format."
 msgstr ""
 
-#: templates/v2/emails/donor/redirection-sans-signature/main.html:65
-#: templates/v2/emails/donor/redirection-sans-signature/main.txt:31
-#: templates/v2/emails/donor/redirection-with-signature/main.html:28
-#: templates/v2/emails/donor/redirection-with-signature/main.txt:17
+#: templates/v2/emails/donor/redirection-sans-signature/main.html:50
+#, python-format
 msgid ""
-"If you want to be a true civic superhero, you can help the organization "
-"collect more forms! Here's how:"
+"<dl> <div> <dt>Name:</dt> <dd>%(ngo_name)s</dd> </div> <div> <dt>Address:</"
+"dt> <dd>%(ngo_address)s</dd> </div> <div> <dt>Email:</dt> <dd><a "
+"href=\"mailto:%(ngo_email)s\">%(ngo_email)s</a></dd> </div> </dl>"
 msgstr ""
 
 #: templates/v2/emails/donor/redirection-sans-signature/main.html:74
-#: templates/v2/emails/donor/redirection-sans-signature/main.txt:37
-#: templates/v2/emails/donor/redirection-with-signature/main.html:37
-#: templates/v2/emails/donor/redirection-with-signature/main.txt:23
-#, python-format
-msgid ""
-"Share the <a href=\"%(ngo_url)s\">organization's page</a> on social networks "
-"and encourage your friends to complete the form online for the organization "
-"you believe in, simply and safely, on redirectioneaza.ro."
+#: templates/v2/emails/donor/redirection-sans-signature/main.txt:32
+#: templates/v2/emails/donor/redirection-with-signature/main.html:26
+#: templates/v2/emails/donor/redirection-with-signature/main.txt:16
+msgid "Thank you for your involvement!"
 msgstr ""
 
-#: templates/v2/emails/donor/redirection-sans-signature/main.html:84
-#: templates/v2/emails/donor/redirection-sans-signature/main.txt:46
-#: templates/v2/emails/donor/redirection-with-signature/main.html:47
-#: templates/v2/emails/donor/redirection-with-signature/main.txt:32
-#, python-format
+#: templates/v2/emails/donor/redirection-sans-signature/main.txt:21
 msgid ""
-"Download the form 230 template for %(ngo_name)s, print multiple copies and "
-"convince your colleagues, friends or family to complete it."
+"Send it or submit it directly to the tax office (ANAF) in the area where you "
+"are domiciled, until {{ limit.day }} {{ month_limit }} {{ limit.year }}."
 msgstr ""
 
-#: templates/v2/emails/donor/redirection-sans-signature/main.html:93
-#: templates/v2/emails/donor/redirection-sans-signature/main.txt:52
-#: templates/v2/emails/donor/redirection-with-signature/main.html:56
-#: templates/v2/emails/donor/redirection-with-signature/main.txt:38
-msgid "Thank you for your involvement!"
-msgstr ""
+#: templates/v2/emails/donor/redirection-sans-signature/main.txt:24
+#, fuzzy
+#| msgid "NGO Hub organization ID"
+msgid "The organization's contact info"
+msgstr "NGO Hub organization ID"
 
 #: templates/v2/emails/donor/redirection-with-signature/main.html:6
 #: templates/v2/emails/donor/redirection-with-signature/main.txt:3
@@ -2650,13 +2694,14 @@ msgstr "validation token"
 msgid "validation token timestamp"
 msgstr "validation token timestamp"
 
-#: users/models.py:167
+#: users/models.py:84
+msgid "old password"
+msgstr "old password"
+
+#: users/models.py:169
 msgid "Group"
 msgstr "Group"
 
-#~ msgid "old password"
-#~ msgstr "old password"
-
 #, fuzzy
 #~| msgid "The IBAN number must have 24 characters"
 #~ msgid "IBAN must have 24 characters"