Skip to content

Commit

Permalink
Update the methodology
Browse files Browse the repository at this point in the history
- mark the current one as WiP
- add the previous methodologies
  • Loading branch information
tudoramariei committed Oct 17, 2024
1 parent 68dd9a1 commit 4a725b4
Show file tree
Hide file tree
Showing 7 changed files with 888 additions and 611 deletions.
5 changes: 5 additions & 0 deletions backend/civil_society_vote/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,11 @@
StaticPageView.as_view(template_name=f"hub/{settings.CURRENT_EDITION_TYPE}/methodology.html"),
name="methodology",
),
path(
_("old-methodology/"),
StaticPageView.as_view(template_name=f"hub/{settings.CURRENT_EDITION_TYPE}/old-methodology.html"),
name="old-methodology",
),
path(
_("terms/"),
StaticPageView.as_view(template_name="hub/terms_and_conditions.html"),
Expand Down
439 changes: 172 additions & 267 deletions backend/hub/templates/hub/ce/methodology.html

Large diffs are not rendered by default.

311 changes: 10 additions & 301 deletions backend/hub/templates/hub/ces/methodology.html

Large diffs are not rendered by default.

642 changes: 642 additions & 0 deletions backend/hub/templates/hub/ces/old-methodology.html

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion backend/hub/templates/hub/footer.html
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ <h4 class="pb-3">
<ul id="footer-links">
<li><a href="{% url 'about' %}">{% trans "About VotONG" %}</a></li>
<li><a href="{% url 'platform_rules' %}">{% trans "Platform rules" %}</a></li>
<li><a href="{% url 'methodology' %}">{% trans "Methodology" %}</a></li>
<li><a href="{% url 'methodology' %}">{% trans "Methodology" %} ({% trans "soon" %})</a></li>
<li><a href="{% url 'cookies' %}">{% trans "Privacy policy" %}</a></li>
<li><a href="{% url 'terms' %}">{% trans "Terms and conditions" %}</a></li>
{% if not request.user.is_authenticated %}
Expand Down
50 changes: 29 additions & 21 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: 2024-10-17 14:35+0300\n"
"POT-Creation-Date: 2024-10-17 15:40+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand Down Expand Up @@ -275,70 +275,74 @@ msgid "methodology/"
msgstr ""

#: civil_society_vote/urls.py:25
msgid "terms/"
msgid "old-methodology/"
msgstr ""

#: civil_society_vote/urls.py:30
msgid "committee_public_statement/"
msgid "terms/"
msgstr ""

#: civil_society_vote/urls.py:35
msgid "committee_public_statement/"
msgstr ""

#: civil_society_vote/urls.py:40
msgid "platform_rules/"
msgstr ""

#: civil_society_vote/urls.py:36
#: civil_society_vote/urls.py:41
msgid "history/"
msgstr ""

#: civil_society_vote/urls.py:48
#: civil_society_vote/urls.py:53
msgid "accounts/error/registration-closed/"
msgstr ""

#: civil_society_vote/urls.py:53
#: civil_society_vote/urls.py:58
msgid "accounts/error/duplicate-organization/"
msgstr ""

#: civil_society_vote/urls.py:58
#: civil_society_vote/urls.py:63
msgid "accounts/error/missing-organization/"
msgstr ""

#: civil_society_vote/urls.py:63
#: civil_society_vote/urls.py:68
msgid "accounts/error/missing-application/"
msgstr ""

#: civil_society_vote/urls.py:68
#: civil_society_vote/urls.py:73
msgid "accounts/error/unkown-user-role/"
msgstr ""

#: civil_society_vote/urls.py:73
#: civil_society_vote/urls.py:78
msgid "accounts/error/user-role/"
msgstr ""

#: civil_society_vote/urls.py:77
#: civil_society_vote/urls.py:82
msgid "accounts/"
msgstr ""

#: civil_society_vote/urls.py:79
#: civil_society_vote/urls.py:84
msgid "accounts/reset-password/"
msgstr ""

#: civil_society_vote/urls.py:87
#: civil_society_vote/urls.py:92
msgid "accounts/reset-password/done/"
msgstr ""

#: civil_society_vote/urls.py:92
#: civil_society_vote/urls.py:97
msgid "accounts/reset-password/<uidb64>/<token>/"
msgstr ""

#: civil_society_vote/urls.py:97
#: civil_society_vote/urls.py:102
msgid "accounts/set-password/<uidb64>/<token>/"
msgstr ""

#: civil_society_vote/urls.py:102
#: civil_society_vote/urls.py:107
msgid "accounts/reset-password/complete/"
msgstr ""

#: civil_society_vote/urls.py:107
#: civil_society_vote/urls.py:112
msgid "authentication/"
msgstr ""

Expand Down Expand Up @@ -636,8 +640,8 @@ msgstr ""
msgid "Blog posts"
msgstr ""

#: hub/models.py:163 hub/templates/hub/home.html:288
#: hub/templates/hub/home.html:289
#: hub/models.py:163 hub/templates/hub/home.html:289
#: hub/templates/hub/home.html:290
msgid "Name"
msgstr ""

Expand Down Expand Up @@ -1157,6 +1161,10 @@ msgstr ""
msgid "Methodology"
msgstr ""

#: hub/templates/hub/footer.html:37
msgid "soon"
msgstr ""

#: hub/templates/hub/footer.html:38
msgid "Privacy policy"
msgstr ""
Expand Down Expand Up @@ -1218,12 +1226,12 @@ msgstr ""
msgid "Login"
msgstr ""

#: hub/templates/hub/home.html:304 hub/templates/hub/home.html:305
#: hub/templates/hub/home.html:305 hub/templates/hub/home.html:306
#: hub/templates/registration/login.html:49
msgid "Email"
msgstr ""

#: hub/templates/hub/home.html:319 hub/templates/hub/home.html:320
#: hub/templates/hub/home.html:320 hub/templates/hub/home.html:321
msgid "Message"
msgstr ""

Expand Down
50 changes: 29 additions & 21 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: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-10-17 14:35+0300\n"
"POT-Creation-Date: 2024-10-17 15:40+0300\n"
"PO-Revision-Date: 2020-04-23 17:54+0300\n"
"Last-Translator: \n"
"Language-Team: \n"
Expand Down Expand Up @@ -286,70 +286,74 @@ msgid "methodology/"
msgstr "metodologie/"

#: civil_society_vote/urls.py:25
msgid "old-methodology/"
msgstr "metodologie-arhiva/"

#: civil_society_vote/urls.py:30
msgid "terms/"
msgstr "termeni/"

#: civil_society_vote/urls.py:30
#: civil_society_vote/urls.py:35
msgid "committee_public_statement/"
msgstr "declaratie_publica_comitet/"

#: civil_society_vote/urls.py:35
#: civil_society_vote/urls.py:40
msgid "platform_rules/"
msgstr "regulamentul_platformei/"

#: civil_society_vote/urls.py:36
#: civil_society_vote/urls.py:41
msgid "history/"
msgstr "istoric/"

#: civil_society_vote/urls.py:48
#: civil_society_vote/urls.py:53
msgid "accounts/error/registration-closed/"
msgstr "cont/eroare/inregistrare-inchisa/"

#: civil_society_vote/urls.py:53
#: civil_society_vote/urls.py:58
msgid "accounts/error/duplicate-organization/"
msgstr "cont/eroare/organizatie-duplicat/"

#: civil_society_vote/urls.py:58
#: civil_society_vote/urls.py:63
msgid "accounts/error/missing-organization/"
msgstr "cont/eroare/organizatie-lipsa/"

#: civil_society_vote/urls.py:63
#: civil_society_vote/urls.py:68
msgid "accounts/error/missing-application/"
msgstr "cont/eroare/aplicatie-lipsa/"

#: civil_society_vote/urls.py:68
#: civil_society_vote/urls.py:73
msgid "accounts/error/unkown-user-role/"
msgstr "cont/eroare/utilizator-rol-necunoscut/"

#: civil_society_vote/urls.py:73
#: civil_society_vote/urls.py:78
msgid "accounts/error/user-role/"
msgstr "cont/eroare/rol-utilizator/"

#: civil_society_vote/urls.py:77
#: civil_society_vote/urls.py:82
msgid "accounts/"
msgstr "cont/"

#: civil_society_vote/urls.py:79
#: civil_society_vote/urls.py:84
msgid "accounts/reset-password/"
msgstr "cont/reseteaza-parola/"

#: civil_society_vote/urls.py:87
#: civil_society_vote/urls.py:92
msgid "accounts/reset-password/done/"
msgstr "cont/reseteaza-parola/gata/"

#: civil_society_vote/urls.py:92
#: civil_society_vote/urls.py:97
msgid "accounts/reset-password/<uidb64>/<token>/"
msgstr "cont/reseteaza-parola/<uidb64>/<token>/"

#: civil_society_vote/urls.py:97
#: civil_society_vote/urls.py:102
msgid "accounts/set-password/<uidb64>/<token>/"
msgstr "cont/seteaza-parola/<uidb64>/<token>/"

#: civil_society_vote/urls.py:102
#: civil_society_vote/urls.py:107
msgid "accounts/reset-password/complete/"
msgstr "cont/reseteaza-parola/complet/"

#: civil_society_vote/urls.py:107
#: civil_society_vote/urls.py:112
msgid "authentication/"
msgstr "autentificare/"

Expand Down Expand Up @@ -660,8 +664,8 @@ msgstr "Articol blog"
msgid "Blog posts"
msgstr "Articole blog"

#: hub/models.py:163 hub/templates/hub/home.html:288
#: hub/templates/hub/home.html:289
#: hub/models.py:163 hub/templates/hub/home.html:289
#: hub/templates/hub/home.html:290
msgid "Name"
msgstr "Nume"

Expand Down Expand Up @@ -1202,6 +1206,10 @@ msgstr "Regulament platformă"
msgid "Methodology"
msgstr "Metodologie"

#: hub/templates/hub/footer.html:37
msgid "soon"
msgstr "în curând"

#: hub/templates/hub/footer.html:38
msgid "Privacy policy"
msgstr "Politică de confidențialitate"
Expand Down Expand Up @@ -1263,12 +1271,12 @@ msgstr "Ieșire cont"
msgid "Login"
msgstr "Autentificare"

#: hub/templates/hub/home.html:304 hub/templates/hub/home.html:305
#: hub/templates/hub/home.html:305 hub/templates/hub/home.html:306
#: hub/templates/registration/login.html:49
msgid "Email"
msgstr "Email"

#: hub/templates/hub/home.html:319 hub/templates/hub/home.html:320
#: hub/templates/hub/home.html:320 hub/templates/hub/home.html:321
msgid "Message"
msgstr "Mesaj"

Expand Down

0 comments on commit 4a725b4

Please sign in to comment.