Skip to content

Commit da48bad

Browse files
tudoramarieitudoramariei
committed
fix the T&C in the form
1 parent 1901cab commit da48bad

File tree

3 files changed

+88
-36
lines changed

3 files changed

+88
-36
lines changed

‎backend/locale/en/LC_MESSAGES/django.po‎

Lines changed: 37 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: PACKAGE VERSION\n"
99
"Report-Msgid-Bugs-To: \n"
10-
"POT-Creation-Date: 2025-02-05 18:57+0200\n"
10+
"POT-Creation-Date: 2025-02-06 11:38+0200\n"
1111
"PO-Revision-Date: 2024-02-28 15:45+0000\n"
1212
"Last-Translator: Tudor Amariei <tudor.amariei@commitglobal.org>\n"
1313
"Language-Team: English <https://translate.commitglobal.org/projects/act4good/"
@@ -763,7 +763,13 @@ msgstr "Welcome to redirectioneaza.ro"
763763
msgid "Account created"
764764
msgstr "date created"
765765

766-
#: donations/views/account_management.py:295
766+
#: donations/views/account_management.py:289
767+
#, fuzzy
768+
#| msgid "date created"
769+
msgid "Account verified"
770+
msgstr "date created"
771+
772+
#: donations/views/account_management.py:300
767773
#, fuzzy
768774
#| msgid "description"
769775
msgid "Verification"
@@ -1476,6 +1482,20 @@ msgstr ""
14761482
msgid "Please check your email for a confirmation link, then log in."
14771483
msgstr ""
14781484

1485+
#: templates/v2/account/signup-verification.html:8
1486+
msgid "We have succesfully verified your account"
1487+
msgstr ""
1488+
1489+
#: templates/v2/account/signup-verification.html:12
1490+
msgid "Go to the login page to access your account."
1491+
msgstr ""
1492+
1493+
#: templates/v2/account/signup-verification.html:16
1494+
#, fuzzy
1495+
#| msgid "Return to login"
1496+
msgid "Go to login"
1497+
msgstr "Return to login"
1498+
14791499
#: templates/v2/account/snippets/cta-ngohub.html:15
14801500
msgid "Do you represent an NGO? Join NGO Hub"
14811501
msgstr ""
@@ -2095,34 +2115,35 @@ msgid ""
20952115
"projects implemented"
20962116
msgstr ""
20972117

2098-
#: templates/v2/form/redirection-open.html:166
2118+
#: templates/v2/form/redirection-open.html:167
20992119
#, python-format
21002120
msgid ""
2101-
"I agree with <a href=\"%(terms_url)s\"> the Terms of the application </a>. "
2102-
"<a href=\"%(policy_url)s\"> the Privacy Policy </a>."
2121+
"I agree with <a class=\"%(href_class)s\" href=\"%(terms_url)s\"> the Terms "
2122+
"of the application </a>. <a class=\"%(href_class)s\" "
2123+
"href=\"%(policy_url)s\"> the Privacy Policy </a>."
21032124
msgstr ""
21042125

2105-
#: templates/v2/form/redirection-open.html:183
2126+
#: templates/v2/form/redirection-open.html:185
21062127
msgid "Captcha"
21072128
msgstr ""
21082129

2109-
#: templates/v2/form/redirection-open.html:201
2130+
#: templates/v2/form/redirection-open.html:203
21102131
msgid "Confirm sending without signature modal"
21112132
msgstr ""
21122133

2113-
#: templates/v2/form/redirection-open.html:220
2134+
#: templates/v2/form/redirection-open.html:222
21142135
#, fuzzy
21152136
#| msgid "Sign In Error"
21162137
msgid "Send signed form"
21172138
msgstr "Sign In Error"
21182139

2119-
#: templates/v2/form/redirection-open.html:229
2140+
#: templates/v2/form/redirection-open.html:231
21202141
#, fuzzy
21212142
#| msgid "Login through NGO Hub"
21222143
msgid "Continue without signing"
21232144
msgstr "Login through NGO Hub"
21242145

2125-
#: templates/v2/form/redirection-open.html:239
2146+
#: templates/v2/form/redirection-open.html:241
21262147
#: templates/v3/admin/forms/action.html:25
21272148
#, fuzzy
21282149
#| msgid "Sign In Error"
@@ -2535,6 +2556,12 @@ msgstr ""
25352556
msgid "Choose the organization you want to redirect to!"
25362557
msgstr ""
25372558

2559+
#: templates/v2/public/components/home/explore.html:25
2560+
#, fuzzy
2561+
#| msgid "NGO Hub organization ID"
2562+
msgid "See all organizations"
2563+
msgstr "NGO Hub organization ID"
2564+
25382565
#: templates/v2/public/components/home/hero-search.html:28
25392566
#: templates/v2/public/components/ngo-search.html:5
25402567
msgid "Search for an NGO by its name"

‎backend/locale/ro/LC_MESSAGES/django.po‎

Lines changed: 33 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: PACKAGE VERSION\n"
99
"Report-Msgid-Bugs-To: \n"
10-
"POT-Creation-Date: 2025-02-05 18:57+0200\n"
10+
"POT-Creation-Date: 2025-02-06 11:38+0200\n"
1111
"PO-Revision-Date: 2024-03-07 11:27+0000\n"
1212
"Last-Translator: Tudor Amariei <tudor.amariei@commitglobal.org>\n"
1313
"Language-Team: Romanian <https://translate.commitglobal.org/projects/"
@@ -705,7 +705,11 @@ msgstr "Confirmare cont redirectioneaza.ro"
705705
msgid "Account created"
706706
msgstr "Cont creat"
707707

708-
#: donations/views/account_management.py:295
708+
#: donations/views/account_management.py:289
709+
msgid "Account verified"
710+
msgstr "Cont validat"
711+
712+
#: donations/views/account_management.py:300
709713
msgid "Verification"
710714
msgstr "Verificare"
711715

@@ -1383,6 +1387,18 @@ msgstr ""
13831387
"Te rugăm să verifici emailul pentru un link de confirmare, apoi te poți "
13841388
"conecta."
13851389

1390+
#: templates/v2/account/signup-verification.html:8
1391+
msgid "We have succesfully verified your account"
1392+
msgstr "Contul tău a fost validat cu succes"
1393+
1394+
#: templates/v2/account/signup-verification.html:12
1395+
msgid "Go to the login page to access your account."
1396+
msgstr "Mergi la pagina de autentificare pentru a accesa contul tău."
1397+
1398+
#: templates/v2/account/signup-verification.html:16
1399+
msgid "Go to login"
1400+
msgstr "Mergi la autentificare"
1401+
13861402
#: templates/v2/account/snippets/cta-ngohub.html:15
13871403
msgid "Do you represent an NGO? Join NGO Hub"
13881404
msgstr "Reprezinți un ONG? Alătură-te NGO Hub"
@@ -2056,32 +2072,33 @@ msgstr ""
20562072
"Sunt de acord ca acest ONG să mă contacteze pe viitor cu detalii despre "
20572073
"proiectele implementate"
20582074

2059-
#: templates/v2/form/redirection-open.html:166
2075+
#: templates/v2/form/redirection-open.html:167
20602076
#, python-format
20612077
msgid ""
2062-
"I agree with <a href=\"%(terms_url)s\"> the Terms of the application </a>. "
2063-
"<a href=\"%(policy_url)s\"> the Privacy Policy </a>."
2078+
"I agree with <a class=\"%(href_class)s\" href=\"%(terms_url)s\"> the Terms "
2079+
"of the application </a>. <a class=\"%(href_class)s\" "
2080+
"href=\"%(policy_url)s\"> the Privacy Policy </a>."
20642081
msgstr ""
2065-
"Sunt de acord cu <a href=\"%(terms_url)s\"> Termenii aplicației</a> și cu <a "
2066-
"href=\"%(policy_url)s\">Politica de confidențialitate</a>."
2082+
"Sunt de acord cu <a class=\"%(href_class)s\" href=\"%(terms_url)s\"> Termenii aplicației</a> și cu <a "
2083+
"class=\"%(href_class)s\" href=\"%(policy_url)s\">Politica de confidențialitate</a>."
20672084

2068-
#: templates/v2/form/redirection-open.html:183
2085+
#: templates/v2/form/redirection-open.html:185
20692086
msgid "Captcha"
20702087
msgstr "Captcha"
20712088

2072-
#: templates/v2/form/redirection-open.html:201
2089+
#: templates/v2/form/redirection-open.html:203
20732090
msgid "Confirm sending without signature modal"
20742091
msgstr "Modal de confirmare trimitere fără de semnătură"
20752092

2076-
#: templates/v2/form/redirection-open.html:220
2093+
#: templates/v2/form/redirection-open.html:222
20772094
msgid "Send signed form"
20782095
msgstr "Trimite formularul semnat"
20792096

2080-
#: templates/v2/form/redirection-open.html:229
2097+
#: templates/v2/form/redirection-open.html:231
20812098
msgid "Continue without signing"
20822099
msgstr "Continuă fără a semna"
20832100

2084-
#: templates/v2/form/redirection-open.html:239
2101+
#: templates/v2/form/redirection-open.html:241
20852102
#: templates/v3/admin/forms/action.html:25
20862103
msgid "Send the form"
20872104
msgstr "Trimite formularul"
@@ -2473,6 +2490,10 @@ msgstr "Explorează ONG-uri"
24732490
msgid "Choose the organization you want to redirect to!"
24742491
msgstr "Alege organizația către care vrei să redirecționezi!"
24752492

2493+
#: templates/v2/public/components/home/explore.html:25
2494+
msgid "See all organizations"
2495+
msgstr "Vezi toate organizațiile"
2496+
24762497
#: templates/v2/public/components/home/hero-search.html:28
24772498
#: templates/v2/public/components/ngo-search.html:5
24782499
msgid "Search for an NGO by its name"

‎backend/templates/v2/form/redirection-open.html‎

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -161,20 +161,24 @@ <h2 class="mb-5 text-2xl font-bold tracking-tight text-gray-900">
161161
{% include "components/input/checkbox.html" with input_id="agree_contact" input_name="agree_contact" is_required=False field=redirection_form.agree_contact %}
162162
</div>
163163

164-
{% url 'terms' as terms_url %}
165-
{% url 'policy' as policy_url %}
166-
{% blocktranslate asvar input_title trimmed %}
167-
I agree with
168-
<a href="{{ terms_url }}">
169-
the Terms of the application
170-
</a>.
171-
<a href="{{ policy_url }}">
172-
the Privacy Policy
173-
</a>.
174-
{% endblocktranslate %}
175-
<div class="flex gap-3 mt-4">
176-
{% include "components/input/checkbox.html" with input_id="agree_terms" input_name="agree_terms" is_required=True field=redirection_form.agree_terms %}
177-
</div>
164+
{% with href_class='underline text-cyan-700' %}
165+
{% url 'terms' as terms_url %}
166+
{% url 'policy' as policy_url %}
167+
168+
{% blocktranslate asvar input_title trimmed %}
169+
I agree with
170+
<a class="{{ href_class }}" href="{{ terms_url }}">
171+
the Terms of the application
172+
</a>.
173+
<a class="{{ href_class }}" href="{{ policy_url }}">
174+
the Privacy Policy
175+
</a>.
176+
{% endblocktranslate %}
177+
178+
<div class="flex gap-3 mt-4">
179+
{% include "components/input/checkbox.html" with input_id="agree_terms" input_name="agree_terms" is_required=True field=redirection_form.agree_terms %}
180+
</div>
181+
{% endwith %}
178182

179183
</fieldset>
180184

0 commit comments

Comments
 (0)