From 1f88aeef00e4c239f28717ac134cfd5dae05b11f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carl=20Johan=20G=C3=BCtzkow?= <70779496+CJGutz@users.noreply.github.com> Date: Tue, 31 Oct 2023 19:25:57 +0100 Subject: [PATCH] Create a button for admin to list users and their email address (#777) * add modal to list users * copy to clipboard and table with date next year * update translation files for event * fix multi line translation --- applications/locale/en/LC_MESSAGES/django.po | 16 ++-- applications/locale/nb/LC_MESSAGES/django.po | 16 ++-- files/locale/en/LC_MESSAGES/django.po | 2 +- files/locale/nb/LC_MESSAGES/django.po | 2 +- .../door-access-member-list.html | 34 ++++++++ .../internalportal/internalportal.html | 12 +++ internalportal/views.py | 10 ++- inventory/locale/en/LC_MESSAGES/django.po | 2 +- inventory/locale/nb/LC_MESSAGES/django.po | 2 +- news/locale/en/LC_MESSAGES/django.po | 14 ++-- news/locale/nb/LC_MESSAGES/django.po | 2 +- news/templates/news/edit_event.html | 22 ++--- .../locale/en/LC_MESSAGES/django.po | 2 +- .../locale/nb/LC_MESSAGES/django.po | 2 +- reservations/locale/en/LC_MESSAGES/django.po | 2 +- reservations/locale/nb/LC_MESSAGES/django.po | 2 +- userprofile/locale/en/LC_MESSAGES/django.po | 2 +- userprofile/locale/nb/LC_MESSAGES/django.po | 2 +- watchlist/locale/en/LC_MESSAGES/django.po | 2 +- watchlist/locale/nb/LC_MESSAGES/django.po | 2 +- website/locale/en/LC_MESSAGES/django.po | 81 ++++++++----------- website/locale/nb/LC_MESSAGES/django.po | 42 +--------- 22 files changed, 139 insertions(+), 134 deletions(-) create mode 100644 internalportal/templates/internalportal/door-access-member-list.html diff --git a/applications/locale/en/LC_MESSAGES/django.po b/applications/locale/en/LC_MESSAGES/django.po index 499b37257..d52280154 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-08-29 19:48+0200\n" +"POT-Creation-Date: 2023-10-23 17:45+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -111,16 +111,16 @@ msgstr "" "Below you will find information about the main groups currently open for " "admission" -#: applications/templates/applications/application_info.html:66 -#: applications/templates/applications/application_info.html:95 +#: applications/templates/applications/application_info.html:65 +#: applications/templates/applications/application_info.html:92 msgid "Ingen grupper lagt til i opptaket." msgstr "No groups added to the admission process." -#: applications/templates/applications/application_info.html:79 +#: applications/templates/applications/application_info.html:76 msgid "Prosjektgruppene" msgstr "Project Groups" -#: applications/templates/applications/application_info.html:80 +#: applications/templates/applications/application_info.html:77 msgid "" "Prosjektgruppene gjennomfører en rekke prosjekter som varierer fra år til " "år. Prosjektene varer som oftest i to semestre." @@ -128,7 +128,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:81 +#: applications/templates/applications/application_info.html:78 msgid "" "Som medlem av en prosjektgruppe jobber du konkret på et prosjekt sammen med " "andre på gruppen." @@ -136,7 +136,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:82 +#: applications/templates/applications/application_info.html:79 msgid "" "Om du har forslag til noen andre prosjekter, kan dette sendes med et " "søknadsskjema." @@ -144,7 +144,7 @@ msgstr "" "If you have suggestions for other projects, you can include them in your " "application." -#: applications/templates/applications/application_info.html:83 +#: applications/templates/applications/application_info.html:80 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 72e63c3c5..98ba38667 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-08-29 19:48+0200\n" +"POT-Creation-Date: 2023-10-23 17:45+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -91,34 +91,34 @@ msgstr "" msgid "Under finner du informasjon om hovedgruppene som har opptak nå" msgstr "" -#: applications/templates/applications/application_info.html:66 -#: applications/templates/applications/application_info.html:95 +#: applications/templates/applications/application_info.html:65 +#: applications/templates/applications/application_info.html:92 msgid "Ingen grupper lagt til i opptaket." msgstr "" -#: applications/templates/applications/application_info.html:79 +#: applications/templates/applications/application_info.html:76 msgid "Prosjektgruppene" msgstr "" -#: applications/templates/applications/application_info.html:80 +#: applications/templates/applications/application_info.html:77 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:81 +#: applications/templates/applications/application_info.html:78 msgid "" "Som medlem av en prosjektgruppe jobber du konkret på et prosjekt sammen med " "andre på gruppen." msgstr "" -#: applications/templates/applications/application_info.html:82 +#: applications/templates/applications/application_info.html:79 msgid "" "Om du har forslag til noen andre prosjekter, kan dette sendes med et " "søknadsskjema." msgstr "" -#: applications/templates/applications/application_info.html:83 +#: applications/templates/applications/application_info.html:80 msgid "Under finner du informasjon om prosjektene som har opptak nå." msgstr "" diff --git a/files/locale/en/LC_MESSAGES/django.po b/files/locale/en/LC_MESSAGES/django.po index e01941087..69ea64eab 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-08-29 19:48+0200\n" +"POT-Creation-Date: 2023-10-23 17:45+0200\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 637aa35c5..2e8838a1b 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-08-29 19:48+0200\n" +"POT-Creation-Date: 2023-10-23 17:45+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/internalportal/templates/internalportal/door-access-member-list.html b/internalportal/templates/internalportal/door-access-member-list.html new file mode 100644 index 000000000..7b592d102 --- /dev/null +++ b/internalportal/templates/internalportal/door-access-member-list.html @@ -0,0 +1,34 @@ +{% load i18n %} + +
+ {% if users %} + + + + + + + + + + {% for user in users %} + + + + + + {% endfor %} + +
{% trans "Navn" %}{% trans "Epost" %}{% trans "Tilgang til" %}
{{ user.first_name }} {{ user.last_name }}{{ user.email }}{{ next_year|date:"d.m.Y" }}
+ {% else %} +

{% trans "Ingen aktive medlemmer." %}

+ {% endif %} +
+ \ No newline at end of file diff --git a/internalportal/templates/internalportal/internalportal.html b/internalportal/templates/internalportal/internalportal.html index 9427535ed..83fc32c06 100644 --- a/internalportal/templates/internalportal/internalportal.html +++ b/internalportal/templates/internalportal/internalportal.html @@ -155,6 +155,18 @@
{% trans "Adminpanel" %}
+ +
+ +
+ group +
{% trans "Medlemsliste for dørtilgang" %}
+
+ +
+ {% endif %} diff --git a/internalportal/views.py b/internalportal/views.py index 862ff9d3b..cdabb0fde 100644 --- a/internalportal/views.py +++ b/internalportal/views.py @@ -1,5 +1,6 @@ -from datetime import datetime +from datetime import datetime, timedelta +from django.contrib.auth import get_user_model from django.contrib.auth.mixins import PermissionRequiredMixin from django.views.generic import TemplateView @@ -15,6 +16,7 @@ def get_context_data(self, *args, **kwargs): context = super().get_context_data(*args, **kwargs) context["current_date"] = datetime.now() + context["next_year"] = datetime.now() + timedelta(days=365) # Find the 5 loan apps that have gone unapproved the longest context["loan_app_list"] = ItemLoan.objects.filter( @@ -30,4 +32,10 @@ def get_context_data(self, *args, **kwargs): internal=True, draft=False ).order_by("-pub_date")[:5] + context["door_access_member_list"] = ( + get_user_model() + .objects.filter(groups__name="Medlem") + .order_by("-date_joined") + ) + return context diff --git a/inventory/locale/en/LC_MESSAGES/django.po b/inventory/locale/en/LC_MESSAGES/django.po index d71c9263d..daacfe51d 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-08-29 19:48+0200\n" +"POT-Creation-Date: 2023-10-23 17:45+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/inventory/locale/nb/LC_MESSAGES/django.po b/inventory/locale/nb/LC_MESSAGES/django.po index 5f085a0cb..2336378fc 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-08-29 19:48+0200\n" +"POT-Creation-Date: 2023-10-23 17:45+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/news/locale/en/LC_MESSAGES/django.po b/news/locale/en/LC_MESSAGES/django.po index 1df04502d..4a92363e8 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-08-29 19:48+0200\n" +"POT-Creation-Date: 2023-10-23 17:45+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -320,11 +320,11 @@ msgstr "The registration deadline has passed." #: news/templates/news/event.html:129 news/templates/news/event.html:131 #: news/templates/news/event.html:212 msgid "Meld deg av" -msgstr "Unsubscribe" +msgstr "Withdraw registration" #: news/templates/news/event.html:132 msgid "Fristen for avregistrering er ute." -msgstr "The unsubscription deadline has passed." +msgstr "The withdrawal deadline has passed." #: news/templates/news/event.html:136 msgid "Frist for påmelding er" @@ -332,7 +332,7 @@ msgstr "The registration deadline is" #: news/templates/news/event.html:137 msgid "Frist for avmelding er" -msgstr "The unsubscription deadline is" +msgstr "The withdrawal deadline is" #: news/templates/news/event.html:139 msgid "Arrangementet benytter ekstern nettside for pålogging." @@ -364,7 +364,7 @@ msgstr "Registration information" #: news/templates/news/event.html:195 msgid "Du forsøker å melde deg av arrangementet." -msgstr "You are trying to unsubscribe from the event." +msgstr "You are trying to withdraw your registration from the event." #: news/templates/news/event.html:196 msgid "" @@ -379,7 +379,7 @@ msgid "" "Arrangementets påmeldingsfrist er utløpt. Dersom du melder deg av, har du " "ikke mulighet til å melde deg på igjen." msgstr "" -"The registration deadline for the event has expired. If you unsubscribe, you " +"The registration deadline for the event has expired. If you withdraw your registration, you " "will not be able to register again." #: news/templates/news/event.html:201 @@ -388,7 +388,7 @@ msgstr "By registering for this event, it is expected that you attend." #: news/templates/news/event.html:202 msgid "Du kan ikke melde deg av etter" -msgstr "You cannot unsubscribe after" +msgstr "You cannot withdraw your registration after" #: news/templates/news/event.html:204 msgid "Dette arrangementet har servering. Sørg for at dine" diff --git a/news/locale/nb/LC_MESSAGES/django.po b/news/locale/nb/LC_MESSAGES/django.po index 258909791..73b816d3f 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-08-29 19:48+0200\n" +"POT-Creation-Date: 2023-10-23 17:45+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/news/templates/news/edit_event.html b/news/templates/news/edit_event.html index 9346f2910..91d2c7632 100644 --- a/news/templates/news/edit_event.html +++ b/news/templates/news/edit_event.html @@ -48,7 +48,8 @@
{% trans "Innhold" %}
{{ form.main_content.errors }} {{ form.main_content }}
-

{% trans "Bare markdown støttes i dette feltet, html blir returnert som plaintext. Bilder kan legges til ved drag-and-drop." %}

+

{% trans "Bare markdown støttes i dette feltet, html blir returnert som plaintext. Bilder + kan legges til ved drag-and-drop." %}

Markdown cheat-sheet

@@ -200,7 +201,8 @@
{% trans "Ferdigheter" %}
{% trans "Filer" %}
-

{% trans "Det kan være nyttig å legge ved powerpoint eller andre relevante filer i arrangementet. +

{% trans "Det kan være nyttig å legge ved powerpoint eller andre relevante filer i + arrangementet. Da får deltakerene mulighet til å gjøre seg klare før arrangementet starter." %}


@@ -234,13 +236,15 @@
{% trans "Ferdig" %}
{{ form.internal.errors }}
- - {% trans "Lagre - og publiser arrangement" %} - {% trans "Lagre som - utkast" %} + + {% trans "Lagre og publiser arrangement" %} + + + {% trans "Lagre som utkast" %} + @@ -250,4 +254,4 @@
{% trans "Ferdig" %}
-{% endblock content %} +{% endblock content %} \ No newline at end of file diff --git a/projectarchive/locale/en/LC_MESSAGES/django.po b/projectarchive/locale/en/LC_MESSAGES/django.po index 5a64b2c84..7b1ee2a25 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-08-29 19:48+0200\n" +"POT-Creation-Date: 2023-10-23 17:45+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/projectarchive/locale/nb/LC_MESSAGES/django.po b/projectarchive/locale/nb/LC_MESSAGES/django.po index ae5a0b667..a5c5cbc0e 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-08-29 19:48+0200\n" +"POT-Creation-Date: 2023-10-23 17:45+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/reservations/locale/en/LC_MESSAGES/django.po b/reservations/locale/en/LC_MESSAGES/django.po index ac8753ebd..568e0c400 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-08-29 19:48+0200\n" +"POT-Creation-Date: 2023-10-23 17:45+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/reservations/locale/nb/LC_MESSAGES/django.po b/reservations/locale/nb/LC_MESSAGES/django.po index 7c023abb5..1ef7c771f 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-08-29 19:48+0200\n" +"POT-Creation-Date: 2023-10-23 17:45+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/userprofile/locale/en/LC_MESSAGES/django.po b/userprofile/locale/en/LC_MESSAGES/django.po index 5c8652a80..62b936e31 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-08-29 19:48+0200\n" +"POT-Creation-Date: 2023-10-23 17:45+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/userprofile/locale/nb/LC_MESSAGES/django.po b/userprofile/locale/nb/LC_MESSAGES/django.po index 7ab40a9c4..64c9f17e5 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-08-29 19:48+0200\n" +"POT-Creation-Date: 2023-10-23 17:45+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/watchlist/locale/en/LC_MESSAGES/django.po b/watchlist/locale/en/LC_MESSAGES/django.po index dca86f2e6..24328e83f 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-08-29 19:48+0200\n" +"POT-Creation-Date: 2023-10-23 17:45+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/watchlist/locale/nb/LC_MESSAGES/django.po b/watchlist/locale/nb/LC_MESSAGES/django.po index a6ad795f5..5eb8ef11b 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-08-29 19:48+0200\n" +"POT-Creation-Date: 2023-10-23 17:45+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/website/locale/en/LC_MESSAGES/django.po b/website/locale/en/LC_MESSAGES/django.po index 7498d666d..f143875b9 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-08-29 19:48+0200\n" +"POT-Creation-Date: 2023-10-23 17:45+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -212,19 +212,16 @@ msgstr "Members" #: website/templates/website/header.html:114 #: website/templates/website/header.html:198 -#: website/templates/website/internalportal.html:118 msgid "Vaktliste" msgstr "Shift schedule" #: website/templates/website/header.html:119 #: website/templates/website/header.html:203 -#: website/templates/website/internalportal.html:127 msgid "Lager" msgstr "Storage" #: website/templates/website/header.html:124 #: website/templates/website/header.html:208 -#: website/templates/website/internalportal.html:136 msgid "Reservasjoner" msgstr "Reservations" @@ -240,7 +237,6 @@ msgstr "Project archive" #: website/templates/website/header.html:150 #: website/templates/website/header.html:234 -#: website/templates/website/internalportal.html:10 msgid "Internportal" msgstr "Internal portal" @@ -395,48 +391,6 @@ msgstr "Recent news" msgid "Siste arrangementer" msgstr "Recent events" -#: website/templates/website/internalportal.html:28 -#, fuzzy -#| msgid "Siste nytt" -msgid "Siste internnytt" -msgstr "Recent news" - -#: website/templates/website/internalportal.html:42 -msgid "Her var det intetnytt" -msgstr "Nothinng new here" - -#: website/templates/website/internalportal.html:52 -#, fuzzy -#| msgid "Siste arrangementer" -msgid "Siste interne arrangementer" -msgstr "Recent events" - -#: website/templates/website/internalportal.html:71 -#, fuzzy -#| msgid "Siste arrangementer" -msgid "Ingen interne arrangementer" -msgstr "Recent events" - -#: website/templates/website/internalportal.html:81 -msgid "Åpne lånesøknader" -msgstr "Open item loans" - -#: website/templates/website/internalportal.html:94 -msgid "Ingen lånesøknader" -msgstr "No item loans" - -#: website/templates/website/internalportal.html:109 -msgid "Lånesøknader" -msgstr "Item loans" - -#: website/templates/website/internalportal.html:145 -msgid "Bildegalleri" -msgstr "Gallery" - -#: website/templates/website/internalportal.html:155 -msgid "Adminpanel" -msgstr "Admin page" - #: website/templates/website/rules.html:17 msgid "Nøvendig informasjon og regler for bruk av verkstedet og diverse utstyr" msgstr "Necessary information and rules for the workshop and its equipment" @@ -451,3 +405,36 @@ msgstr "Internal portal" #: website/templates/website/rules.html:56 msgid "Fant ingen regler 🤠" msgstr "No rules found" + +#, fuzzy +#~| msgid "Siste nytt" +#~ msgid "Siste internnytt" +#~ msgstr "Recent news" + +#~ msgid "Her var det intetnytt" +#~ msgstr "Nothinng new here" + +#, fuzzy +#~| msgid "Siste arrangementer" +#~ msgid "Siste interne arrangementer" +#~ msgstr "Recent events" + +#, fuzzy +#~| msgid "Siste arrangementer" +#~ msgid "Ingen interne arrangementer" +#~ msgstr "Recent events" + +#~ msgid "Åpne lånesøknader" +#~ msgstr "Open item loans" + +#~ msgid "Ingen lånesøknader" +#~ msgstr "No item loans" + +#~ msgid "Lånesøknader" +#~ msgstr "Item loans" + +#~ 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 d3957379a..479b06dca 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-08-29 19:48+0200\n" +"POT-Creation-Date: 2023-10-23 17:45+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -200,19 +200,16 @@ msgstr "" #: website/templates/website/header.html:114 #: website/templates/website/header.html:198 -#: website/templates/website/internalportal.html:118 msgid "Vaktliste" msgstr "" #: website/templates/website/header.html:119 #: website/templates/website/header.html:203 -#: website/templates/website/internalportal.html:127 msgid "Lager" msgstr "" #: website/templates/website/header.html:124 #: website/templates/website/header.html:208 -#: website/templates/website/internalportal.html:136 msgid "Reservasjoner" msgstr "" @@ -228,7 +225,6 @@ msgstr "" #: website/templates/website/header.html:150 #: website/templates/website/header.html:234 -#: website/templates/website/internalportal.html:10 msgid "Internportal" msgstr "" @@ -363,42 +359,6 @@ msgstr "" msgid "Siste arrangementer" msgstr "" -#: website/templates/website/internalportal.html:28 -msgid "Siste internnytt" -msgstr "" - -#: website/templates/website/internalportal.html:42 -msgid "Her var det intetnytt" -msgstr "" - -#: website/templates/website/internalportal.html:52 -msgid "Siste interne arrangementer" -msgstr "" - -#: website/templates/website/internalportal.html:71 -msgid "Ingen interne arrangementer" -msgstr "" - -#: website/templates/website/internalportal.html:81 -msgid "Åpne lånesøknader" -msgstr "" - -#: website/templates/website/internalportal.html:94 -msgid "Ingen lånesøknader" -msgstr "" - -#: website/templates/website/internalportal.html:109 -msgid "Lånesøknader" -msgstr "" - -#: website/templates/website/internalportal.html:145 -msgid "Bildegalleri" -msgstr "" - -#: website/templates/website/internalportal.html:155 -msgid "Adminpanel" -msgstr "" - #: website/templates/website/rules.html:17 msgid "Nøvendig informasjon og regler for bruk av verkstedet og diverse utstyr" msgstr ""