Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions backend/donations/forms/ngo_account.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import utils.constants.memory
from donations.common.validation.validate_slug import NgoSlugValidator
from donations.models.byof import OwnFormsUpload
from donations.models.ngos import Cause, CauseVisibilityChoices, Ngo, ngo_slug_validator
from donations.models.ngos import Cause, Ngo, ngo_slug_validator
from utils.text.phone_number import validate_phone_number


Expand Down Expand Up @@ -132,7 +132,6 @@ def save(self, commit=True):

if self.for_main_cause:
cause.is_main = True
cause.visibility = CauseVisibilityChoices.PUBLIC

if commit:
cause.save()
Expand Down
30 changes: 19 additions & 11 deletions backend/locale/en/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2025-12-18 13:43+0200\n"
"POT-Creation-Date: 2026-01-08 13:23+0200\n"
"PO-Revision-Date: 2025-03-27 14:48+0000\n"
"Last-Translator: Andrei Ioniță <andrei.ionita@commitglobal.org>\n"
"Language-Team: English <https://translate.commitglobal.org/projects/act4good/"
Expand Down Expand Up @@ -296,7 +296,7 @@ msgstr "Remove prefilled forms"
msgid "Email is required"
msgstr "Email is required"

#: donations/forms/account.py:26 donations/forms/common.py:32
#: donations/forms/account.py:26 donations/forms/common.py:30
msgid "Password is required"
msgstr "Password is required"

Expand Down Expand Up @@ -3192,7 +3192,7 @@ msgid ""
msgstr ""

#: templates/v2/ngo-account/banners/form-emails-banner.html:19
#: templates/v2/ngo-account/cause/form.html:147
#: templates/v2/ngo-account/cause/form.html:148
msgid "Allow users to sign the form online"
msgstr "Allow users to sign the form online"

Expand Down Expand Up @@ -3234,7 +3234,7 @@ msgid "Your organization is not receiving notifications for signed forms."
msgstr ""

#: templates/v2/ngo-account/banners/form-notifications-banner.html:6
#: templates/v2/ngo-account/cause/form.html:181
#: templates/v2/ngo-account/cause/form.html:182
msgid "Receive notifications for each signed form"
msgstr ""

Expand Down Expand Up @@ -3382,7 +3382,7 @@ msgstr "Form description"

#: templates/v2/ngo-account/cause/form.html:110
msgid ""
"From this section, you can manage the form's URL, its visibility and online "
"From this section, you can manage the form's URL, its visibility, and online "
"signing."
msgstr ""

Expand All @@ -3399,11 +3399,19 @@ msgid ""
"can only contain letters, numbers, and hyphens. Example: cause-form."
msgstr ""

#: templates/v2/ngo-account/cause/form.html:135
#: templates/v2/ngo-account/cause/form.html:131
msgid "Form visibility"
msgstr ""

#: templates/v2/ngo-account/cause/form.html:149
#: templates/v2/ngo-account/cause/form.html:133
msgid ""
"Choose who can see and access your form. Select \"Public\" to make it "
"accessible to everyone, \"Unlisted\" to not appear in search results but "
"still accessible via a direct link, or \"Private\" to restrict access only "
"to you."
msgstr ""

#: templates/v2/ngo-account/cause/form.html:150
#, fuzzy
#| msgid ""
#| "By selecting this option, I confirm that the NGO has the SPV account "
Expand All @@ -3416,23 +3424,23 @@ msgstr ""
"By selecting this option, I confirm that the NGO has the SPV account that's "
"necessary to submit the forms"

#: templates/v2/ngo-account/cause/form.html:160
#: templates/v2/ngo-account/cause/form.html:161
#, fuzzy
#| msgid "Form description"
msgid "Form notifications"
msgstr "Form description"

#: templates/v2/ngo-account/cause/form.html:162
#: templates/v2/ngo-account/cause/form.html:163
msgid "From this section, you can manage the form's email notifications."
msgstr ""

#: templates/v2/ngo-account/cause/form.html:183
#: templates/v2/ngo-account/cause/form.html:184
msgid ""
"By selecting this option, you activate email notifications to be informed "
"each time someone fills out the form."
msgstr ""

#: templates/v2/ngo-account/cause/form.html:193
#: templates/v2/ngo-account/cause/form.html:194
#, fuzzy
#| msgid "email address"
msgid "Notifications e-mail address"
Expand Down
30 changes: 19 additions & 11 deletions backend/locale/hy/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2025-12-18 13:43+0200\n"
"POT-Creation-Date: 2026-01-08 13:23+0200\n"
"PO-Revision-Date: 2025-02-12 12:44+0000\n"
"Last-Translator: Weblate <noreply-mt-weblate@weblate.org>\n"
"Language-Team: Armenian <https://translate.commitglobal.org/projects/"
Expand Down Expand Up @@ -294,7 +294,7 @@ msgstr "Մուտք գործելու սխալ"
msgid "Email is required"
msgstr "Էլ. փոստը պարտադիր է"

#: donations/forms/account.py:26 donations/forms/common.py:32
#: donations/forms/account.py:26 donations/forms/common.py:30
msgid "Password is required"
msgstr "Գաղտնաբառը պարտադիր է"

Expand Down Expand Up @@ -3283,7 +3283,7 @@ msgid ""
msgstr ""

#: templates/v2/ngo-account/banners/form-emails-banner.html:19
#: templates/v2/ngo-account/cause/form.html:147
#: templates/v2/ngo-account/cause/form.html:148
msgid "Allow users to sign the form online"
msgstr ""

Expand Down Expand Up @@ -3324,7 +3324,7 @@ msgid "Your organization is not receiving notifications for signed forms."
msgstr ""

#: templates/v2/ngo-account/banners/form-notifications-banner.html:6
#: templates/v2/ngo-account/cause/form.html:181
#: templates/v2/ngo-account/cause/form.html:182
msgid "Receive notifications for each signed form"
msgstr ""

Expand Down Expand Up @@ -3472,7 +3472,7 @@ msgstr "նկարագրություն"

#: templates/v2/ngo-account/cause/form.html:110
msgid ""
"From this section, you can manage the form's URL, its visibility and online "
"From this section, you can manage the form's URL, its visibility, and online "
"signing."
msgstr ""

Expand All @@ -3489,34 +3489,42 @@ msgid ""
"can only contain letters, numbers, and hyphens. Example: cause-form."
msgstr ""

#: templates/v2/ngo-account/cause/form.html:135
#: templates/v2/ngo-account/cause/form.html:131
msgid "Form visibility"
msgstr ""

#: templates/v2/ngo-account/cause/form.html:149
#: templates/v2/ngo-account/cause/form.html:133
msgid ""
"Choose who can see and access your form. Select \"Public\" to make it "
"accessible to everyone, \"Unlisted\" to not appear in search results but "
"still accessible via a direct link, or \"Private\" to restrict access only "
"to you."
msgstr ""

#: templates/v2/ngo-account/cause/form.html:150
msgid ""
"By selecting this option, I confirm that I have ensured that my organization "
"has an SPV account, necessary for submitting the forms completed with online "
"signature."
msgstr ""

#: templates/v2/ngo-account/cause/form.html:160
#: templates/v2/ngo-account/cause/form.html:161
#, fuzzy
#| msgid "NGO Hub organization ID"
msgid "Form notifications"
msgstr "NGO Hub կազմակերպության նույնականացման համար"

#: templates/v2/ngo-account/cause/form.html:162
#: templates/v2/ngo-account/cause/form.html:163
msgid "From this section, you can manage the form's email notifications."
msgstr ""

#: templates/v2/ngo-account/cause/form.html:183
#: templates/v2/ngo-account/cause/form.html:184
msgid ""
"By selecting this option, you activate email notifications to be informed "
"each time someone fills out the form."
msgstr ""

#: templates/v2/ngo-account/cause/form.html:193
#: templates/v2/ngo-account/cause/form.html:194
#, fuzzy
#| msgid "email address"
msgid "Notifications e-mail address"
Expand Down
34 changes: 23 additions & 11 deletions backend/locale/ro/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2025-12-18 13:43+0200\n"
"POT-Creation-Date: 2026-01-08 13:23+0200\n"
"PO-Revision-Date: 2025-03-27 14:49+0000\n"
"Last-Translator: Tudor Amariei <tudor.amariei@commitglobal.org>\n"
"Language-Team: Romanian <https://translate.commitglobal.org/projects/"
Expand Down Expand Up @@ -289,7 +289,7 @@ msgstr "Elimină formularele pre-completate"
msgid "Email is required"
msgstr "Adresa de email este obligatorie"

#: donations/forms/account.py:26 donations/forms/common.py:32
#: donations/forms/account.py:26 donations/forms/common.py:30
msgid "Password is required"
msgstr "Parola este obligatorie"

Expand Down Expand Up @@ -3058,7 +3058,7 @@ msgstr ""
"redirecționare."

#: templates/v2/ngo-account/banners/form-emails-banner.html:19
#: templates/v2/ngo-account/cause/form.html:147
#: templates/v2/ngo-account/cause/form.html:148
msgid "Allow users to sign the form online"
msgstr ""
"Permit contribuabililor să semneze online formularul de redirecționare "
Expand Down Expand Up @@ -3107,7 +3107,7 @@ msgid "Your organization is not receiving notifications for signed forms."
msgstr "Organizația ta nu primește notificări pentru formularele semnate."

#: templates/v2/ngo-account/banners/form-notifications-banner.html:6
#: templates/v2/ngo-account/cause/form.html:181
#: templates/v2/ngo-account/cause/form.html:182
msgid "Receive notifications for each signed form"
msgstr "Primește notificări pentru fiecare formular semnat"

Expand Down Expand Up @@ -3251,7 +3251,7 @@ msgstr "Setări formular"

#: templates/v2/ngo-account/cause/form.html:110
msgid ""
"From this section, you can manage the form's URL, its visibility and online "
"From this section, you can manage the form's URL, its visibility, and online "
"signing."
msgstr ""
"Din această secțiune poți gestiona URL-ul formularului, vizibilitatea sa și "
Expand All @@ -3271,11 +3271,23 @@ msgstr ""
"ul redirectioneaza.ro. Poate conține doar litere, cifre și cratime. Exemplu: "
"formular-cauza."

#: templates/v2/ngo-account/cause/form.html:135
#: templates/v2/ngo-account/cause/form.html:131
msgid "Form visibility"
msgstr "Vizibilitate formular"

#: templates/v2/ngo-account/cause/form.html:149
#: templates/v2/ngo-account/cause/form.html:133
msgid ""
"Choose who can see and access your form. Select \"Public\" to make it "
"accessible to everyone, \"Unlisted\" to not appear in search results but "
"still accessible via a direct link, or \"Private\" to restrict access only "
"to you."
msgstr ""
"Alege cine poate vedea și accesa formularul tău. Selectează „Public” pentru a "
"îl face accesibil tuturor, „Nelistat” pentru a nu apărea în rezultatele de "
"căutare, dar totuși accesibil printr-un link direct, sau „Privat” pentru a "
"restricționa accesul doar pentru tine."

#: templates/v2/ngo-account/cause/form.html:150
msgid ""
"By selecting this option, I confirm that I have ensured that my organization "
"has an SPV account, necessary for submitting the forms completed with online "
Expand All @@ -3285,15 +3297,15 @@ msgstr ""
"are un cont SPV, necesar pentru a depune formularele completate cu semnătură "
"online."

#: templates/v2/ngo-account/cause/form.html:160
#: templates/v2/ngo-account/cause/form.html:161
msgid "Form notifications"
msgstr "Notificări formular"

#: templates/v2/ngo-account/cause/form.html:162
#: templates/v2/ngo-account/cause/form.html:163
msgid "From this section, you can manage the form's email notifications."
msgstr "Din această secțiune poți gestiona notificările prin email."

#: templates/v2/ngo-account/cause/form.html:183
#: templates/v2/ngo-account/cause/form.html:184
msgid ""
"By selecting this option, you activate email notifications to be informed "
"each time someone fills out the form."
Expand All @@ -3302,7 +3314,7 @@ msgstr ""
"semnat. Fără această bifă vei putea vedea formularele noi doar dacă te "
"conectezi în contul organizației."

#: templates/v2/ngo-account/cause/form.html:193
#: templates/v2/ngo-account/cause/form.html:194
msgid "Notifications e-mail address"
msgstr "Adresa de email pentru notificări"

Expand Down
19 changes: 10 additions & 9 deletions backend/templates/v2/ngo-account/cause/form.html
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@
{% blocktrans trimmed asvar form_settings_info_tooltip %}
From this section, you can manage
the form's URL,
its visibility
its visibility,
and online signing.
{% endblocktrans %}
{% include "components/form/legend.html" with legend_title=form_settings_legend_title info_tooltip=form_settings_info_tooltip %}
Expand All @@ -127,15 +127,16 @@
{% include "components/input/input.html" with input_id="slug" input_type="text" input_name="slug" is_required=True value=cause.slug field=django_form.slug max_length=150 placeholder="url-formular" help_text=slug_helptext %}


{% if is_main_cause %}
<input type="hidden" name="visibility" value="pub">
<input type="hidden" name="is_main" value=True>
{% else %}
{% if not form_visibility_input_title %}
{% trans "Form visibility" as form_visibility_input_title %}
{% endif %}
{% include "components/input/select.html" with input_title=form_visibility_input_title input_id="visibility" input_name="visibility" current_value=cause.visibility field=django_form.visibility options=visibility_choices is_required=True %}
{% if not form_visibility_input_title %}
{% trans "Form visibility" as form_visibility_input_title %}
{% endif %}
{% blocktrans trimmed asvar visibility_helptext %}
Choose who can see and access your form.
Select "Public" to make it accessible to everyone,
"Unlisted" to not appear in search results but still accessible via a direct link,
or "Private" to restrict access only to you.
{% endblocktrans %}
{% include "components/input/select.html" with input_title=form_visibility_input_title help_text=visibility_helptext input_id="visibility" input_name="visibility" current_value=cause.visibility field=django_form.visibility options=visibility_choices is_required=True include_default_option=True %}

</div>

Expand Down