Skip to content

Commit

Permalink
Feat/gdpr button (#687) (#688)
Browse files Browse the repository at this point in the history
* #649 Added html for gdpr button

* #649 Added field for gdpr button

* Added text and link for GDPR field

* Added translation for GDPR

* Flake8 now works

* mellanslag

Co-authored-by: Einar Johansson <ejrobb09@gmail.com>
Co-authored-by: Marmingen <106428188+Marmingen@users.noreply.github.com>

Co-authored-by: Plastpase123 <62748997+Plastpase123@users.noreply.github.com>
Co-authored-by: Marmingen <106428188+Marmingen@users.noreply.github.com>
  • Loading branch information
3 people committed Nov 10, 2022
1 parent e9b53b1 commit 10c8ab9
Show file tree
Hide file tree
Showing 28 changed files with 489 additions and 38 deletions.
18 changes: 18 additions & 0 deletions src/events/migrations/0006_alter_event_raffle_has_been_held.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Generated by Django 3.2.3 on 2022-11-10 16:54

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('events', '0005_event_raffle_has_been_held'),
]

operations = [
migrations.AlterField(
model_name='event',
name='raffle_has_been_held',
field=models.BooleanField(default=False, help_text='This signals to users whether a raffle has been held. This field populates automatically once a raffle has been held.', verbose_name='Raffle has been held'),
),
]
Binary file modified src/involvement/locale/sv/LC_MESSAGES/django.mo
Binary file not shown.
84 changes: 47 additions & 37 deletions src/involvement/locale/sv/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-05-08 17:23+0200\n"
"POT-Creation-Date: 2022-11-10 20:55+0100\n"
"PO-Revision-Date: 2017-06-26 10:23+0200\n"
"Last-Translator: Jip J. Dekker <jip@dekker.li>\n"
"Language-Team: \n"
Expand All @@ -13,7 +13,7 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Poedit 2.0.2\n"

#: apps.py:7 wagtail_hooks.py:301
#: apps.py:7 wagtail_hooks.py:309
msgid "Involvement"
msgstr "Engagemang"

Expand Down Expand Up @@ -73,61 +73,70 @@ msgstr ""
"Du kan inte tillsätta sökande till %(current)s. Det maximala antalet för "
"denna post är %(max)s."

#: forms/approval_form.py:11 models/application.py:37
#: forms/approval_form.py:11 models/application.py:39
msgid "Approved"
msgstr "Nominerad"

#: forms/approval_form.py:12 models/application.py:38
#: forms/approval_form.py:12 models/application.py:40
msgid "Disapproved"
msgstr "Inte Nominerad"

#: models/application.py:29
#: models/application.py:31
msgid "Application"
msgstr "Ansökning"

#: models/application.py:30 wagtail_hooks.py:242
#: models/application.py:32 wagtail_hooks.py:242
msgid "Applications"
msgstr "Ansökningar"

#: models/application.py:35
#: models/application.py:37
msgid "Draft"
msgstr "Utkast"

#: models/application.py:36
#: models/application.py:38
msgid "Submitted"
msgstr "Inskickade"

#: models/application.py:39
#: models/application.py:41
msgid "Appointed"
msgstr "Tillsatt"

#: models/application.py:40
#: models/application.py:42
msgid "Turned down"
msgstr "Avslagen"

#: models/application.py:46
#: models/application.py:48
msgid "Status"
msgstr "Status"

#: models/application.py:53
#: models/application.py:55
msgid "Cover Letter"
msgstr "Ansökningsbrev"

#: models/application.py:54
#: models/application.py:56
msgid "Present yourself and state why you are who we are looking for"
msgstr ""
"Skriv en presentation av dig själv och en beskrivning av varför du är den vi "
"letar efter"

#: models/application.py:58
#: models/application.py:60
msgid "Qualifications"
msgstr "Meriter"

#: models/application.py:59
#: models/application.py:61
msgid "Give a summary of relevant qualifications"
msgstr "Ge en sammanfattning av relevanta meriter"

#: models/application.py:74
#: models/application.py:67
msgid ""
"I accept that my data is saved in accordance with Uppsala Union of "
"Engineering and Science Students integrity policy that can be found within "
"the link: "
msgstr ""
"Jag godkänner att mina uppgifter sparas i enlighet med Uppsala teknolog- och "
"naturvetarkårs integritetspolicy som går att hitta på: "

#: models/application.py:82
msgid "Rejection date"
msgstr ""

Expand All @@ -147,7 +156,7 @@ msgstr "Mandat historik"
msgid "Mandate histories"
msgstr "Mandat historik"

#: models/position.py:16
#: models/position.py:16 models/position.py:83 wagtail_hooks.py:276
msgid "Position"
msgstr "Post"

Expand Down Expand Up @@ -192,6 +201,10 @@ msgstr ""
msgid "Swedish extra comments"
msgstr "Övriga kommentarer, svenska"

#: models/position.py:79 models/role.py:261
msgid "in"
msgstr "i"

#: models/recruitment_page.py:20
msgid "Included teams"
msgstr "Inkluderade grupper"
Expand All @@ -209,7 +222,7 @@ msgstr "Exkluderade grupper"
msgid "Choose teams to exclude from the page"
msgstr "Välj grupper att exkludera från sidan"

#: models/reference.py:22
#: models/reference.py:22 wagtail_hooks.py:283
msgid "Name"
msgstr "Namn"

Expand Down Expand Up @@ -347,10 +360,6 @@ msgstr "Ange ett telefonnummer som din referens kan nås på"
msgid "Please enter a valid phone number"
msgstr "Ange ett giltigt telefonnummer"

#: models/role.py:261
msgid "in"
msgstr "i"

#: models/team.py:15
msgid "Team"
msgstr "Grupp"
Expand Down Expand Up @@ -499,12 +508,13 @@ msgstr "email"
msgid "section"
msgstr "sektion"

#: templates/involvement/application_form.html:126
#: templates/involvement/application_form.html:142
msgid "save as draft"
msgstr "spara utkast"

#: templates/involvement/application_form.html:127
#: templates/involvement/open_positions.html:29
#: templates/involvement/application_form.html:143
#: templates/involvement/open_positions.html:33
#: templates/involvement/open_positions.html:65
msgid "apply"
msgstr "ansök"

Expand All @@ -513,7 +523,7 @@ msgid "status"
msgstr "status"

#: templates/involvement/application_summary.html:20
#: templates/involvement/open_positions.html:30
#: templates/involvement/open_positions.html:21
#: templates/involvement/open_positions.html:34
#: templates/involvement/position.html:34
msgid "deadline"
Expand All @@ -532,16 +542,16 @@ msgstr "redigera ansökan"
msgid "view application"
msgstr "granska ansökan"

#: templates/involvement/base.html:10
#: templates/involvement/base.html:8
#: templates/involvement/open_positions.html:6
msgid "open positions"
msgstr "sökbara poster"

#: templates/involvement/base.html:13
#: templates/involvement/base.html:11
msgid "my positions"
msgstr "mina poster"

#: templates/involvement/base.html:16
#: templates/involvement/base.html:14
msgid "my applications"
msgstr "mina ansökningar"

Expand Down Expand Up @@ -572,31 +582,31 @@ msgstr "Dina poster"
msgid "You currently do not have any posts."
msgstr "Du har inga poster."

#: templates/involvement/open_positions.html:23
#: templates/involvement/open_positions.html:28
#: templates/involvement/position.html:22
msgid "unaffiliated"
msgstr "ej ansluten"

#: templates/involvement/open_positions.html:35
#: templates/involvement/open_positions.html:38
msgid "Term of office"
msgstr "Mandatperiod"

#: templates/involvement/open_positions.html:36
#: templates/involvement/open_positions.html:42
#: templates/involvement/position.html:36
msgid "role description"
msgstr "Rollbeskrivning"

#: templates/involvement/open_positions.html:36
#: templates/involvement/open_positions.html:37
#: templates/involvement/open_positions.html:46
#: templates/involvement/open_positions.html:58
msgid "Read more"
msgstr "Läs mer"

#: templates/involvement/open_positions.html:37
#: templates/involvement/open_positions.html:53
#: templates/involvement/position.html:40
msgid "comments for this year"
msgstr "kommenterar för detta år"

#: templates/involvement/open_positions.html:43
#: templates/involvement/open_positions.html:72
msgid "There are currently no open positions. Check back later!"
msgstr ""
"Det finns för närvarande inga sökbara poster. Välkommen att komma tillbaka "
Expand Down Expand Up @@ -774,6 +784,6 @@ msgstr "Tillsätt"
msgid "Appoint member to %s"
msgstr "Tillsätt medlem som %s"

#: wagtail_hooks.py:280
#: wagtail_hooks.py:288
msgid "Contact Cards"
msgstr "Kontaktkort"
18 changes: 18 additions & 0 deletions src/involvement/migrations/0025_application_gdpr.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Generated by Django 3.2.3 on 2022-05-07 13:06

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('involvement', '0024_auto_20210512_0956'),
]

operations = [
migrations.AddField(
model_name='application',
name='gdpr',
field=models.BooleanField(default=False, help_text='GDPR text...', verbose_name='GDPR'),
),
]
18 changes: 18 additions & 0 deletions src/involvement/migrations/0026_alter_application_gdpr.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Generated by Django 3.2.3 on 2022-11-10 16:54

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('involvement', '0025_application_gdpr'),
]

operations = [
migrations.AlterField(
model_name='application',
name='gdpr',
field=models.BooleanField(default=False, help_text='Jag godkänner att mina uppgifter sparas i enlighet med Uppsala teknolog- och naturvetarkårs integritetspolicy som går att hitta på ', verbose_name='GDPR'),
),
]
18 changes: 18 additions & 0 deletions src/involvement/migrations/0027_alter_application_gdpr.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Generated by Django 3.2.3 on 2022-11-10 16:54

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('involvement', '0026_alter_application_gdpr'),
]

operations = [
migrations.AlterField(
model_name='application',
name='gdpr',
field=models.BooleanField(default=False, help_text='Jag godkänner att mina uppgifter sparas i enlighet med Uppsala teknolog- och naturvetarkårs integritetspolicy som går att hitta på https://www.utn.se/sv/dokument', verbose_name='GDPR'),
),
]
18 changes: 18 additions & 0 deletions src/involvement/migrations/0028_alter_application_gdpr.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Generated by Django 3.2.3 on 2022-11-10 17:00

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('involvement', '0027_alter_application_gdpr'),
]

operations = [
migrations.AlterField(
model_name='application',
name='gdpr',
field=models.BooleanField(default=False, help_text='Jag godkänner att mina uppgifter sparas i enlighet med Uppsala teknolog- och naturvetarkårs integritetspolicy som går att hitta på <a href="{https://www.utn.se/sv/dokument}">{test länk}</a>', verbose_name='GDPR'),
),
]
18 changes: 18 additions & 0 deletions src/involvement/migrations/0029_alter_application_gdpr.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Generated by Django 3.2.3 on 2022-11-10 18:19

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('involvement', '0028_alter_application_gdpr'),
]

operations = [
migrations.AlterField(
model_name='application',
name='gdpr',
field=models.BooleanField(default=False, help_text='I accept that my data is saved in accordance with Uppsala Union of Engineering and Science Students integrity policy that can be found at <a href={https://www.utn.se/about-union/document-archive/}></a>', verbose_name='GDPR'),
),
]
18 changes: 18 additions & 0 deletions src/involvement/migrations/0030_alter_application_gdpr.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Generated by Django 3.2.3 on 2022-11-10 18:19

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('involvement', '0029_alter_application_gdpr'),
]

operations = [
migrations.AlterField(
model_name='application',
name='gdpr',
field=models.BooleanField(default=False, help_text='I accept that my data is saved in accordance with Uppsala Union of Engineering and Science Students integrity policy that can be found at <a href=https://www.utn.se/about-union/document-archive/></a>', verbose_name='GDPR'),
),
]
18 changes: 18 additions & 0 deletions src/involvement/migrations/0031_alter_application_gdpr.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Generated by Django 3.2.3 on 2022-11-10 18:27

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('involvement', '0030_alter_application_gdpr'),
]

operations = [
migrations.AlterField(
model_name='application',
name='gdpr',
field=models.BooleanField(default=False, help_text='I accept that my data is saved in accordance with Uppsala Union of Engineering and Science Students integrity policy that can be found at', verbose_name='GDPR'),
),
]
Loading

0 comments on commit 10c8ab9

Please sign in to comment.