diff --git a/applications/locale/en/LC_MESSAGES/django.po b/applications/locale/en/LC_MESSAGES/django.po index a38247840..7a2de804e 100644 --- a/applications/locale/en/LC_MESSAGES/django.po +++ b/applications/locale/en/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-11-27 17:21+0100\n" +"POT-Creation-Date: 2024-02-27 01:01+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,23 +18,31 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: applications/templates/applications/application_info.html:9 +#: applications/templates/applications/application_form.html:12 +msgid "Søknad" +msgstr "Application" + +#: applications/templates/applications/application_form.html:15 +msgid "Tilbake til infoside" +msgstr "Back to information page" + +#: applications/templates/applications/application_info.html:6 msgid "Informasjon om opptaket" msgstr "Information about the admission" -#: applications/templates/applications/application_info.html:20 +#: applications/templates/applications/application_info.html:15 msgid "Gå til søknad" msgstr "Go to application" -#: applications/templates/applications/application_info.html:29 +#: applications/templates/applications/application_info.html:24 msgid "Praktisk informasjon om medlemskap" msgstr "Practical information about membership" -#: applications/templates/applications/application_info.html:30 +#: applications/templates/applications/application_info.html:25 msgid "Tusen takk for din interesse!" msgstr "Thank you very much for your interest!" -#: applications/templates/applications/application_info.html:31 +#: applications/templates/applications/application_info.html:26 msgid "" "På denne nettsiden får du informasjon om medlemskap og gruppene i " "Hackerspace." @@ -42,7 +50,7 @@ msgstr "" "On this website, you will find information about membership and the groups " "in Hackerspace." -#: applications/templates/applications/application_info.html:32 +#: applications/templates/applications/application_info.html:27 msgid "" "Dersom du blir tatt opp i en av våre grupper, blir du selvsagt også medlem " "av Hackerspace." @@ -50,11 +58,11 @@ msgstr "" "If you are accepted into one of our groups, you will naturally become a " "member of Hackerspace as well." -#: applications/templates/applications/application_info.html:33 +#: applications/templates/applications/application_info.html:28 msgid "Erfaring" msgstr "Experience" -#: applications/templates/applications/application_info.html:34 +#: applications/templates/applications/application_info.html:29 msgid "" "Man trenger ikke være en verdensmester for å søke i Hackerspace.
Både " "nybegynnere og viderekommende er velkommen til å søke hos oss. Vi er først " @@ -68,11 +76,11 @@ msgstr "" "Hackerspace will be trained in the most commonly used equipment in our " "workshop, with specific training for the group they join." -#: applications/templates/applications/application_info.html:35 +#: applications/templates/applications/application_info.html:30 msgid "Vaktlisten" msgstr "Shift Schedule" -#: applications/templates/applications/application_info.html:37 +#: applications/templates/applications/application_info.html:32 msgid "" "Alle medlemmer av Hackerspace er med på å holde verkstedet åpent. På vakt " "hjelper du nysgjerrige studenter som stikker innom og vil bruke utstyret " @@ -87,11 +95,11 @@ msgstr "" "socializing with others in the workshop during your shift. Each member is " "scheduled for two hours per week." -#: applications/templates/applications/application_info.html:39 +#: applications/templates/applications/application_info.html:34 msgid "Stander" msgstr "Stands" -#: applications/templates/applications/application_info.html:41 +#: applications/templates/applications/application_info.html:36 msgid "" "Du har kanskje møtt Hackerspace på stand på NTNU? Det er fordi Hackerspace " "står mye på stand for å spre ordet om hvem vi er og hva vi gjør. Dette er " @@ -101,26 +109,26 @@ msgstr "" "Hackerspace often sets up stands to spread the word about who we are and " "what we do. This is something everyone in Hackerspace participates in." -#: applications/templates/applications/application_info.html:52 +#: applications/templates/applications/application_info.html:47 msgid "Hovedgrupper" msgstr "Main Groups" -#: applications/templates/applications/application_info.html:53 +#: applications/templates/applications/application_info.html:48 msgid "Under finner du informasjon om hovedgruppene som har opptak nå" msgstr "" "Below you will find information about the main groups currently open for " "admission" -#: applications/templates/applications/application_info.html:65 -#: applications/templates/applications/application_info.html:92 +#: applications/templates/applications/application_info.html:60 +#: applications/templates/applications/application_info.html:87 msgid "Ingen grupper lagt til i opptaket." msgstr "No groups added to the admission process." -#: applications/templates/applications/application_info.html:76 +#: applications/templates/applications/application_info.html:71 msgid "Prosjektgruppene" msgstr "Project Groups" -#: applications/templates/applications/application_info.html:77 +#: applications/templates/applications/application_info.html:72 msgid "" "Prosjektgruppene gjennomfører en rekke prosjekter som varierer fra år til " "år. Prosjektene varer som oftest i to semestre." @@ -128,7 +136,7 @@ msgstr "" "The project groups carry out a variety of projects that vary from year to " "year. Projects usually last for two semesters." -#: applications/templates/applications/application_info.html:78 +#: applications/templates/applications/application_info.html:73 msgid "" "Som medlem av en prosjektgruppe jobber du konkret på et prosjekt sammen med " "andre på gruppen." @@ -136,7 +144,7 @@ msgstr "" "As a member of a project group, you work actively on a project alongside " "others in the group." -#: applications/templates/applications/application_info.html:79 +#: applications/templates/applications/application_info.html:74 msgid "" "Om du har forslag til noen andre prosjekter, kan dette sendes med et " "søknadsskjema." @@ -144,7 +152,7 @@ msgstr "" "If you have suggestions for other projects, you can include them in your " "application." -#: applications/templates/applications/application_info.html:80 +#: applications/templates/applications/application_info.html:75 msgid "Under finner du informasjon om prosjektene som har opptak nå." msgstr "" "Below you will find information about the projects currently open for " diff --git a/applications/locale/nb/LC_MESSAGES/django.po b/applications/locale/nb/LC_MESSAGES/django.po index c5ea688a4..ef0605a82 100644 --- a/applications/locale/nb/LC_MESSAGES/django.po +++ b/applications/locale/nb/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-11-27 17:21+0100\n" +"POT-Creation-Date: 2024-02-27 01:01+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,39 +18,47 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: applications/templates/applications/application_info.html:9 +#: applications/templates/applications/application_form.html:12 +msgid "Søknad" +msgstr "" + +#: applications/templates/applications/application_form.html:15 +msgid "Tilbake til infoside" +msgstr "" + +#: applications/templates/applications/application_info.html:6 msgid "Informasjon om opptaket" msgstr "" -#: applications/templates/applications/application_info.html:20 +#: applications/templates/applications/application_info.html:15 msgid "Gå til søknad" msgstr "" -#: applications/templates/applications/application_info.html:29 +#: applications/templates/applications/application_info.html:24 msgid "Praktisk informasjon om medlemskap" msgstr "" -#: applications/templates/applications/application_info.html:30 +#: applications/templates/applications/application_info.html:25 msgid "Tusen takk for din interesse!" msgstr "" -#: applications/templates/applications/application_info.html:31 +#: applications/templates/applications/application_info.html:26 msgid "" "På denne nettsiden får du informasjon om medlemskap og gruppene i " "Hackerspace." msgstr "" -#: applications/templates/applications/application_info.html:32 +#: applications/templates/applications/application_info.html:27 msgid "" "Dersom du blir tatt opp i en av våre grupper, blir du selvsagt også medlem " "av Hackerspace." msgstr "" -#: applications/templates/applications/application_info.html:33 +#: applications/templates/applications/application_info.html:28 msgid "Erfaring" msgstr "" -#: applications/templates/applications/application_info.html:34 +#: applications/templates/applications/application_info.html:29 msgid "" "Man trenger ikke være en verdensmester for å søke i Hackerspace.
Både " "nybegynnere og viderekommende er velkommen til å søke hos oss. Vi er først " @@ -59,11 +67,11 @@ msgid "" "verkstedet, og spesifikk kursing for gruppen de blir med i." msgstr "" -#: applications/templates/applications/application_info.html:35 +#: applications/templates/applications/application_info.html:30 msgid "Vaktlisten" msgstr "" -#: applications/templates/applications/application_info.html:37 +#: applications/templates/applications/application_info.html:32 msgid "" "Alle medlemmer av Hackerspace er med på å holde verkstedet åpent. På vakt " "hjelper du nysgjerrige studenter som stikker innom og vil bruke utstyret " @@ -72,53 +80,53 @@ msgid "" "Alle medlemmer sitter to timer på vakt i uken." msgstr "" -#: applications/templates/applications/application_info.html:39 +#: applications/templates/applications/application_info.html:34 msgid "Stander" msgstr "" -#: applications/templates/applications/application_info.html:41 +#: applications/templates/applications/application_info.html:36 msgid "" "Du har kanskje møtt Hackerspace på stand på NTNU? Det er fordi Hackerspace " "står mye på stand for å spre ordet om hvem vi er og hva vi gjør. Dette er " "noe alle i Hackerspace er med på." msgstr "" -#: applications/templates/applications/application_info.html:52 +#: applications/templates/applications/application_info.html:47 msgid "Hovedgrupper" msgstr "" -#: applications/templates/applications/application_info.html:53 +#: applications/templates/applications/application_info.html:48 msgid "Under finner du informasjon om hovedgruppene som har opptak nå" msgstr "" -#: applications/templates/applications/application_info.html:65 -#: applications/templates/applications/application_info.html:92 +#: applications/templates/applications/application_info.html:60 +#: applications/templates/applications/application_info.html:87 msgid "Ingen grupper lagt til i opptaket." msgstr "" -#: applications/templates/applications/application_info.html:76 +#: applications/templates/applications/application_info.html:71 msgid "Prosjektgruppene" msgstr "" -#: applications/templates/applications/application_info.html:77 +#: applications/templates/applications/application_info.html:72 msgid "" "Prosjektgruppene gjennomfører en rekke prosjekter som varierer fra år til " "år. Prosjektene varer som oftest i to semestre." msgstr "" -#: applications/templates/applications/application_info.html:78 +#: applications/templates/applications/application_info.html:73 msgid "" "Som medlem av en prosjektgruppe jobber du konkret på et prosjekt sammen med " "andre på gruppen." msgstr "" -#: applications/templates/applications/application_info.html:79 +#: applications/templates/applications/application_info.html:74 msgid "" "Om du har forslag til noen andre prosjekter, kan dette sendes med et " "søknadsskjema." msgstr "" -#: applications/templates/applications/application_info.html:80 +#: applications/templates/applications/application_info.html:75 msgid "Under finner du informasjon om prosjektene som har opptak nå." msgstr "" diff --git a/applications/templates/applications/application_form.html b/applications/templates/applications/application_form.html index 11d7af137..0678a43e0 100644 --- a/applications/templates/applications/application_form.html +++ b/applications/templates/applications/application_form.html @@ -1,5 +1,7 @@ {% extends 'website/base.html' %} {% load static %} +{% load i18n %} +{% load includeslots %} {% block head %} @@ -7,130 +9,124 @@ {{ jquery_ui | safe }} {% endblock %} {% block content %} - -
-
-
-
-

Søknad

- Tilbake til infoside -
+ {% translate "Søknad" as trans_apply %} + {% includeslots "website/page_overview/content_title.html" with title=trans_apply %} + {% slot children %} + {% trans "Tilbake til infoside" %} +{% endslots %} +
+
+
+
+
Velkommen til søknadssiden for Hackerspace NTNU sitt opptak!
+

Når opptaket er ferdig, kontakter vi deg med svar via e-postadressen du oppgir under.

-
-
+
+
+
+
+ {% csrf_token %}
-
-
Velkommen til søknadssiden for Hackerspace NTNU sitt opptak!
-

Når opptaket er ferdig, kontakter vi deg med svar via e-postadressen du oppgir under.

+
+ {{ form.name }} + +
+
+ {{ form.email }} + + {% if form.email.errors %} + {{ form.email.errors }} + {% endif %} +
+
+ {{ form.phone }} + + {% if form.phone.errors %} + {{ form.phone.errors }} + {% endif %} +
+
+ {{ form.study }} + +
+
+ {{ form.year }} + + {% if form.year.errors %} + {{ form.year.errors }} + {% endif %}
-
-
-
-
-
- - {% csrf_token %} -
-
- {{ form.name }} - -
-
- {{ form.email }} - - {% if form.email.errors %} - {{ form.email.errors }} - {% endif %} -
-
- {{ form.phone }} - - {% if form.phone.errors %} - {{ form.phone.errors }} - {% endif %} -
-
- {{ form.study }} - -
-
- {{ form.year }} - - {% if form.year.errors %} - {{ form.year.errors }} - {% endif %} -
-
- {{ form.knowledge_of_hs }} - - {% if form.knowledge_of_hs.errors %} - {{ form.knowledge_of_hs.errors }} - {% endif %} -
+
+ {{ form.knowledge_of_hs }} + + {% if form.knowledge_of_hs.errors %} + {{ form.knowledge_of_hs.errors }} + {% endif %} +
-
- {{ form.about }} - - {% if form.about.errors %} - {{ form.about.errors }} - {% else %} - Vi ønsker å vite litt om hvem du er som person, hva du liker å gjøre på fritiden, etc. - {% endif %} -
-
- {{ form.application_text }} - - {% if form.application_text.errors %} - {{ form.application_text.errors }} - {% else %} - Skriv gjerne litt om hva du har lyst til å jobbe med innenfor gruppen, dersom relevant. - {% endif %} -
+
+ {{ form.about }} + + {% if form.about.errors %} + {{ form.about.errors }} + {% else %} + Vi ønsker å vite litt om hvem du er som person, hva du liker å gjøre på fritiden, etc. + {% endif %} +
+
+ {{ form.application_text }} + + {% if form.application_text.errors %} + {{ form.application_text.errors }} + {% else %} + Skriv gjerne litt om hva du har lyst til å jobbe med innenfor gruppen, dersom relevant. + {% endif %} +
-
- -
-
- Legg til -
    - {% for group in group_choices %} -
  • {{ group }}
    • - {% endfor %} -
-
+
+ +
+
+ Legg til +
    + {% for group in group_choices %} +
  • {{ group }}
    • + {% endfor %} +
- - {% if form.group_choice.errors %} - {{ form.group_choice.errors }} - {% endif %} - {{ form.group_choice }}
+ + {% if form.group_choice.errors %} + {{ form.group_choice.errors }} + {% endif %} + {{ form.group_choice }} +
-
- {{ form.project_interests }} - - {% if form.project_interests.errors %} - {{ form.project_interests.errors }} - {% else %} - Beskriv gjerne om du ønsker å danne nye prosjekter. Vi ønsker å vite hva som interesserer deg. - {% endif %} -
+
+ {{ form.project_interests }} + + {% if form.project_interests.errors %} + {{ form.project_interests.errors }} + {% else %} + Beskriv gjerne om du ønsker å danne nye prosjekter. Vi ønsker å vite hva som interesserer deg. + {% endif %} +
+
+
+
+

Informasjonen oppgitt i dette skjema vil kun benyttes av styret (gruppeledere og ledelsen) til formål for opptaket. Dataen vil permanent slettes etter opptaket er ferdig.

+
-
-
-

Informasjonen oppgitt i dette skjema vil kun benyttes av styret (gruppeledere og ledelsen) til formål for opptaket. Dataen vil permanent slettes etter opptaket er ferdig.

-
-
-
- -
+
+
- -
-
+
+
+
+
{% endblock content %} diff --git a/applications/templates/applications/application_info.html b/applications/templates/applications/application_info.html index b4cd57fc1..7c8353542 100644 --- a/applications/templates/applications/application_info.html +++ b/applications/templates/applications/application_info.html @@ -2,15 +2,10 @@ {% load static %} {% load i18n %} {% block content %} -
-
-
-
-

{% trans "Informasjon om opptaket" %}

-
-
-
-
+ + {% translate "Informasjon om opptaket" as trans_application %} + {% include "website/page_overview/content_title.html" with title=trans_application %} +


diff --git a/files/locale/en/LC_MESSAGES/django.po b/files/locale/en/LC_MESSAGES/django.po index 336a2362a..bb9645be6 100644 --- a/files/locale/en/LC_MESSAGES/django.po +++ b/files/locale/en/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-11-27 17:21+0100\n" +"POT-Creation-Date: 2024-02-24 15:22+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/files/locale/nb/LC_MESSAGES/django.po b/files/locale/nb/LC_MESSAGES/django.po index ba8a506d6..f5865ef25 100644 --- a/files/locale/nb/LC_MESSAGES/django.po +++ b/files/locale/nb/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-11-27 17:21+0100\n" +"POT-Creation-Date: 2024-02-24 15:22+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/files/templates/files/images.html b/files/templates/files/images.html index 97bbb9b3e..bee316b55 100644 --- a/files/templates/files/images.html +++ b/files/templates/files/images.html @@ -35,4 +35,4 @@

{% trans "Galleriet er tomt" %}

{% endif %} -{% endblock content %} \ No newline at end of file +{% endblock content %} diff --git a/internalportal/locale/en/LC_MESSAGES/django.po b/internalportal/locale/en/LC_MESSAGES/django.po index 2b60b44d7..60e5e745f 100644 --- a/internalportal/locale/en/LC_MESSAGES/django.po +++ b/internalportal/locale/en/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-11-27 17:21+0100\n" +"POT-Creation-Date: 2024-02-24 15:22+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -203,7 +203,7 @@ msgstr "Email" msgid "Gå tilbake" msgstr "Go back" -#: internalportal/templates/internalportal/applications/approved_email.txt:2 +#: internalportal/templates/internalportal/applications/approved_email.txt:1 #, python-format msgid "" "Hei %(name)s,\n" @@ -235,7 +235,7 @@ msgstr "" "Best regards,\n" "%(application_group)s " -#: internalportal/templates/internalportal/applications/denied_email.txt:2 +#: internalportal/templates/internalportal/applications/denied_email.txt:1 #, python-format msgid "" "Hei %(name)s,\n" @@ -261,7 +261,7 @@ msgstr "" "Best regards,\n" "%(application_group)s " -#: internalportal/templates/internalportal/applications/interview_email.txt:2 +#: internalportal/templates/internalportal/applications/interview_email.txt:1 #, python-format msgid "" "Hei %(application_name)s,\n" @@ -288,7 +288,7 @@ msgstr "" "\n" "The proposed time for the interview is %(start_time)s in " -#: internalportal/templates/internalportal/applications/interview_email.txt:13 +#: internalportal/templates/internalportal/applications/interview_email.txt:12 msgid "Med vennlig hilsen" msgstr "Best regards" @@ -337,98 +337,98 @@ msgstr "Access to" msgid "Ingen aktive medlemmer." msgstr "No active members." -#: internalportal/templates/internalportal/internalportal.html:10 +#: internalportal/templates/internalportal/internalportal.html:7 msgid "Internportal" msgstr "Internal portal" -#: internalportal/templates/internalportal/internalportal.html:27 +#: internalportal/templates/internalportal/internalportal.html:21 msgid "Siste internnytt" msgstr "Latest internal news" -#: internalportal/templates/internalportal/internalportal.html:41 +#: internalportal/templates/internalportal/internalportal.html:35 msgid "Her var det intetnytt" msgstr "There's no news here" -#: internalportal/templates/internalportal/internalportal.html:51 +#: internalportal/templates/internalportal/internalportal.html:45 msgid "Siste interne arrangementer" msgstr "Latest internal events" -#: internalportal/templates/internalportal/internalportal.html:70 +#: internalportal/templates/internalportal/internalportal.html:64 msgid "Ingen interne arrangementer" msgstr "No internal events" -#: internalportal/templates/internalportal/internalportal.html:80 +#: internalportal/templates/internalportal/internalportal.html:74 msgid "Åpne lånesøknader" msgstr "Open loan applications" -#: internalportal/templates/internalportal/internalportal.html:93 +#: internalportal/templates/internalportal/internalportal.html:87 msgid "Ingen lånesøknader" msgstr "No loan applications" -#: internalportal/templates/internalportal/internalportal.html:108 +#: internalportal/templates/internalportal/internalportal.html:102 msgid "Lånesøknader" msgstr "Loan applications" -#: internalportal/templates/internalportal/internalportal.html:117 +#: internalportal/templates/internalportal/internalportal.html:111 msgid "Vaktliste" msgstr "Shift schedule" -#: internalportal/templates/internalportal/internalportal.html:126 +#: internalportal/templates/internalportal/internalportal.html:120 msgid "Lager" msgstr "Storage" -#: internalportal/templates/internalportal/internalportal.html:135 +#: internalportal/templates/internalportal/internalportal.html:129 msgid "Reservasjoner" msgstr "Reservations" -#: internalportal/templates/internalportal/internalportal.html:144 +#: internalportal/templates/internalportal/internalportal.html:138 msgid "Bildegalleri" msgstr "Image gallery" -#: internalportal/templates/internalportal/internalportal.html:154 +#: internalportal/templates/internalportal/internalportal.html:148 msgid "Adminpanel" msgstr "Admin panel" -#: internalportal/templates/internalportal/internalportal.html:163 +#: internalportal/templates/internalportal/internalportal.html:157 msgid "Medlemsliste for dørtilgang" msgstr "Member list for door access" -#: internalportal/templates/internalportal/internalportal.html:176 +#: internalportal/templates/internalportal/internalportal.html:171 msgid "Søkere" msgstr "Applicants" -#: internalportal/templates/internalportal/internalportal.html:178 +#: internalportal/templates/internalportal/internalportal.html:173 msgid "venter" msgstr "waiting" -#: internalportal/views.py:108 +#: internalportal/views.py:109 msgid "Søknad sendt videre til neste gruppe" msgstr "Application forwarded to the next group" -#: internalportal/views.py:117 +#: internalportal/views.py:118 msgid "Søknaden finnes ikke" msgstr "The application does not exist" -#: internalportal/views.py:132 +#: internalportal/views.py:133 msgid "Søknaden har ingen flere grupper å gå til" msgstr "The application has no more groups to go to" -#: internalportal/views.py:141 +#: internalportal/views.py:142 #, python-brace-format msgid "Gruppen {group_name} finnes ikke. Kontakt administrator." msgstr "The group {group_name} does not exist. Contact the administrator." -#: internalportal/views.py:158 +#: internalportal/views.py:159 #, python-brace-format msgid "Gruppen {group} har ingen ledere. Kontakt administrator." msgstr "" "The group {group} does not have any leaders. Contact the administrator." -#: internalportal/views.py:169 +#: internalportal/views.py:170 msgid "Søknad sendt videre" msgstr "Application forwarded" -#: internalportal/views.py:270 +#: internalportal/views.py:271 msgid "Få brukeren til å logge inn med Feide først og bruk søkerens ntnu-mail." msgstr "" "Have the user log in with Feide first and use the applicant's NTNU email." diff --git a/internalportal/locale/nb/LC_MESSAGES/django.po b/internalportal/locale/nb/LC_MESSAGES/django.po index e8b05a68d..c5406d7ea 100644 --- a/internalportal/locale/nb/LC_MESSAGES/django.po +++ b/internalportal/locale/nb/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-11-27 17:21+0100\n" +"POT-Creation-Date: 2024-02-24 15:22+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -200,7 +200,7 @@ msgstr "" msgid "Gå tilbake" msgstr "" -#: internalportal/templates/internalportal/applications/approved_email.txt:2 +#: internalportal/templates/internalportal/applications/approved_email.txt:1 #, python-format msgid "" "Hei %(name)s,\n" @@ -218,7 +218,7 @@ msgid "" "%(application_group)s" msgstr "" -#: internalportal/templates/internalportal/applications/denied_email.txt:2 +#: internalportal/templates/internalportal/applications/denied_email.txt:1 #, python-format msgid "" "Hei %(name)s,\n" @@ -233,7 +233,7 @@ msgid "" "%(application_group)s" msgstr "" -#: internalportal/templates/internalportal/applications/interview_email.txt:2 +#: internalportal/templates/internalportal/applications/interview_email.txt:1 #, python-format msgid "" "Hei %(application_name)s,\n" @@ -249,7 +249,7 @@ msgid "" "Foreslått tidspunkt for intervjuet er %(start_time)s i " msgstr "" -#: internalportal/templates/internalportal/applications/interview_email.txt:13 +#: internalportal/templates/internalportal/applications/interview_email.txt:12 msgid "Med vennlig hilsen" msgstr "" @@ -298,96 +298,96 @@ msgstr "" msgid "Ingen aktive medlemmer." msgstr "" -#: internalportal/templates/internalportal/internalportal.html:10 +#: internalportal/templates/internalportal/internalportal.html:7 msgid "Internportal" msgstr "" -#: internalportal/templates/internalportal/internalportal.html:27 +#: internalportal/templates/internalportal/internalportal.html:21 msgid "Siste internnytt" msgstr "" -#: internalportal/templates/internalportal/internalportal.html:41 +#: internalportal/templates/internalportal/internalportal.html:35 msgid "Her var det intetnytt" msgstr "" -#: internalportal/templates/internalportal/internalportal.html:51 +#: internalportal/templates/internalportal/internalportal.html:45 msgid "Siste interne arrangementer" msgstr "" -#: internalportal/templates/internalportal/internalportal.html:70 +#: internalportal/templates/internalportal/internalportal.html:64 msgid "Ingen interne arrangementer" msgstr "" -#: internalportal/templates/internalportal/internalportal.html:80 +#: internalportal/templates/internalportal/internalportal.html:74 msgid "Åpne lånesøknader" msgstr "" -#: internalportal/templates/internalportal/internalportal.html:93 +#: internalportal/templates/internalportal/internalportal.html:87 msgid "Ingen lånesøknader" msgstr "" -#: internalportal/templates/internalportal/internalportal.html:108 +#: internalportal/templates/internalportal/internalportal.html:102 msgid "Lånesøknader" msgstr "" -#: internalportal/templates/internalportal/internalportal.html:117 +#: internalportal/templates/internalportal/internalportal.html:111 msgid "Vaktliste" msgstr "" -#: internalportal/templates/internalportal/internalportal.html:126 +#: internalportal/templates/internalportal/internalportal.html:120 msgid "Lager" msgstr "" -#: internalportal/templates/internalportal/internalportal.html:135 +#: internalportal/templates/internalportal/internalportal.html:129 msgid "Reservasjoner" msgstr "" -#: internalportal/templates/internalportal/internalportal.html:144 +#: internalportal/templates/internalportal/internalportal.html:138 msgid "Bildegalleri" msgstr "" -#: internalportal/templates/internalportal/internalportal.html:154 +#: internalportal/templates/internalportal/internalportal.html:148 msgid "Adminpanel" msgstr "" -#: internalportal/templates/internalportal/internalportal.html:163 +#: internalportal/templates/internalportal/internalportal.html:157 msgid "Medlemsliste for dørtilgang" msgstr "" -#: internalportal/templates/internalportal/internalportal.html:176 +#: internalportal/templates/internalportal/internalportal.html:171 msgid "Søkere" msgstr "" -#: internalportal/templates/internalportal/internalportal.html:178 +#: internalportal/templates/internalportal/internalportal.html:173 msgid "venter" msgstr "" -#: internalportal/views.py:108 +#: internalportal/views.py:109 msgid "Søknad sendt videre til neste gruppe" msgstr "" -#: internalportal/views.py:117 +#: internalportal/views.py:118 msgid "Søknaden finnes ikke" msgstr "" -#: internalportal/views.py:132 +#: internalportal/views.py:133 msgid "Søknaden har ingen flere grupper å gå til" msgstr "" -#: internalportal/views.py:141 +#: internalportal/views.py:142 #, python-brace-format msgid "Gruppen {group_name} finnes ikke. Kontakt administrator." msgstr "" -#: internalportal/views.py:158 +#: internalportal/views.py:159 #, python-brace-format msgid "Gruppen {group} har ingen ledere. Kontakt administrator." msgstr "" -#: internalportal/views.py:169 +#: internalportal/views.py:170 msgid "Søknad sendt videre" msgstr "" -#: internalportal/views.py:270 +#: internalportal/views.py:271 msgid "Få brukeren til å logge inn med Feide først og bruk søkerens ntnu-mail." msgstr "" diff --git a/internalportal/templates/internalportal/applications/application.html b/internalportal/templates/internalportal/applications/application.html index 6394dfd1f..3ff1ad2ce 100644 --- a/internalportal/templates/internalportal/applications/application.html +++ b/internalportal/templates/internalportal/applications/application.html @@ -7,7 +7,7 @@ {% endblock %} {% block content %} - {% include "website/page_header.html" with title=application.name %} + {% include "website/page_overview/content_title.html" with title=application.name %}
diff --git a/internalportal/templates/internalportal/applications/applications.html b/internalportal/templates/internalportal/applications/applications.html index 53514457d..67e291cd2 100644 --- a/internalportal/templates/internalportal/applications/applications.html +++ b/internalportal/templates/internalportal/applications/applications.html @@ -4,7 +4,7 @@ {% block content %} {% trans "Søknader" as applications_header %} - {% include "website/page_header.html" with title=applications_header %} + {% include "website/page_overview/content_title.html" with title=applications_header %}
    diff --git a/internalportal/templates/internalportal/applications/interview_email_form.html b/internalportal/templates/internalportal/applications/interview_email_form.html index 48bd90b2f..02027d61d 100644 --- a/internalportal/templates/internalportal/applications/interview_email_form.html +++ b/internalportal/templates/internalportal/applications/interview_email_form.html @@ -8,7 +8,7 @@ {% block content %} {% trans "E-post for intervju" as interview_email_header %} - {% include "website/page_header.html" with title=interview_email_header %} + {% include "website/page_overview/content_title.html" with title=interview_email_header %}
    diff --git a/internalportal/templates/internalportal/internalportal.html b/internalportal/templates/internalportal/internalportal.html index adad6188b..02dc500ac 100644 --- a/internalportal/templates/internalportal/internalportal.html +++ b/internalportal/templates/internalportal/internalportal.html @@ -3,15 +3,9 @@ {% load i18n %} {% block content %} -
    -
    -
    -
    -

    {% trans "Internportal" %}

    -
    -
    -
    -
    + + {% translate "Internportal" as trans_internalportal %} + {% include "website/page_overview/content_title.html" with title=trans_internalportal %}
    diff --git a/inventory/locale/en/LC_MESSAGES/django.po b/inventory/locale/en/LC_MESSAGES/django.po index 7a0648aef..617d03df5 100644 --- a/inventory/locale/en/LC_MESSAGES/django.po +++ b/inventory/locale/en/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-11-27 17:21+0100\n" +"POT-Creation-Date: 2024-02-27 01:01+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,52 +18,69 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: inventory/templates/inventory/inventory.html:12 +#: inventory/templates/inventory/edit_item.html:12 +msgid "Rediger lagerinnslag" +msgstr "Edit inventory item" + +#: inventory/templates/inventory/equipment/equipment_list.html:11 +msgid "Utstyr" +msgstr "Equipment" + +#: inventory/templates/inventory/equipment/equipment_list.html:12 +msgid "" +"Her kan du finne utstyr som Hackerspace har. Ikke alt utstyr er mulig å låne " +"bort, men de som er, linker til gjenstanden i lageret for utlån." +msgstr "" +"Here you can find equipment that Hackerspace has. Not all equipment are " +"available to borrow, but those that are, have a link to the item in the " +"storage." + +#: inventory/templates/inventory/inventory.html:9 msgid "Lager" msgstr "Inventory" -#: inventory/templates/inventory/inventory.html:13 +#: inventory/templates/inventory/inventory.html:10 msgid "" "Her kan du søke i lageret vårt. Lyst til å låne noe? Kom innom verkstedet!" msgstr "" "Here you can search in our inventory. Want to borrow something? Visit the " "workshop!" -#: inventory/templates/inventory/inventory.html:14 +#: inventory/templates/inventory/inventory.html:13 msgid "Se utstyr og apparater" msgstr "View equipment and apparatus" -#: inventory/templates/inventory/inventory.html:28 +#: inventory/templates/inventory/inventory.html:24 msgid "Ting, tang og tare" msgstr "Things and stuff" -#: inventory/templates/inventory/inventory.html:29 -#: inventory/templates/inventory/inventory.html:37 +#: inventory/templates/inventory/inventory.html:25 +#: inventory/templates/inventory/inventory.html:33 msgid "Navn" msgstr "Name" -#: inventory/templates/inventory/inventory.html:33 +#: inventory/templates/inventory/inventory.html:29 msgid "Velg sorteringskriterie" msgstr "Choose sorting criterion" -#: inventory/templates/inventory/inventory.html:34 +#: inventory/templates/inventory/inventory.html:30 msgid "Popularitet" msgstr "Popularity" -#: inventory/templates/inventory/inventory.html:35 -#: inventory/templates/inventory/inventory.html:36 +#: inventory/templates/inventory/inventory.html:31 +#: inventory/templates/inventory/inventory.html:32 msgid "Lagerbeholdning" msgstr "Inventory Quantity" -#: inventory/templates/inventory/inventory.html:35 +#: inventory/templates/inventory/inventory.html:31 msgid "Synkende" msgstr "Descending" -#: inventory/templates/inventory/inventory.html:36 +#: inventory/templates/inventory/inventory.html:32 msgid "Stigende" msgstr "Ascending" -#: inventory/templates/inventory/inventory.html:39 +#: inventory/templates/inventory/inventory.html:35 msgid "Sorter etter" msgstr "Sort by" @@ -112,3 +129,11 @@ msgstr "the workshop" #: inventory/templates/inventory/items_list.html:76 msgid "og spør oss!" msgstr "and ask us!" + +#: inventory/templates/inventory/loan_applications.html:7 +msgid "Lånesøknader" +msgstr "Loan applications" + +#: inventory/templates/inventory/loan_applications.html:8 +msgid "Oversikt over lånesøknader" +msgstr "Overview of loan applications" diff --git a/inventory/locale/nb/LC_MESSAGES/django.po b/inventory/locale/nb/LC_MESSAGES/django.po index 64a0110de..bb23d9ff8 100644 --- a/inventory/locale/nb/LC_MESSAGES/django.po +++ b/inventory/locale/nb/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-11-27 17:21+0100\n" +"POT-Creation-Date: 2024-02-27 01:01+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,50 +18,64 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: inventory/templates/inventory/inventory.html:12 +#: inventory/templates/inventory/edit_item.html:12 +msgid "Rediger lagerinnslag" +msgstr "" + +#: inventory/templates/inventory/equipment/equipment_list.html:11 +msgid "Utstyr" +msgstr "" + +#: inventory/templates/inventory/equipment/equipment_list.html:12 +msgid "" +"Her kan du finne utstyr som Hackerspace har. Ikke alt utstyr er mulig å låne " +"bort, men de som er, linker til gjenstanden i lageret for utlån." +msgstr "" + +#: inventory/templates/inventory/inventory.html:9 msgid "Lager" msgstr "" -#: inventory/templates/inventory/inventory.html:13 +#: inventory/templates/inventory/inventory.html:10 msgid "" "Her kan du søke i lageret vårt. Lyst til å låne noe? Kom innom verkstedet!" msgstr "" -#: inventory/templates/inventory/inventory.html:14 +#: inventory/templates/inventory/inventory.html:13 msgid "Se utstyr og apparater" msgstr "" -#: inventory/templates/inventory/inventory.html:28 +#: inventory/templates/inventory/inventory.html:24 msgid "Ting, tang og tare" msgstr "" -#: inventory/templates/inventory/inventory.html:29 -#: inventory/templates/inventory/inventory.html:37 +#: inventory/templates/inventory/inventory.html:25 +#: inventory/templates/inventory/inventory.html:33 msgid "Navn" msgstr "" -#: inventory/templates/inventory/inventory.html:33 +#: inventory/templates/inventory/inventory.html:29 msgid "Velg sorteringskriterie" msgstr "" -#: inventory/templates/inventory/inventory.html:34 +#: inventory/templates/inventory/inventory.html:30 msgid "Popularitet" msgstr "" -#: inventory/templates/inventory/inventory.html:35 -#: inventory/templates/inventory/inventory.html:36 +#: inventory/templates/inventory/inventory.html:31 +#: inventory/templates/inventory/inventory.html:32 msgid "Lagerbeholdning" msgstr "" -#: inventory/templates/inventory/inventory.html:35 +#: inventory/templates/inventory/inventory.html:31 msgid "Synkende" msgstr "" -#: inventory/templates/inventory/inventory.html:36 +#: inventory/templates/inventory/inventory.html:32 msgid "Stigende" msgstr "" -#: inventory/templates/inventory/inventory.html:39 +#: inventory/templates/inventory/inventory.html:35 msgid "Sorter etter" msgstr "" @@ -110,3 +124,11 @@ msgstr "" #: inventory/templates/inventory/items_list.html:76 msgid "og spør oss!" msgstr "" + +#: inventory/templates/inventory/loan_applications.html:7 +msgid "Lånesøknader" +msgstr "" + +#: inventory/templates/inventory/loan_applications.html:8 +msgid "Oversikt over lånesøknader" +msgstr "" diff --git a/inventory/templates/inventory/edit_item.html b/inventory/templates/inventory/edit_item.html index 86c45de8f..fff5f13ca 100644 --- a/inventory/templates/inventory/edit_item.html +++ b/inventory/templates/inventory/edit_item.html @@ -9,15 +9,8 @@ {% endblock head %} {% block content %} -
    -
    -
    -
    -

    Rediger lagerinnslag

    -
    -
    -
    -
    + {% translate "Rediger lagerinnslag" as trans_edit_item %} + {% include "website/page_overview/content_title.html" title=trans_edit_item %}
    diff --git a/inventory/templates/inventory/equipment/equipment_list.html b/inventory/templates/inventory/equipment/equipment_list.html index 3a8a68cfa..629a1d53c 100644 --- a/inventory/templates/inventory/equipment/equipment_list.html +++ b/inventory/templates/inventory/equipment/equipment_list.html @@ -1,5 +1,6 @@ {% extends 'website/base.html' %} {% load static %} +{% load i18n %} {% block head %} @@ -7,35 +8,25 @@ {% block content %} -
    -
    -
    -
    -
    -

    Utstyr

    -

    Her kan du finne utstyr som Hackerspace har. Ikke alt utstyr er mulig å låne bort, men de som er, - linker til gjenstanden i lageret for utlån.

    -
    -
    -
    -
    + {% translate "Utstyr" as trans_equipment %} + {% translate "Her kan du finne utstyr som Hackerspace har. Ikke alt utstyr er mulig å låne bort, men de som er, linker til gjenstanden i lageret for utlån." as trans_equipment_desc %} + {% include "website/page_overview/content_title.html" with title=trans_equipment description=trans_equipment_desc %} - {% include "inventory/equipment/_list_admin_banner.html" %} + {% include "inventory/equipment/_list_admin_banner.html" %} -
    -
      - {% for item in items %} - {% include "inventory/equipment/equipment_list_item.html" %} - {% empty %} -
      -
      -

      Fant ingen utstyr på lageret sentiment_dissatisfied

      -

      Det kan likevel hende at vi har det du leter etter. Kom innom verkstedet og spør oss!

      -
      +
      +
        + {% for item in items %} + {% include "inventory/equipment/equipment_list_item.html" %} + {% empty %} +
        +
        +

        Fant ingen utstyr på lageret sentiment_dissatisfied

        +

        Det kan likevel hende at vi har det du leter etter. Kom innom verkstedet og spør oss!

        - {% endfor %} -
      -
      +
      + {% endfor %} +
    -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/inventory/templates/inventory/inventory.html b/inventory/templates/inventory/inventory.html index 68096bc31..5b38c236e 100644 --- a/inventory/templates/inventory/inventory.html +++ b/inventory/templates/inventory/inventory.html @@ -1,112 +1,108 @@ {% extends 'website/base.html' %} {% load static %} {% load i18n %} +{% load includeslots %} {% block head %} {{ jquery | safe }} {% endblock %} {% block content %} -
    -
    + {% translate "Lager" as trans_inventory %} + {% translate "Her kan du søke i lageret vårt. Lyst til å låne noe? Kom innom verkstedet!" as trans_inventory_desc %} + {% includeslots "website/page_overview/content_title.html" with title=trans_inventory description=trans_inventory_desc %} + {% slot children %} + {% trans 'Se utstyr og apparater' %} +{% endslots %} + +{% include "inventory/_list_admin_banner.html" %} + +
    +
    +
    -
    -

    {% trans 'Lager' %}

    -

    {% trans "Her kan du søke i lageret vårt. Lyst til å låne noe? Kom innom verkstedet!" %}

    - {% trans 'Se utstyr og apparater' %} +
    + +
    -
    -
    -
    - - {% include "inventory/_list_admin_banner.html" %} - -
    -
    - -
    -
    - - -
    -
    - - -
    -
    +
    + +
    - +
    +
    + -
    +
    -
    - - + {% endblock %} diff --git a/inventory/templates/inventory/loan_applications.html b/inventory/templates/inventory/loan_applications.html index 0662a4fd7..8c8f8d505 100644 --- a/inventory/templates/inventory/loan_applications.html +++ b/inventory/templates/inventory/loan_applications.html @@ -1,17 +1,12 @@ {% extends 'website/base.html' %} {% load static %} +{% load i18n %} {% block content %} -
    -
    -
    -
    -

    Lånesøknader

    -

    Oversikt over lånesøknader

    -
    -
    -
    -
    + + {% translate "Lånesøknader" as trans_loans %} + {% translate "Oversikt over lånesøknader" as trans_loans_desc %} + {% include "website/page_overview/content_title.html" with title=trans_loans description=trans_loans_desc %}
    diff --git a/news/locale/en/LC_MESSAGES/django.po b/news/locale/en/LC_MESSAGES/django.po index 53a018f74..9241d64f8 100644 --- a/news/locale/en/LC_MESSAGES/django.po +++ b/news/locale/en/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-11-27 17:21+0100\n" +"POT-Creation-Date: 2024-02-27 01:01+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -31,12 +31,12 @@ msgid "Administrator-meny" msgstr "Administrator Menu" #: news/templates/news/_event_admin_menu.html:14 -#: news/templates/news/edit_event.html:16 +#: news/templates/news/edit_event.html:12 msgid "Rediger arrangement" msgstr "Edit event" #: news/templates/news/_event_admin_menu.html:20 -#: news/templates/news/attendee_form.html:19 +#: news/templates/news/attendee_form.html:12 msgid "Registrer oppmøte" msgstr "Register attendance" @@ -128,7 +128,7 @@ msgstr "Read" msgid "ganger" msgstr "times" -#: news/templates/news/article.html:61 news/templates/news/edit_article.html:16 +#: news/templates/news/article.html:61 news/templates/news/edit_article.html:12 msgid "Rediger artikkel" msgstr "Edit article" @@ -181,25 +181,25 @@ msgstr "NO, GO BACK" msgid "Publisert" msgstr "Published" -#: news/templates/news/attendee_form.html:10 +#: news/templates/news/attendee_form.html:6 msgid "Oppmøte" msgstr "Attendance" -#: news/templates/news/attendee_form.html:43 +#: news/templates/news/attendee_form.html:36 msgid "Oppmøtt" msgstr "Attended" -#: news/templates/news/attendee_form.html:52 +#: news/templates/news/attendee_form.html:45 msgid "Lagre" msgstr "Save" -#: news/templates/news/edit_article.html:27 -#: news/templates/news/edit_event.html:29 +#: news/templates/news/edit_article.html:21 +#: news/templates/news/edit_event.html:25 msgid "Innhold" msgstr "Content" -#: news/templates/news/edit_article.html:48 -#: news/templates/news/edit_event.html:51 +#: news/templates/news/edit_article.html:42 +#: news/templates/news/edit_event.html:47 msgid "" "Bare markdown støttes i dette feltet, html blir returnert som plaintext. " "Bilder kan legges til ved drag-and-drop." @@ -207,42 +207,42 @@ msgstr "" "Only markdown is supported in this field, HTML will be returned as " "plaintext. Images can be added using drag-and-drop." -#: news/templates/news/edit_article.html:80 -#: news/templates/news/edit_article.html:81 +#: news/templates/news/edit_article.html:74 +#: news/templates/news/edit_article.html:75 msgid "Lagre og publiser artikkel" msgstr "Save and publish article" -#: news/templates/news/edit_article.html:82 -#: news/templates/news/edit_event.html:245 +#: news/templates/news/edit_article.html:76 +#: news/templates/news/edit_event.html:241 msgid "Lagre som utkast" msgstr "Save as draft" -#: news/templates/news/edit_event.html:61 +#: news/templates/news/edit_event.html:57 msgid "Velg hovedbilde" msgstr "Select main image" -#: news/templates/news/edit_event.html:84 +#: news/templates/news/edit_event.html:80 msgid "Internt arrangement (Kun Hackerspace-medlemmer kan se arrangementet)" msgstr "Internal event (Only Hackerspace members can see the event)" -#: news/templates/news/edit_event.html:151 news/templates/news/event.html:103 +#: news/templates/news/edit_event.html:147 news/templates/news/event.html:103 msgid "Påmelding" msgstr "Registration" -#: news/templates/news/edit_event.html:185 +#: news/templates/news/edit_event.html:181 msgid "Ferdigheter" msgstr "Skills" -#: news/templates/news/edit_event.html:202 news/templates/news/event.html:153 +#: news/templates/news/edit_event.html:198 news/templates/news/event.html:153 msgid "Filer" msgstr "Files" -#: news/templates/news/edit_event.html:224 +#: news/templates/news/edit_event.html:220 msgid "Ferdig" msgstr "Done" -#: news/templates/news/edit_event.html:239 -#: news/templates/news/edit_event.html:242 +#: news/templates/news/edit_event.html:235 +#: news/templates/news/edit_event.html:238 msgid "Lagre og publiser arrangement" msgstr "Save and publish event" @@ -432,11 +432,11 @@ msgstr "" msgid "NO, GO BACK" msgstr "" -#: news/templates/news/events.html:15 +#: news/templates/news/events.html:10 msgid "Arrangementer" msgstr "Events" -#: news/templates/news/events.html:27 news/templates/news/news.html:27 +#: news/templates/news/events.html:18 news/templates/news/news.html:18 msgid "Dine utkast" msgstr "Your drafts" @@ -444,50 +444,50 @@ msgstr "Your drafts" msgid "info" msgstr "info" -#: news/templates/news/news.html:15 +#: news/templates/news/news.html:10 msgid "Nyheter" msgstr "News" -#: news/templates/news/news.html:45 +#: news/templates/news/news.html:36 msgid "Publiserte artikler" msgstr "Published articles" -#: news/templates/news/skills_form.html:10 +#: news/templates/news/skills_form.html:6 msgid "Skills" msgstr "Skills" -#: news/templates/news/skills_form.html:21 +#: news/templates/news/skills_form.html:14 msgid "Approve Skills" msgstr "Approve Skills" -#: news/templates/news/skills_form.html:28 +#: news/templates/news/skills_form.html:21 msgid "Select All Attendees" msgstr "Select All Attendees" -#: news/templates/news/skills_form.html:35 +#: news/templates/news/skills_form.html:28 msgid "Select All" msgstr "Select All" -#: news/templates/news/skills_form.html:51 +#: news/templates/news/skills_form.html:44 msgid "Waiting List" msgstr "Waiting List" -#: news/templates/news/skills_form.html:57 +#: news/templates/news/skills_form.html:50 msgid "Already Has Skills" msgstr "Already Has Skills" -#: news/templates/news/skills_form.html:61 +#: news/templates/news/skills_form.html:54 msgid "Missing Prerequisites" msgstr "Missing Prerequisites" -#: news/templates/news/skills_form.html:73 +#: news/templates/news/skills_form.html:66 msgid "Attendance Registered" msgstr "Attendance Registered" -#: news/templates/news/skills_form.html:77 +#: news/templates/news/skills_form.html:70 msgid "Attendance Not Registered" msgstr "Attendance Not Registered" -#: news/templates/news/skills_form.html:94 +#: news/templates/news/skills_form.html:87 msgid "Save" msgstr "Save" diff --git a/news/locale/nb/LC_MESSAGES/django.po b/news/locale/nb/LC_MESSAGES/django.po index 209cc6229..cbd51d099 100644 --- a/news/locale/nb/LC_MESSAGES/django.po +++ b/news/locale/nb/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-11-27 17:21+0100\n" +"POT-Creation-Date: 2024-02-27 01:01+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -37,12 +37,12 @@ msgid "Administrator-meny" msgstr "" #: news/templates/news/_event_admin_menu.html:14 -#: news/templates/news/edit_event.html:16 +#: news/templates/news/edit_event.html:12 msgid "Rediger arrangement" msgstr "" #: news/templates/news/_event_admin_menu.html:20 -#: news/templates/news/attendee_form.html:19 +#: news/templates/news/attendee_form.html:12 msgid "Registrer oppmøte" msgstr "" @@ -134,7 +134,7 @@ msgstr "" msgid "ganger" msgstr "" -#: news/templates/news/article.html:61 news/templates/news/edit_article.html:16 +#: news/templates/news/article.html:61 news/templates/news/edit_article.html:12 msgid "Rediger artikkel" msgstr "" @@ -187,66 +187,66 @@ msgstr "" msgid "Publisert" msgstr "" -#: news/templates/news/attendee_form.html:10 +#: news/templates/news/attendee_form.html:6 msgid "Oppmøte" msgstr "" -#: news/templates/news/attendee_form.html:43 +#: news/templates/news/attendee_form.html:36 msgid "Oppmøtt" msgstr "" -#: news/templates/news/attendee_form.html:52 +#: news/templates/news/attendee_form.html:45 msgid "Lagre" msgstr "" -#: news/templates/news/edit_article.html:27 -#: news/templates/news/edit_event.html:29 +#: news/templates/news/edit_article.html:21 +#: news/templates/news/edit_event.html:25 msgid "Innhold" msgstr "" -#: news/templates/news/edit_article.html:48 -#: news/templates/news/edit_event.html:51 +#: news/templates/news/edit_article.html:42 +#: news/templates/news/edit_event.html:47 msgid "" "Bare markdown støttes i dette feltet, html blir returnert som plaintext. " "Bilder kan legges til ved drag-and-drop." msgstr "" -#: news/templates/news/edit_article.html:80 -#: news/templates/news/edit_article.html:81 +#: news/templates/news/edit_article.html:74 +#: news/templates/news/edit_article.html:75 msgid "Lagre og publiser artikkel" msgstr "" -#: news/templates/news/edit_article.html:82 -#: news/templates/news/edit_event.html:245 +#: news/templates/news/edit_article.html:76 +#: news/templates/news/edit_event.html:241 msgid "Lagre som utkast" msgstr "" -#: news/templates/news/edit_event.html:61 +#: news/templates/news/edit_event.html:57 msgid "Velg hovedbilde" msgstr "" -#: news/templates/news/edit_event.html:84 +#: news/templates/news/edit_event.html:80 msgid "Internt arrangement (Kun Hackerspace-medlemmer kan se arrangementet)" msgstr "" -#: news/templates/news/edit_event.html:151 news/templates/news/event.html:103 +#: news/templates/news/edit_event.html:147 news/templates/news/event.html:103 msgid "Påmelding" msgstr "" -#: news/templates/news/edit_event.html:185 +#: news/templates/news/edit_event.html:181 msgid "Ferdigheter" msgstr "" -#: news/templates/news/edit_event.html:202 news/templates/news/event.html:153 +#: news/templates/news/edit_event.html:198 news/templates/news/event.html:153 msgid "Filer" msgstr "" -#: news/templates/news/edit_event.html:224 +#: news/templates/news/edit_event.html:220 msgid "Ferdig" msgstr "" -#: news/templates/news/edit_event.html:239 -#: news/templates/news/edit_event.html:242 +#: news/templates/news/edit_event.html:235 +#: news/templates/news/edit_event.html:238 msgid "Lagre og publiser arrangement" msgstr "" @@ -430,11 +430,11 @@ msgstr "" msgid "NO, GO BACK" msgstr "" -#: news/templates/news/events.html:15 +#: news/templates/news/events.html:10 msgid "Arrangementer" msgstr "" -#: news/templates/news/events.html:27 news/templates/news/news.html:27 +#: news/templates/news/events.html:18 news/templates/news/news.html:18 msgid "Dine utkast" msgstr "" @@ -442,50 +442,50 @@ msgstr "" msgid "info" msgstr "" -#: news/templates/news/news.html:15 +#: news/templates/news/news.html:10 msgid "Nyheter" msgstr "" -#: news/templates/news/news.html:45 +#: news/templates/news/news.html:36 msgid "Publiserte artikler" msgstr "" -#: news/templates/news/skills_form.html:10 +#: news/templates/news/skills_form.html:6 msgid "Skills" msgstr "" -#: news/templates/news/skills_form.html:21 +#: news/templates/news/skills_form.html:14 msgid "Approve Skills" msgstr "" -#: news/templates/news/skills_form.html:28 +#: news/templates/news/skills_form.html:21 msgid "Select All Attendees" msgstr "" -#: news/templates/news/skills_form.html:35 +#: news/templates/news/skills_form.html:28 msgid "Select All" msgstr "" -#: news/templates/news/skills_form.html:51 +#: news/templates/news/skills_form.html:44 msgid "Waiting List" msgstr "" -#: news/templates/news/skills_form.html:57 +#: news/templates/news/skills_form.html:50 msgid "Already Has Skills" msgstr "" -#: news/templates/news/skills_form.html:61 +#: news/templates/news/skills_form.html:54 msgid "Missing Prerequisites" msgstr "" -#: news/templates/news/skills_form.html:73 +#: news/templates/news/skills_form.html:66 msgid "Attendance Registered" msgstr "" -#: news/templates/news/skills_form.html:77 +#: news/templates/news/skills_form.html:70 msgid "Attendance Not Registered" msgstr "" -#: news/templates/news/skills_form.html:94 +#: news/templates/news/skills_form.html:87 msgid "Save" msgstr "" diff --git a/news/templates/news/attendee_form.html b/news/templates/news/attendee_form.html index 7f94f21e6..3467c6973 100644 --- a/news/templates/news/attendee_form.html +++ b/news/templates/news/attendee_form.html @@ -3,15 +3,8 @@ {% load i18n %} {% block content %} -
    -
    -
    -
    -

    {% trans "Oppmøte" %}

    -
    -
    -
    -
    + {% translate "Oppmøte" as trans_registrations %} + {% include "website/page_overview/content_title.html" title=trans_registrations %}
    diff --git a/news/templates/news/edit_article.html b/news/templates/news/edit_article.html index 8c0ca3234..2c64abaf5 100644 --- a/news/templates/news/edit_article.html +++ b/news/templates/news/edit_article.html @@ -9,15 +9,9 @@ {% endblock head %} {% block content %} -
    -
    -
    -
    -

    {% trans "Rediger artikkel" %}

    -
    -
    -
    -
    + {% translate "Rediger artikkel" as trans_edit %} + {% include "website/page_overview/content_title.html" with title=trans_edit %} +
    diff --git a/news/templates/news/edit_event.html b/news/templates/news/edit_event.html index ed447f74a..10ddb23ab 100644 --- a/news/templates/news/edit_event.html +++ b/news/templates/news/edit_event.html @@ -9,15 +9,11 @@ {% endblock head %} {% block content %} -
    -
    -
    -
    -

    {% trans "Rediger arrangement" %}

    -
    -
    -
    -
    + {% translate "Rediger arrangement" as trans_edit %} + {% include "website/page_overview/content_title.html" with title=trans_edit %} + + {% include "news/_list_admin_banner.html" %} +
    diff --git a/news/templates/news/events.html b/news/templates/news/events.html index d9d0670a9..f38aa6ac5 100644 --- a/news/templates/news/events.html +++ b/news/templates/news/events.html @@ -7,17 +7,8 @@ {% endblock header %} {% block content %} -
    -
    -
    -
    -

    - {% trans "Arrangementer" %} -

    -
    -
    -
    -
    + {% translate "Arrangementer" as trans_events %} + {% include "website/page_overview/content_title.html" with title=trans_events %} {% include "news/_list_admin_banner.html" %} {% if drafts %}
    diff --git a/news/templates/news/news.html b/news/templates/news/news.html index eb80ad569..60e20cc32 100644 --- a/news/templates/news/news.html +++ b/news/templates/news/news.html @@ -7,17 +7,8 @@ {% endblock header %} {% block content %} -
    -
    -
    -
    -

    - {% trans "Nyheter" %} -

    -
    -
    -
    -
    + {% translate "Nyheter" as news %} + {% include "website/page_overview/content_title.html" with title=news %} {% include "news/_list_admin_banner.html" %} {% if drafts %}
    diff --git a/news/templates/news/skills_form.html b/news/templates/news/skills_form.html index 4a90a97c9..1b691d5cf 100644 --- a/news/templates/news/skills_form.html +++ b/news/templates/news/skills_form.html @@ -3,15 +3,8 @@ {% load static %} {% block content %} -
    -
    -
    -
    -

    {% trans "Skills" %}

    -
    -
    -
    -
    + {% translate "Skills" as trans_skills %} + {% include "website/page_overview/content_title.html" title=trans_skills %}
    diff --git a/projectarchive/locale/en/LC_MESSAGES/django.po b/projectarchive/locale/en/LC_MESSAGES/django.po index eafb410aa..1fed78865 100644 --- a/projectarchive/locale/en/LC_MESSAGES/django.po +++ b/projectarchive/locale/en/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-11-27 17:21+0100\n" +"POT-Creation-Date: 2024-02-24 15:22+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,6 +18,10 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: projectarchive/templates/projectarchive/projectarchive.html:15 +#: projectarchive/templates/projectarchive/edit_article.html:12 +msgid "Rediger prosjektartikkel" +msgstr "Edit project article" + +#: projectarchive/templates/projectarchive/projectarchive.html:10 msgid "Prosjektarkiv" msgstr "Project archive" diff --git a/projectarchive/locale/nb/LC_MESSAGES/django.po b/projectarchive/locale/nb/LC_MESSAGES/django.po index 08df77c78..c54062c55 100644 --- a/projectarchive/locale/nb/LC_MESSAGES/django.po +++ b/projectarchive/locale/nb/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-11-27 17:21+0100\n" +"POT-Creation-Date: 2024-02-24 15:22+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,6 +18,10 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: projectarchive/templates/projectarchive/projectarchive.html:15 +#: projectarchive/templates/projectarchive/edit_article.html:12 +msgid "Rediger prosjektartikkel" +msgstr "" + +#: projectarchive/templates/projectarchive/projectarchive.html:10 msgid "Prosjektarkiv" msgstr "" diff --git a/projectarchive/templates/projectarchive/edit_article.html b/projectarchive/templates/projectarchive/edit_article.html index a33a20d8d..a30a35bed 100644 --- a/projectarchive/templates/projectarchive/edit_article.html +++ b/projectarchive/templates/projectarchive/edit_article.html @@ -1,5 +1,6 @@ {% extends 'website/base.html' %} {% load static %} +{% load i18n %} {% block head %} @@ -8,15 +9,9 @@ {% endblock head %} {% block content %} -
    -
    -
    -
    -

    Rediger prosjektartikkel

    -
    -
    -
    -
    + {% translate "Rediger prosjektartikkel" as trans_edit %} + {% include "website/page_overview/content_title.html" with title=trans_edit %} +
    @@ -78,4 +73,4 @@
    Innhold
    -{% endblock content %} \ No newline at end of file +{% endblock content %} diff --git a/projectarchive/templates/projectarchive/projectarchive.html b/projectarchive/templates/projectarchive/projectarchive.html index 72f9df926..1069f39cb 100644 --- a/projectarchive/templates/projectarchive/projectarchive.html +++ b/projectarchive/templates/projectarchive/projectarchive.html @@ -7,17 +7,8 @@ {% endblock header %} {% block content %} -
    -
    -
    -
    -

    - {% trans "Prosjektarkiv" %} -

    -
    -
    -
    -
    + {% translate "Prosjektarkiv" as trans_projectarchive %} + {% include "website/page_overview/content_title.html" with title=trans_projectarchive %} {% include "projectarchive/_list_admin_banner.html" %} {% if drafts %}
    diff --git a/reservations/locale/en/LC_MESSAGES/django.po b/reservations/locale/en/LC_MESSAGES/django.po index 1115cfdf5..408b2820e 100644 --- a/reservations/locale/en/LC_MESSAGES/django.po +++ b/reservations/locale/en/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-11-27 17:21+0100\n" +"POT-Creation-Date: 2024-02-27 01:01+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,31 +18,31 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: reservations/templates/reservations/queue_list.html:10 +#: reservations/templates/reservations/queue_list.html:7 msgid "Reservasjoner" msgstr "Reservations" -#: reservations/templates/reservations/queue_list.html:11 +#: reservations/templates/reservations/queue_list.html:8 msgid "På denne siden kan du reservere bruk av diverse utstyr" msgstr "On this page, you can reserve the use of various equipment" -#: reservations/templates/reservations/queue_list.html:12 +#: reservations/templates/reservations/queue_list.html:11 msgid "Se Hackerspace sitt utstyr" msgstr "View Hackerspace's equipment" -#: reservations/templates/reservations/queue_list.html:27 +#: reservations/templates/reservations/queue_list.html:23 msgid "Les" msgstr "Read" -#: reservations/templates/reservations/queue_list.html:27 +#: reservations/templates/reservations/queue_list.html:23 msgid "regler for bruk av 3D-printer" msgstr "rules for using the 3D printer" -#: reservations/templates/reservations/queue_list.html:27 +#: reservations/templates/reservations/queue_list.html:23 msgid "før du starter" msgstr "before you start" -#: reservations/templates/reservations/queue_list.html:30 +#: reservations/templates/reservations/queue_list.html:26 #, fuzzy #| msgid "" #| "Ved å benytte reservasjonssystemet vårt setter vi av våre ressurser (både " @@ -60,30 +60,30 @@ msgstr "" "arrive on time (preferably 5 minutes before the allocated time) and do not " "exceed the time you have booked." -#: reservations/templates/reservations/queue_list.html:44 +#: reservations/templates/reservations/queue_list.html:40 msgid "I ustand" msgstr "Out of order" -#: reservations/templates/reservations/queue_list.html:52 +#: reservations/templates/reservations/queue_list.html:48 msgid "Vanskelighetsgrad" msgstr "Difficulty level" -#: reservations/templates/reservations/queue_list.html:61 +#: reservations/templates/reservations/queue_list.html:57 msgid "Mine reservasjoner" msgstr "My reservations" -#: reservations/templates/reservations/queue_list.html:68 +#: reservations/templates/reservations/queue_list.html:64 msgid "Fra" msgstr "From" -#: reservations/templates/reservations/queue_list.html:69 +#: reservations/templates/reservations/queue_list.html:65 msgid "til" msgstr "to" -#: reservations/templates/reservations/queue_list.html:72 +#: reservations/templates/reservations/queue_list.html:68 msgid "Du har ingen reservasjoner" msgstr "You have no reservations" -#: reservations/templates/reservations/queue_list.html:75 +#: reservations/templates/reservations/queue_list.html:71 msgid "Logg inn for å se reservasjoner" msgstr "Log in to view reservations" diff --git a/reservations/locale/nb/LC_MESSAGES/django.po b/reservations/locale/nb/LC_MESSAGES/django.po index 5d2c822a6..9a130672d 100644 --- a/reservations/locale/nb/LC_MESSAGES/django.po +++ b/reservations/locale/nb/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-11-27 17:21+0100\n" +"POT-Creation-Date: 2024-02-27 01:01+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,31 +18,31 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: reservations/templates/reservations/queue_list.html:10 +#: reservations/templates/reservations/queue_list.html:7 msgid "Reservasjoner" msgstr "" -#: reservations/templates/reservations/queue_list.html:11 +#: reservations/templates/reservations/queue_list.html:8 msgid "På denne siden kan du reservere bruk av diverse utstyr" msgstr "" -#: reservations/templates/reservations/queue_list.html:12 +#: reservations/templates/reservations/queue_list.html:11 msgid "Se Hackerspace sitt utstyr" msgstr "" -#: reservations/templates/reservations/queue_list.html:27 +#: reservations/templates/reservations/queue_list.html:23 msgid "Les" msgstr "" -#: reservations/templates/reservations/queue_list.html:27 +#: reservations/templates/reservations/queue_list.html:23 msgid "regler for bruk av 3D-printer" msgstr "" -#: reservations/templates/reservations/queue_list.html:27 +#: reservations/templates/reservations/queue_list.html:23 msgid "før du starter" msgstr "" -#: reservations/templates/reservations/queue_list.html:30 +#: reservations/templates/reservations/queue_list.html:26 msgid "" "Ved å benytte reservasjonssystemet vårt setter vi av våre ressurser (både " "printer og folk på vakt som følger med). Det er derfor forventet at du møter " @@ -50,30 +50,30 @@ msgid "" "har booket" msgstr "" -#: reservations/templates/reservations/queue_list.html:44 +#: reservations/templates/reservations/queue_list.html:40 msgid "I ustand" msgstr "" -#: reservations/templates/reservations/queue_list.html:52 +#: reservations/templates/reservations/queue_list.html:48 msgid "Vanskelighetsgrad" msgstr "" -#: reservations/templates/reservations/queue_list.html:61 +#: reservations/templates/reservations/queue_list.html:57 msgid "Mine reservasjoner" msgstr "" -#: reservations/templates/reservations/queue_list.html:68 +#: reservations/templates/reservations/queue_list.html:64 msgid "Fra" msgstr "" -#: reservations/templates/reservations/queue_list.html:69 +#: reservations/templates/reservations/queue_list.html:65 msgid "til" msgstr "" -#: reservations/templates/reservations/queue_list.html:72 +#: reservations/templates/reservations/queue_list.html:68 msgid "Du har ingen reservasjoner" msgstr "" -#: reservations/templates/reservations/queue_list.html:75 +#: reservations/templates/reservations/queue_list.html:71 msgid "Logg inn for å se reservasjoner" msgstr "" diff --git a/reservations/templates/reservations/queue_list.html b/reservations/templates/reservations/queue_list.html index aafa816c7..d04e0fd26 100644 --- a/reservations/templates/reservations/queue_list.html +++ b/reservations/templates/reservations/queue_list.html @@ -1,83 +1,79 @@ {% extends 'website/base.html' %} {% load i18n %} +{% load includeslots %} {% block content %} -
    -
    -
    -
    -

    {% trans "Reservasjoner" %}

    -

    {% trans "På denne siden kan du reservere bruk av diverse utstyr" %}.

    - {% trans 'Se Hackerspace sitt utstyr' %} -
    -
    -
    -
    + {% translate "Reservasjoner" as trans_reservations %} + {% translate "På denne siden kan du reservere bruk av diverse utstyr" as trans_reservations_desc %} + {% includeslots "website/page_overview/content_title.html" with title=trans_reservations description=trans_reservations_desc %} + {% slot children %} + {% trans 'Se Hackerspace sitt utstyr' %} +{% endslots %} - {% regroup reservation_list|dictsort:'parent_queue.name' by parent_queue as reservation_list %} +{% regroup reservation_list|dictsort:'parent_queue.name' by parent_queue as reservation_list %} -
    -
    -
    -
    -

    Viktig informasjon

    - {% if printer_rule %} -
    - {% trans "Les" %} {% trans "regler for bruk av 3D-printer" %} {% trans "før du starter" %}. -
    - {% endif %} -
    {% trans "Ved å benytte reservasjonssystemet vårt setter vi av våre ressurser (både printer og folk på vakt som følger med). Det er derfor forventet at du møter opp tidsnok (gjerne 5 minutter før avsatt tid) og ikke går over tiden du har booket" %}. +
    +
    +
    +
    +

    Viktig informasjon

    + {% if printer_rule %} +
    + {% trans "Les" %} {% trans "regler for bruk av 3D-printer" %} {% trans "før du starter" %}.
    -
    -
    -
    -

    Tilgjengelige køer

    + {% endif %} +
    {% trans "Ved å benytte reservasjonssystemet vårt setter vi av våre ressurser (både printer og folk på vakt som følger med). Det er derfor forventet at du møter opp tidsnok (gjerne 5 minutter før avsatt tid) og ikke går over tiden du har booket" %}. +
    +
    +
    +
    +

    Tilgjengelige køer

    -
      - {% for queue in object_list %} - {% if not queue.hidden %} -
    • - - - {% if queue.out_of_order %} - {{ queue.name }} - {% trans "I ustand" %} - {% else %} - - {{ queue.name }} - - {% endif %} - -

      - {% trans "Vanskelighetsgrad" %}: {{ queue.get_difficulty_string }} +

        + {% for queue in object_list %} + {% if not queue.hidden %} +
      • + + + {% if queue.out_of_order %} + {{ queue.name }} - {% trans "I ustand" %} + {% else %} + + {{ queue.name }} + + {% endif %} + +

        + {% trans "Vanskelighetsgrad" %}: {{ queue.get_difficulty_string }} +

        +

        {{ queue.description|linebreaks }}

        +
        • + {% endif %} + {% endfor %} +
      +
    +
    +

    {% trans "Mine reservasjoner" %}

    + {% if user.is_authenticated %} + {% for queue in reservation_list %} +
      +
    • {{ queue.grouper }}
      • + {% for reservation in queue.list %} +
    • +

      {% trans "Fra" %} {{ reservation.start }}
      + {% trans "til" %} {{ reservation.end }}

      -

      {{ queue.description|linebreaks }}

      • - {% endif %} - {% endfor %} + {% empty %}

      {% trans "Du har ingen reservasjoner" %}.

      {% endfor %}
    {% endfor %} + {% else %} +
      +
    • {% trans "Logg inn for å se reservasjoner" %}.
    -
    -
    -

    {% trans "Mine reservasjoner" %}

    - {% if user.is_authenticated %} - {% for queue in reservation_list %} -
      -
    • {{ queue.grouper }}
      • - {% for reservation in queue.list %} -
    • -

      {% trans "Fra" %} {{ reservation.start }}
      - {% trans "til" %} {{ reservation.end }} -

      -
      • - {% empty %}

      {% trans "Du har ingen reservasjoner" %}.

      {% endfor %}
    {% endfor %} - {% else %} -
      -
    • {% trans "Logg inn for å se reservasjoner" %}.
      • -
    - LOGG INN - {% endif %} -
    + LOGG INN + {% endif %}
    +
    {% endblock content %} diff --git a/search/templates/search/view.html b/search/templates/search/view.html index 61da5acd8..c6ae5af6e 100644 --- a/search/templates/search/view.html +++ b/search/templates/search/view.html @@ -1,43 +1,34 @@ {% extends 'website/base.html' %} {% load static %} +{% load i18n %} +{% load includeslots %} {% block head %} {% endblock %} {% block content %} -
    -
    -
    -
    -

    - Søk -

    -
    -
    -
    -
    -
    -
    - -
    -
    -
    -
    + {% translate "Søk" as trans_search %} + {% includeslots "website/page_overview/content_title.html" with title=trans_search %} + {% slot children %} +
    +
    +
    -
    -
    -
    -
    -
    -
    +{% endslots %} +
    +
    +
    +
    +
    - - +
    + + {% endblock content %} diff --git a/userprofile/locale/en/LC_MESSAGES/django.po b/userprofile/locale/en/LC_MESSAGES/django.po index f61a1fb12..513bda73a 100644 --- a/userprofile/locale/en/LC_MESSAGES/django.po +++ b/userprofile/locale/en/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-11-27 17:21+0100\n" +"POT-Creation-Date: 2024-02-27 01:01+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,26 +18,43 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: userprofile/templates/userprofile/members.html:16 +#: userprofile/templates/userprofile/edit_profile.html:7 +#: userprofile/templates/userprofile/profile.html:15 +msgid "Innstillinger" +msgstr "Settings" + +#: userprofile/templates/userprofile/edit_profile.html:11 +msgid "Tilbake til profil" +msgstr "Back to profile" + +#: userprofile/templates/userprofile/members.html:13 msgid "Medlemmer i Hackerspace" msgstr "Members in Hackerspace" -#: userprofile/templates/userprofile/members.html:17 +#: userprofile/templates/userprofile/members.html:16 msgid "For oversikt over gruppene og deres medlemmer, se" msgstr "To see an overview of our groups and their members, visit" -#: userprofile/templates/userprofile/members.html:17 +#: userprofile/templates/userprofile/members.html:16 msgid "Om oss" msgstr "About us" -#: userprofile/templates/userprofile/members.html:25 +#: userprofile/templates/userprofile/members.html:20 msgid "Søk etter medlem" msgstr "Search for member" -#: userprofile/templates/userprofile/members.html:31 +#: userprofile/templates/userprofile/members.html:24 msgid "Klikk på ferdigheter du vil se folk ikke har" msgstr "Click on skills to see what people do not have" #: userprofile/templates/userprofile/members_list.html:32 msgid "Det finnes ingen profiler etter dine søkekriterier" msgstr "There are no members with your search criteria" + +#: userprofile/templates/userprofile/profile.html:11 +msgid "Brukerprofil" +msgstr "Profile" + +#: userprofile/templates/userprofile/skills.html:13 +msgid "Ferdigheter" +msgstr "Skills" diff --git a/userprofile/locale/nb/LC_MESSAGES/django.po b/userprofile/locale/nb/LC_MESSAGES/django.po index 0a4130a23..bada92ca7 100644 --- a/userprofile/locale/nb/LC_MESSAGES/django.po +++ b/userprofile/locale/nb/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-11-27 17:21+0100\n" +"POT-Creation-Date: 2024-02-27 01:01+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,26 +18,43 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: userprofile/templates/userprofile/members.html:16 +#: userprofile/templates/userprofile/edit_profile.html:7 +#: userprofile/templates/userprofile/profile.html:15 +msgid "Innstillinger" +msgstr "" + +#: userprofile/templates/userprofile/edit_profile.html:11 +msgid "Tilbake til profil" +msgstr "" + +#: userprofile/templates/userprofile/members.html:13 msgid "Medlemmer i Hackerspace" msgstr "" -#: userprofile/templates/userprofile/members.html:17 +#: userprofile/templates/userprofile/members.html:16 msgid "For oversikt over gruppene og deres medlemmer, se" msgstr "" -#: userprofile/templates/userprofile/members.html:17 +#: userprofile/templates/userprofile/members.html:16 msgid "Om oss" msgstr "" -#: userprofile/templates/userprofile/members.html:25 +#: userprofile/templates/userprofile/members.html:20 msgid "Søk etter medlem" msgstr "" -#: userprofile/templates/userprofile/members.html:31 +#: userprofile/templates/userprofile/members.html:24 msgid "Klikk på ferdigheter du vil se folk ikke har" msgstr "" #: userprofile/templates/userprofile/members_list.html:32 msgid "Det finnes ingen profiler etter dine søkekriterier" msgstr "" + +#: userprofile/templates/userprofile/profile.html:11 +msgid "Brukerprofil" +msgstr "" + +#: userprofile/templates/userprofile/skills.html:13 +msgid "Ferdigheter" +msgstr "" diff --git a/userprofile/templates/userprofile/edit_profile.html b/userprofile/templates/userprofile/edit_profile.html index 052f0556b..8a09aaf37 100644 --- a/userprofile/templates/userprofile/edit_profile.html +++ b/userprofile/templates/userprofile/edit_profile.html @@ -1,155 +1,154 @@ {% extends 'website/base.html' %} {% load static %} +{% load i18n %} +{% load includeslots %} + {% block content %} -
    -
    -
    -
    -

    Innstillinger

    - Tilbake til profil -
    + {% translate "Innstillinger" as trans_settings %} + {% includeslots "website/page_overview/content_title.html" with title=trans_settings %} + {% slot children %} + {% trans "Tilbake til profil" %} +{% endslots %} + +
    +
    +
    +
    + {% if profile.image %} + + {% else %} + + {% endif %} +
    +
    +

    {{ profile.user.get_full_name }}

    +
    {{ profile.get_main_group }}
    -
    -
    -
    -
    -
    - {% if profile.image %} - - {% else %} - - {% endif %} -
    -
    -

    {{ profile.user.get_full_name }}

    -
    {{ profile.get_main_group }}
    + + {% csrf_token %} +
    +
    +
    Profilbilde
    +
    +
    +
    + {{ form.image }} + {{ form.image.errors }}
    - - {% csrf_token %} -
    -
    -
    Profilbilde
    -
    -
    -
    - {{ form.image }} - {{ form.image.errors }} -
    -
    -
    -
    -
    Grunnleggende
    -
    -
    -
    -
    - {{ form.phone_number }} - - {{ form.phone_number.help_text }} - {{ form.phone_number.errors }} -
    -
    - {{ form.study }} - - {{ form.study.errors }} -
    -
    -

    - -

    - {{ form.show_email.errors }} -
    -
    -
    -
    -
    Spill og Sosialt
    -
    -
    -
    -
    - {{ form.social_discord }} - - {{ form.social_discord.errors }} -
    -
    - {{ form.social_steam }} - - {{ form.social_steam.errors }} -
    -
    - {{ form.social_battlenet }} - - {{ form.social_battlenet.errors }} -
    -
    - {{ form.social_git }} - - {{ form.social_git.errors }} -
    -
    -

    - -

    - {{ form.limit_social.errors }} -
    -
    -
    -
    -
    Mat og Allergier
    -

    Merk at disse ikke vil vises på din profil. Arrangør får kun opp aktuelle matønsker uten - navn.

    -
    -
    -
    -
    -

    - -

    - {{ form.allergi_gluten.errors }} -
    -
    -

    - -

    - {{ form.allergi_vegetar.errors }} -
    -
    -

    - -

    - {{ form.allergi_vegan.errors }} -
    -
    - {{ form.allergi_annet }} - - {{ form.allergi_annet.errors }} -
    - {% for hidden in form.hidden_fields %} - {{ hidden }} - {% endfor %} -
    -
    - -
    - -
    +
    +
    +
    Grunnleggende
    +
    +
    +
    +
    + {{ form.phone_number }} + + {{ form.phone_number.help_text }} + {{ form.phone_number.errors }} +
    +
    + {{ form.study }} + + {{ form.study.errors }} +
    +
    +

    + +

    + {{ form.show_email.errors }} +
    +
    +
    +
    +
    Spill og Sosialt
    +
    +
    +
    +
    + {{ form.social_discord }} + + {{ form.social_discord.errors }} +
    +
    + {{ form.social_steam }} + + {{ form.social_steam.errors }} +
    +
    + {{ form.social_battlenet }} + + {{ form.social_battlenet.errors }} +
    +
    + {{ form.social_git }} + + {{ form.social_git.errors }} +
    +
    +

    + +

    + {{ form.limit_social.errors }} +
    +
    +
    +
    +
    Mat og Allergier
    +

    Merk at disse ikke vil vises på din profil. Arrangør får kun opp aktuelle matønsker uten + navn.

    +
    +
    +
    +
    +

    + +

    + {{ form.allergi_gluten.errors }} +
    +
    +

    + +

    + {{ form.allergi_vegetar.errors }} +
    +
    +

    + +

    + {{ form.allergi_vegan.errors }} +
    +
    + {{ form.allergi_annet }} + + {{ form.allergi_annet.errors }} +
    + {% for hidden in form.hidden_fields %} + {{ hidden }} + {% endfor %} +
    +
    + +
    +
    +
    {% endblock %} diff --git a/userprofile/templates/userprofile/members.html b/userprofile/templates/userprofile/members.html index a709173c0..bea975b11 100644 --- a/userprofile/templates/userprofile/members.html +++ b/userprofile/templates/userprofile/members.html @@ -1,6 +1,7 @@ {% extends 'website/base.html' %} {% load static %} {% load i18n %} +{% load includeslots %} {% block head %} @@ -9,112 +10,104 @@ {% endblock %} {% block content %} -
    -
    -
    -
    -

    {% trans "Medlemmer i Hackerspace" %}

    -

    {% trans "For oversikt over gruppene og deres medlemmer, se" %} {% trans "Om oss" %}.

    -
    -
    -
    -
    -
    - -
    - -
    -
    -
    -
    - {% if perms.userprofile.is_active_member %} -

    {% trans 'Klikk på ferdigheter du vil se folk ikke har' %}

    -
    - {% for category in skill_categories %} - - {% endfor %} -
    - {% endif %} + {% translate "Medlemmer i Hackerspace" as trans_members %} + {% includeslots "website/page_overview/content_title.html" with title=trans_members %} + {% slot children %} +

    {% trans "For oversikt over gruppene og deres medlemmer, se" %} {% trans "Om oss" %}.

    +
    + +
    +
    -
    -
    -
    + {% if perms.userprofile.is_active_member %} +

    {% trans 'Klikk på ferdigheter du vil se folk ikke har' %}

    +
    + {% for category in skill_categories %} + + {% endfor %}
    + {% endif %} +{% endslots %} + +
    +
    +
    +
    + + + // Update url to allow direct links to search + const state = window.history.state; + const title = window.document.title; + window.history.pushState(state, title, url); + + } + + {% endblock %} diff --git a/userprofile/templates/userprofile/profile.html b/userprofile/templates/userprofile/profile.html index f4ccc4a54..342cbf869 100644 --- a/userprofile/templates/userprofile/profile.html +++ b/userprofile/templates/userprofile/profile.html @@ -1,112 +1,111 @@ {% extends 'website/base.html' %} {% load static %} +{% load i18n %} +{% load includeslots %} {% block header %} {% endblock %} {% block content %} -
    -
    -
    -
    -

    Brukerprofil

    - {% if user == profile.user %} - Innstillinger + + {% translate "Brukerprofil" as trans_profile %} + {% includeslots "website/page_overview/content_title.html" with title=trans_profile %} + {% slot children %} + {% if user == profile.user %} + {% trans "Innstillinger" %} + {% endif %} +{% endslots %} + +
    +
    +
    +
    +
    + {% if profile.image %} + + {% else %} + {% endif %}
    -
    -
    -
    -
    -
    -
    -
    -
    - {% if profile.image %} - - {% else %} - - {% endif %} -
    -
    -

    {{ profile.user.get_full_name }}

    -
    {{ profile.get_main_group }}
    -
    +
    +

    {{ profile.user.get_full_name }}

    +
    {{ profile.get_main_group }}
    -
    -
    - {% if profile.image %} - - {% else %} - - {% endif %} -

    {{ profile.user.get_full_name }}

    -
    {{ profile.get_main_group }}
    -
    +
    +
    +
    + {% if profile.image %} + + {% else %} + + {% endif %} +

    {{ profile.user.get_full_name }}

    +
    {{ profile.get_main_group }}
    -
    -
    -
    +
    +
    +
      +
    • +
      + Ferdigheter + + open_in_new + +

      Avmerket sirkel betyr ferdigheten er oppnådd

      +
      +
      • + {% for category, level in category_levels %} +
    • + +
      + + {% if level %} + check + {% endif %} + +
      +
      + {{ category }} + + info -

      Avmerket sirkel betyr ferdigheten er oppnådd

      - +
      • - {% for category, level in category_levels %} -
    • - -
      - - {% if level %} - check - {% endif %} - -
      -
      - {{ category }} - - info - -
      -
      • - {% endfor %} -
    -
    -
    -
      -
    • Basisinformasjon
      • - {% if profile.study %} -
    • Studerer {{ profile.study }}
      • - {% endif %} - {% if profile.user.email and profile.show_email %} -
    • {{ profile.user.email }}
      • - {% endif %} - {% if profile.limit_social %} - {% if perms.userprofile.is_active_member or profile.user == request.user %} - {% include "userprofile/_social_fields.html" %} - {% endif %} - {% else %} + {% endfor %} +
    +
    +
    +
      +
    • Basisinformasjon
      • + {% if profile.study %} +
    • Studerer {{ profile.study }}
      • + {% endif %} + {% if profile.user.email and profile.show_email %} +
    • {{ profile.user.email }}
      • + {% endif %} + {% if profile.limit_social %} + {% if perms.userprofile.is_active_member or profile.user == request.user %} {% include "userprofile/_social_fields.html" %} {% endif %} -
    -
    + {% else %} + {% include "userprofile/_social_fields.html" %} + {% endif %} +
-
-
-
-
-
-
- Tilbake til medlemsliste -
+
+
+
+
+
+
+
+ Tilbake til medlemsliste
+
{% endblock %} diff --git a/userprofile/templates/userprofile/skills.html b/userprofile/templates/userprofile/skills.html index cdd2cd181..139dbd831 100644 --- a/userprofile/templates/userprofile/skills.html +++ b/userprofile/templates/userprofile/skills.html @@ -1,5 +1,6 @@ {% extends "website/base.html" %} {% load static %} +{% load i18n %} {% block header %} {{ jquery | safe }} @@ -8,15 +9,10 @@ {% endblock %} {% block content %} -
-
-
-
-

Ferdigheter

-
-
-
-
+ + {% translate "Ferdigheter" as trans_skills %} + {% include "website/page_overview/content_title.html" with title=trans_skills %} +
diff --git a/watchlist/locale/en/LC_MESSAGES/django.po b/watchlist/locale/en/LC_MESSAGES/django.po index c66657f08..faf8dc31d 100644 --- a/watchlist/locale/en/LC_MESSAGES/django.po +++ b/watchlist/locale/en/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-11-27 17:21+0100\n" +"POT-Creation-Date: 2024-02-24 15:22+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,7 +18,11 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: watchlist/templates/watchlist/watchlist.html:19 +#: watchlist/templates/watchlist/watchlist.html:14 +msgid "Vaktliste" +msgstr "" + +#: watchlist/templates/watchlist/watchlist.html:15 msgid "" "Vaktlisten gir en oversikt over når verkstedet er åpent og bemannet, og hva " "slags kompetanse de vakthavende har" @@ -26,41 +30,41 @@ msgstr "" "The shift schedule provides an overview of when the workshop is open and " "staffed, and what kind of expertise the staff members have" -#: watchlist/templates/watchlist/watchlist.html:108 +#: watchlist/templates/watchlist/watchlist.html:101 msgid "Tid" msgstr "Time" -#: watchlist/templates/watchlist/watchlist.html:190 -#: watchlist/templates/watchlist/watchlist.html:199 -#: watchlist/templates/watchlist/watchlist.html:208 -#: watchlist/templates/watchlist/watchlist.html:217 +#: watchlist/templates/watchlist/watchlist.html:183 +#: watchlist/templates/watchlist/watchlist.html:192 +#: watchlist/templates/watchlist/watchlist.html:201 +#: watchlist/templates/watchlist/watchlist.html:210 msgid "Verkstedet er" msgstr "The workshop is" -#: watchlist/templates/watchlist/watchlist.html:190 +#: watchlist/templates/watchlist/watchlist.html:183 msgid "stengt" msgstr "closed" -#: watchlist/templates/watchlist/watchlist.html:191 +#: watchlist/templates/watchlist/watchlist.html:184 msgid "Ingen på vakt" msgstr "No one on duty" -#: watchlist/templates/watchlist/watchlist.html:199 -#: watchlist/templates/watchlist/watchlist.html:208 -#: watchlist/templates/watchlist/watchlist.html:217 +#: watchlist/templates/watchlist/watchlist.html:192 +#: watchlist/templates/watchlist/watchlist.html:201 +#: watchlist/templates/watchlist/watchlist.html:210 msgid "åpent" msgstr "open" -#: watchlist/templates/watchlist/watchlist.html:200 +#: watchlist/templates/watchlist/watchlist.html:193 msgid "person på vakt" msgstr "person on duty" -#: watchlist/templates/watchlist/watchlist.html:209 -#: watchlist/templates/watchlist/watchlist.html:218 +#: watchlist/templates/watchlist/watchlist.html:202 +#: watchlist/templates/watchlist/watchlist.html:211 msgid "personer på vakt" msgstr "people on duty" -#: watchlist/templates/watchlist/watchlist.html:224 +#: watchlist/templates/watchlist/watchlist.html:217 msgid "" "Hvis ferdighetskulen er avmerket viser det oppnåd ferdighet blant alle som " "er på vakt." diff --git a/watchlist/locale/nb/LC_MESSAGES/django.po b/watchlist/locale/nb/LC_MESSAGES/django.po index 514e4def7..c9a546a0e 100644 --- a/watchlist/locale/nb/LC_MESSAGES/django.po +++ b/watchlist/locale/nb/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-11-27 17:21+0100\n" +"POT-Creation-Date: 2024-02-24 15:22+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,47 +18,51 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: watchlist/templates/watchlist/watchlist.html:19 +#: watchlist/templates/watchlist/watchlist.html:14 +msgid "Vaktliste" +msgstr "" + +#: watchlist/templates/watchlist/watchlist.html:15 msgid "" "Vaktlisten gir en oversikt over når verkstedet er åpent og bemannet, og hva " "slags kompetanse de vakthavende har" msgstr "" -#: watchlist/templates/watchlist/watchlist.html:108 +#: watchlist/templates/watchlist/watchlist.html:101 msgid "Tid" msgstr "" -#: watchlist/templates/watchlist/watchlist.html:190 -#: watchlist/templates/watchlist/watchlist.html:199 -#: watchlist/templates/watchlist/watchlist.html:208 -#: watchlist/templates/watchlist/watchlist.html:217 +#: watchlist/templates/watchlist/watchlist.html:183 +#: watchlist/templates/watchlist/watchlist.html:192 +#: watchlist/templates/watchlist/watchlist.html:201 +#: watchlist/templates/watchlist/watchlist.html:210 msgid "Verkstedet er" msgstr "" -#: watchlist/templates/watchlist/watchlist.html:190 +#: watchlist/templates/watchlist/watchlist.html:183 msgid "stengt" msgstr "" -#: watchlist/templates/watchlist/watchlist.html:191 +#: watchlist/templates/watchlist/watchlist.html:184 msgid "Ingen på vakt" msgstr "" -#: watchlist/templates/watchlist/watchlist.html:199 -#: watchlist/templates/watchlist/watchlist.html:208 -#: watchlist/templates/watchlist/watchlist.html:217 +#: watchlist/templates/watchlist/watchlist.html:192 +#: watchlist/templates/watchlist/watchlist.html:201 +#: watchlist/templates/watchlist/watchlist.html:210 msgid "åpent" msgstr "" -#: watchlist/templates/watchlist/watchlist.html:200 +#: watchlist/templates/watchlist/watchlist.html:193 msgid "person på vakt" msgstr "" -#: watchlist/templates/watchlist/watchlist.html:209 -#: watchlist/templates/watchlist/watchlist.html:218 +#: watchlist/templates/watchlist/watchlist.html:202 +#: watchlist/templates/watchlist/watchlist.html:211 msgid "personer på vakt" msgstr "" -#: watchlist/templates/watchlist/watchlist.html:224 +#: watchlist/templates/watchlist/watchlist.html:217 msgid "" "Hvis ferdighetskulen er avmerket viser det oppnåd ferdighet blant alle som " "er på vakt." diff --git a/watchlist/templates/watchlist/watchlist.html b/watchlist/templates/watchlist/watchlist.html index fce29ca51..768148290 100644 --- a/watchlist/templates/watchlist/watchlist.html +++ b/watchlist/templates/watchlist/watchlist.html @@ -11,16 +11,9 @@ {% endblock %} {% block content %} -
-
-
-
-

Vaktliste

-

{% trans "Vaktlisten gir en oversikt over når verkstedet er åpent og bemannet, og hva slags kompetanse de vakthavende har" %}.

-
-
-
-
+ {% translate "Vaktliste" as trans_watchlist %} + {% translate "Vaktlisten gir en oversikt over når verkstedet er åpent og bemannet, og hva slags kompetanse de vakthavende har" as trans_watchlist_description %} + {% include "website/page_overview/content_title.html" with title=trans_watchlist description=trans_watchlist_description %} {% if perms.watchlist.delete_shiftslot %} {% include "watchlist/_watchlist_admin_banner.html" %} diff --git a/website/locale/en/LC_MESSAGES/django.po b/website/locale/en/LC_MESSAGES/django.po index 14fcbedf3..0c6ef7ae4 100644 --- a/website/locale/en/LC_MESSAGES/django.po +++ b/website/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: 2023-11-27 17:21+0100\n" +"POT-Creation-Date: 2024-02-27 01:01+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,15 +17,35 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#: website/templates/website/403.html:14 +msgid "Forbudt! Hut dæ ut!" +msgstr "Unauthorized! Get out!" + +#: website/templates/website/403.html:15 +msgid "Eller prøv å logge inn..." +msgstr "Or try to log in..." + +#: website/templates/website/404.html:11 +msgid "404 - Ikke funnet" +msgstr "" + +#: website/templates/website/404.html:19 +msgid "Vi finner dessverre ikke siden du leter etter." +msgstr "" + +#: website/templates/website/500.html:10 +msgid "500 - Noe har gått galt" +msgstr "" + #: website/templates/website/_social_buttons.html:8 msgid "Søk Hackerspace" msgstr "Apply to Hackerspace" -#: website/templates/website/about.html:9 +#: website/templates/website/about.html:5 msgid "Om Hackerspace NTNU" msgstr "About Hackerspace NTNU" -#: website/templates/website/about.html:22 +#: website/templates/website/about.html:16 msgid "" "Hackerspace NTNU er et studentdrevet prosjekt åpent for alle studenter " "uansett studieretning eller Hackerspace-medlemsskap. Vi tilbyr en kreativ " @@ -39,7 +59,7 @@ msgstr "" "technology at your disposal, including 3D printers and Virtual Reality " "equipment." -#: website/templates/website/about.html:23 +#: website/templates/website/about.html:17 msgid "" "Om du er en førsteklassing som trenger hjelp med ditt første Arduino-" "prosjekt eller en fjerdeklassing som ønsker å lage en 3D-modell av " @@ -52,49 +72,55 @@ msgstr "" "Trondheim, we can provide both equipment and expertise. We also regularly " "offer courses for both beginners and advanced users in many exciting topics." -#: website/templates/website/about.html:24 +#: website/templates/website/about.html:18 msgid "Kom innom for å se hva vi driver med og slå av en prat" msgstr "Come by to see what we are doing and have a chat. " -#: website/templates/website/about.html:24 +#: website/templates/website/about.html:18 msgid "" "Du finner oss i andre etasje i A-blokka på Realfagbygget, NTNU Gløshaugen" msgstr "" "You will find us on the second floor of the A-building sat Realfagbygget, " "NTNU Gløshaugen." -#: website/templates/website/about.html:25 +#: website/templates/website/about.html:19 msgid "Vis kart" msgstr "Map" -#: website/templates/website/about.html:34 +#: website/templates/website/about.html:28 msgid "Ofte stilte spørsmål" msgstr "FAQ" -#: website/templates/website/about.html:51 +#: website/templates/website/about.html:45 msgid "Våre aktive grupper" msgstr "Active groups" -#: website/templates/website/about.html:77 +#: website/templates/website/about.html:71 msgid "Leder" msgstr "Leader" -#: website/templates/website/about.html:80 +#: website/templates/website/about.html:74 msgid "Nestleder" msgstr "Deputy Leader" -#: website/templates/website/about.html:83 +#: website/templates/website/about.html:77 msgid "Økonomiansvarlig" msgstr "Financial Manager" -#: website/templates/website/about.html:87 +#: website/templates/website/about.html:81 msgid "E-post" msgstr "E-mail" -#: website/templates/website/about.html:108 +#: website/templates/website/about.html:102 msgid "Ingen medlemmer er lagt til enda" msgstr "No members added yet" +#: website/templates/website/admin.html:5 +#, fuzzy +#| msgid "Adminpanel" +msgid "Administratorpanel" +msgstr "Admin page" + #: website/templates/website/footer.html:9 msgid "Velkommen innom" msgstr "Welcome to" @@ -154,7 +180,7 @@ msgstr "About us" #: website/templates/website/footer.html:35 #: website/templates/website/header.html:129 #: website/templates/website/header.html:213 -#: website/templates/website/rules.html:15 +#: website/templates/website/rules.html:10 msgid "Regler" msgstr "Rules" @@ -391,21 +417,53 @@ msgstr "Recent news" msgid "Siste arrangementer" msgstr "Recent events" -#: website/templates/website/rules.html:17 +#: website/templates/website/rules.html:11 msgid "Nøvendig informasjon og regler for bruk av verkstedet og diverse utstyr" msgstr "Necessary information and rules for the workshop and its equipment" -#: website/templates/website/rules.html:43 -#: website/templates/website/rules.html:49 +#: website/templates/website/rules.html:35 +#: website/templates/website/rules.html:41 #, fuzzy #| msgid "Internportal" msgid "Intern" msgstr "Internal portal" -#: website/templates/website/rules.html:56 +#: website/templates/website/rules.html:48 msgid "Fant ingen regler 🤠" msgstr "No rules found" +#: website/templates/website/tos-returningls.html:12 +msgid "" +"Vi har oppdatert våre retningslinjer for behandling av personinformasjon" +msgstr "" +"We have updated our privacy policy" + +#: website/templates/website/tos-returningls.html:16 +msgid "" +"I forbindelse med nye lovverk (vektlagt er Personvernforordningen, også " +"kjent som GDPR) og formalisering internt i organisasjonen, ønsker vi å " +"informere og innhente nytt samtykke om bruk av personvern i Hackerspace." +msgstr "" +"With regulations for personal information (GDPR), we whish to inform " +"you about our updated privacy policy. We request that you concent to our " +"terms and conditions in Hackerspace NTNU." + +#: website/templates/website/tos-returningls.html:18 +msgid "" +"Vennligst bekreft at du har lest og godtar informasjonen og samtykker til " +"vilkårene tilgjengelig" +msgstr "" +"Please confirm that you have read and accepted the information and concent to the terms" + +#: website/templates/website/tos-returningls.html:18 +#, fuzzy +msgid "her" +msgstr "here" + +#: website/templates/website/tos-returningls.html:19 +msgid "JEG HAR LEST, FORSTÅTT OG GODTAR VILKÅRENE" +msgstr "I HAVE READ, UNDERSTOOD, AND ACCEPTED THE TERMS" + #, fuzzy #~| msgid "Siste nytt" #~ msgid "Siste internnytt" @@ -435,6 +493,3 @@ msgstr "No rules found" #~ msgid "Bildegalleri" #~ msgstr "Gallery" - -#~ msgid "Adminpanel" -#~ msgstr "Admin page" diff --git a/website/locale/nb/LC_MESSAGES/django.po b/website/locale/nb/LC_MESSAGES/django.po index 93ed282a8..3c994c48c 100644 --- a/website/locale/nb/LC_MESSAGES/django.po +++ b/website/locale/nb/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-11-27 17:21+0100\n" +"POT-Creation-Date: 2024-02-27 01:01+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,15 +17,35 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#: website/templates/website/403.html:14 +msgid "Forbudt! Hut dæ ut!" +msgstr "" + +#: website/templates/website/403.html:15 +msgid "Eller prøv å logge inn..." +msgstr "" + +#: website/templates/website/404.html:11 +msgid "404 - Ikke funnet" +msgstr "" + +#: website/templates/website/404.html:19 +msgid "Vi finner dessverre ikke siden du leter etter." +msgstr "" + +#: website/templates/website/500.html:10 +msgid "500 - Noe har gått galt" +msgstr "" + #: website/templates/website/_social_buttons.html:8 msgid "Søk Hackerspace" msgstr "" -#: website/templates/website/about.html:9 +#: website/templates/website/about.html:5 msgid "Om Hackerspace NTNU" msgstr "" -#: website/templates/website/about.html:22 +#: website/templates/website/about.html:16 msgid "" "Hackerspace NTNU er et studentdrevet prosjekt åpent for alle studenter " "uansett studieretning eller Hackerspace-medlemsskap. Vi tilbyr en kreativ " @@ -35,7 +55,7 @@ msgid "" "Reality-utstyr" msgstr "" -#: website/templates/website/about.html:23 +#: website/templates/website/about.html:17 msgid "" "Om du er en førsteklassing som trenger hjelp med ditt første Arduino-" "prosjekt eller en fjerdeklassing som ønsker å lage en 3D-modell av " @@ -44,47 +64,51 @@ msgid "" "emner" msgstr "" -#: website/templates/website/about.html:24 +#: website/templates/website/about.html:18 msgid "Kom innom for å se hva vi driver med og slå av en prat" msgstr "" -#: website/templates/website/about.html:24 +#: website/templates/website/about.html:18 msgid "" "Du finner oss i andre etasje i A-blokka på Realfagbygget, NTNU Gløshaugen" msgstr "" -#: website/templates/website/about.html:25 +#: website/templates/website/about.html:19 msgid "Vis kart" msgstr "" -#: website/templates/website/about.html:34 +#: website/templates/website/about.html:28 msgid "Ofte stilte spørsmål" msgstr "" -#: website/templates/website/about.html:51 +#: website/templates/website/about.html:45 msgid "Våre aktive grupper" msgstr "" -#: website/templates/website/about.html:77 +#: website/templates/website/about.html:71 msgid "Leder" msgstr "" -#: website/templates/website/about.html:80 +#: website/templates/website/about.html:74 msgid "Nestleder" msgstr "" -#: website/templates/website/about.html:83 +#: website/templates/website/about.html:77 msgid "Økonomiansvarlig" msgstr "" -#: website/templates/website/about.html:87 +#: website/templates/website/about.html:81 msgid "E-post" msgstr "" -#: website/templates/website/about.html:108 +#: website/templates/website/about.html:102 msgid "Ingen medlemmer er lagt til enda" msgstr "" +#: website/templates/website/admin.html:5 +msgid "Administratorpanel" +msgstr "" + #: website/templates/website/footer.html:9 msgid "Velkommen innom" msgstr "" @@ -142,7 +166,7 @@ msgstr "" #: website/templates/website/footer.html:35 #: website/templates/website/header.html:129 #: website/templates/website/header.html:213 -#: website/templates/website/rules.html:15 +#: website/templates/website/rules.html:10 msgid "Regler" msgstr "" @@ -359,15 +383,41 @@ msgstr "" msgid "Siste arrangementer" msgstr "" -#: website/templates/website/rules.html:17 +#: website/templates/website/rules.html:11 msgid "Nøvendig informasjon og regler for bruk av verkstedet og diverse utstyr" msgstr "" -#: website/templates/website/rules.html:43 -#: website/templates/website/rules.html:49 +#: website/templates/website/rules.html:35 +#: website/templates/website/rules.html:41 msgid "Intern" msgstr "" -#: website/templates/website/rules.html:56 +#: website/templates/website/rules.html:48 msgid "Fant ingen regler 🤠" msgstr "" + +#: website/templates/website/tos-returningls.html:12 +msgid "" +"Vi har oppdatert våre retningslinjer for behandling av personinformasjon" +msgstr "" + +#: website/templates/website/tos-returningls.html:16 +msgid "" +"I forbindelse med nye lovverk (vektlagt er Personvernforordningen, også " +"kjent som GDPR) og formalisering internt i organisasjonen, ønsker vi å " +"informere og innhente nytt samtykke om bruk av personvern i Hackerspace." +msgstr "" + +#: website/templates/website/tos-returningls.html:18 +msgid "" +"Vennligst bekreft at du har lest og godtar informasjonen og samtykker til " +"vilkårene tilgjengelig" +msgstr "" + +#: website/templates/website/tos-returningls.html:18 +msgid "her" +msgstr "" + +#: website/templates/website/tos-returningls.html:19 +msgid "JEG HAR LEST, FORSTÅTT OG GODTAR VILKÅRENE" +msgstr "" diff --git a/website/templates/website/403.html b/website/templates/website/403.html index bad9a9545..2d5bea13f 100644 --- a/website/templates/website/403.html +++ b/website/templates/website/403.html @@ -1,35 +1,37 @@ {% extends "website/base.html" %} {% load static %} +{% load i18n %} +{% load includeslots %} {% block content %} -
-
-
- -
-

403

-

Forbudt! Hut dæ ut!

-

Eller prøv å logge inn...

-
- -
+ + {% includeslots "website/page_overview/content_title.html" %} + {% slot children %} +
+ +
+

403

+

{% trans "Forbudt! Hut dæ ut!" %}

+

{% trans "Eller prøv å logge inn..." %}

+
-
-
-
-
-
- Logg inn -
-

- Dette hadde du ikke mye lov til å titte på! -
- Hvis du allikevel mener du burde kunne se på dette, kanskje du skulle prøvd å logge inn først? -

+{% endslots %} +
+
+
+
+
+ Logg inn
+

+ Dette hadde du ikke mye lov til å titte på! +
+ Hvis du allikevel mener du burde kunne se på dette, kanskje du skulle prøvd å logge inn først? +

- +
+ {% endblock %} diff --git a/website/templates/website/404.html b/website/templates/website/404.html index c6fe78a96..8377c7876 100644 --- a/website/templates/website/404.html +++ b/website/templates/website/404.html @@ -1,25 +1,26 @@ {% extends "website/base.html" %} {% load static %} +{% load i18n %} +{% load includeslots %} {% block content %} -
-
-
-

OOPS!

-

404 - Ikke funnet

-
-
+ {% includeslots "website/page_overview/content_title.html" %} + {% slot children %} +
+

OOPS!

+

{% trans "404 - Ikke funnet" %}

-
-
-
-
-

- Vi finner dessverre ikke siden du leter etter. :-(
-

-
+{% endslots %} +
+
+
+
+

+ {% trans "Vi finner dessverre ikke siden du leter etter." %} :-(
+

- +
+ {% endblock %} diff --git a/website/templates/website/500.html b/website/templates/website/500.html index e3fe62435..2236b554c 100644 --- a/website/templates/website/500.html +++ b/website/templates/website/500.html @@ -1,21 +1,22 @@ {% extends "website/base.html" %} {% load static %} +{% load i18n %} +{% load includeslots %} {% block content %} -
-
-
-

OOPS!

-

500 - Noe har gått galt

-
-
+ {% includeslots "website/page_overview/content_title.html" %} + {% slot children %} +
+

OOPS!

+

{% trans "500 - Noe har gått galt" %}

-
-
-
-
-

Vår server føler seg ikke helt i toppform i dag, men en melding er sendt til våre utviklere som kommer med kyllingsuppe og varmeflaske så fort som mulig.

-
+{% endslots %} +
+
+
+
+

Vår server føler seg ikke helt i toppform i dag, men en melding er sendt til våre utviklere som kommer med kyllingsuppe og varmeflaske så fort som mulig.

+
{% endblock %} diff --git a/website/templates/website/about.html b/website/templates/website/about.html index 530b52873..a6800215e 100644 --- a/website/templates/website/about.html +++ b/website/templates/website/about.html @@ -2,15 +2,9 @@ {% load static %} {% load i18n %} {% block content %} -
-
-
-
-

{% trans "Om Hackerspace NTNU" %}

-
-
-
-
+ {% translate "Om Hackerspace NTNU" as trans_about_hs %} + {% include "website/page_overview/content_title.html" with title=trans_about_hs %} +
diff --git a/website/templates/website/admin.html b/website/templates/website/admin.html index 436a369f1..9510ec5a0 100644 --- a/website/templates/website/admin.html +++ b/website/templates/website/admin.html @@ -2,13 +2,8 @@ {% load static %} {% block content %} -
-
-
-

Administratorpanel

-
-
-
+ {% translate "Administratorpanel" as trans_admin %} + {% include "website/page_overview/content_title.html" with title=trans_admin %}
diff --git a/website/templates/website/flatpages/default.html b/website/templates/website/flatpages/default.html index 3a3cf8db3..c15e9a6aa 100644 --- a/website/templates/website/flatpages/default.html +++ b/website/templates/website/flatpages/default.html @@ -1,27 +1,28 @@ {% extends "website/base.html" %} {% load thumbnail %} +{% load includeslots %} {% block content %} -
-
-
-

{{ flatpage.title }}

-
-
+ + {% includeslots "website/page_overview/content_title.html" %} + {% slot children %} +
+

{{ flatpage.title }}

-
-
-
-
-
-
-

{{ flatpage.content }}

-
+{% endslots %} +
+
+
+
+
+
+

{{ flatpage.content }}

+
{% endblock %} diff --git a/website/templates/website/page_header.html b/website/templates/website/page_header.html deleted file mode 100644 index 1da17f4da..000000000 --- a/website/templates/website/page_header.html +++ /dev/null @@ -1,9 +0,0 @@ -
-
-
-
-

{{ title }}

-
-
-
-
diff --git a/website/templates/website/page_overview/content_title.html b/website/templates/website/page_overview/content_title.html new file mode 100644 index 000000000..dfccecef1 --- /dev/null +++ b/website/templates/website/page_overview/content_title.html @@ -0,0 +1,11 @@ +
+
+
+

+ {{ title }} +

+

{{ description }}

+ {{children}} +
+
+
diff --git a/website/templates/website/rules.html b/website/templates/website/rules.html index ed51753ad..1c72de207 100644 --- a/website/templates/website/rules.html +++ b/website/templates/website/rules.html @@ -7,18 +7,10 @@ {% endblock header %} {% block content %} -
-
-
-
-

- {% trans "Regler" %} -

-

{%trans "Nøvendig informasjon og regler for bruk av verkstedet og diverse utstyr" %}

-
-
-
-
+ {% translate "Regler" as trans_rules %} + {% translate "Nøvendig informasjon og regler for bruk av verkstedet og diverse utstyr" as trans_rules_desc %} + {% include "website/page_overview/content_title.html" with title=trans_rules description=trans_rules_desc %} +
diff --git a/website/templates/website/tos-returningls.html b/website/templates/website/tos-returningls.html index 8a98c5468..f2b6267bf 100644 --- a/website/templates/website/tos-returningls.html +++ b/website/templates/website/tos-returningls.html @@ -1,6 +1,7 @@ {% extends "website/base.html" %} {% load static %} +{% load i18n %} {% block header %} @@ -8,19 +9,14 @@ {% block content %} -
-
-
-

Vi har oppdatert våre retningslinjer for behandling av personinformasjon

-
-
-
+ {% translate "Vi har oppdatert våre retningslinjer for behandling av personinformasjon" as trans_updated_tos %} + {% include "website/page_overview/content_title.html" with title=trans_updated_tos %}
-

I forbindelse med nye lovverk (vektlagt er Personvernforordningen, også kjent som GDPR) og formalisering internt i organisasjonen, ønsker vi å informere og innhente nytt samtykke om bruk av personvern i Hackerspace.

+

{% trans "I forbindelse med nye lovverk (vektlagt er Personvernforordningen, også kjent som GDPR) og formalisering internt i organisasjonen, ønsker vi å informere og innhente nytt samtykke om bruk av personvern i Hackerspace." %}

-

Vennligst bekreft at du har lest og godtar informasjonen og samtykker til vilkårene tilgjengelig her

- JEG HAR LEST, FORSTÅTT OG GODTAR VILKÅRENE +

{% trans "Vennligst bekreft at du har lest og godtar informasjonen og samtykker til vilkårene tilgjengelig" %} {% trans "her" %}

+ {% trans "JEG HAR LEST, FORSTÅTT OG GODTAR VILKÅRENE" %}
diff --git a/website/templatetags/__init__.py b/website/templatetags/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/website/templatetags/includeslots.py b/website/templatetags/includeslots.py new file mode 100644 index 000000000..59c739049 --- /dev/null +++ b/website/templatetags/includeslots.py @@ -0,0 +1,80 @@ +from dataclasses import dataclass +from typing import List + +from django import template +from django.template.loader_tags import IncludeNode, do_include + +register = template.Library() + + +@dataclass +class SlotNode: + name: str + nodelist: template.NodeList + + +class SlotsIncludedNode(IncludeNode): + def __init__(self, slots: List[SlotNode], include_node: IncludeNode): + self.slots = slots + + self.template = include_node.template + self.extra_context = include_node.extra_context + self.isolated_context = include_node.isolated_context + + def render(self, context): + for slot in self.slots: + print("slot", slot) + context[slot.name] = slot.nodelist.render(context) + return super().render(context) + + +END_SLOTS = "endslots" +SLOT = "slot" + + +@register.tag("includeslots") +def include_slots(parser, token): + """Extends the include tag to add slots to the context. + Any HTML between `includeslots` and the next `slot` or + `endslots` are inserted in the context variable as the + slot argument. + + Usage: + ```html + + {% includeslots "template.html" %} + {% slot firstslot %} +

Children

+ {% slot second_one %} + + {% endslots %} + + +
+ {{ firstslot }} + {{ second_one }} +
+ ``` + """ + + nodelist = parser.parse((SLOT, END_SLOTS)) + first_token = token + token = parser.next_token() + + slots: List[SlotNode] = [] + while token.contents.startswith(SLOT): + bits = token.split_contents() + if len(bits) != 2: + raise template.TemplateSyntaxError( + f"Requires one argument, got {len(bits) - 1} for {token.contents}" + ) + nodelist = parser.parse((SLOT, END_SLOTS)) + slots.append(SlotNode(bits[1], nodelist)) + token = parser.next_token() + + include_node = do_include(parser, first_token) + + return SlotsIncludedNode( + slots, + include_node, + )