Skip to content

Commit

Permalink
Translation of header (#649)
Browse files Browse the repository at this point in the history
  • Loading branch information
@njal3001
njal3001 committed Jan 19, 2023
1 parent a2ae5d4 commit 1d59c05
Show file tree
Hide file tree
Showing 4 changed files with 205 additions and 16 deletions.
2 changes: 2 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,5 @@ venv/
*.html.py
*.txt.py
*.mo
*.html.py
*.txt.py
82 changes: 72 additions & 10 deletions website/locale/en/LC_MESSAGES/django.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-03-30 21:17+0200\n"
"POT-Creation-Date: 2022-04-20 20:12+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand All @@ -17,12 +17,75 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"

#: templates/website/header.html:30 templates/website/header.html:77
msgid "Nyheter"
msgstr "News"

#: templates/website/header.html:31 templates/website/header.html:78
msgid "Arrangementer"
msgstr "Events"

#: templates/website/header.html:76
msgid "Hjem"
msgstr "Home"

#: templates/website/header.html:79 templates/website/header.html:112
msgid "Medlemmer"
msgstr "Members"

#: templates/website/header.html:80 templates/website/header.html:115
msgid "Vaktliste"
msgstr "Roster"

#: templates/website/header.html:81 templates/website/header.html:118
msgid "Lager"
msgstr "Storage"

#: templates/website/header.html:83 templates/website/header.html:137
msgid "Internportal"
msgstr "Internal portal"

#: templates/website/header.html:85 templates/website/header.html:121
msgid "Reservasjoner"
msgstr "Reservations"

#: templates/website/header.html:86 templates/website/header.html:124
msgid "Regler"
msgstr "Rules"

#: templates/website/header.html:87 templates/website/header.html:127
msgid "Opptak"
msgstr "Admission"

#: templates/website/header.html:88 templates/website/header.html:130
msgid "Prosjektarkiv"
msgstr "Project archive"

#: templates/website/header.html:89 templates/website/header.html:133
msgid "Om oss"
msgstr "About us"

#: templates/website/header.html:93 templates/website/header.html:101
msgid "Logg ut"
msgstr "Sign out"

#: templates/website/header.html:95 templates/website/header.html:103
msgid "Logg inn"
msgstr "Sign in"

#: templates/website/header.html:100
msgid "Profil"
msgstr "Profile"

#: templates/website/header.html:109
msgid "Kart"
msgstr "Map"

#: templates/website/index.html:24
msgid "Har du en skaper i magen?"
msgstr "Are you a creator?"

#: templates/website/index.html:25
#| msgid "creator-header"
msgid "creator-text"
msgstr ""
"We have the necessary equipment, premises and knowledge to assist in your "
Expand All @@ -35,9 +98,8 @@ msgstr "Curious about VR?"
#: templates/website/index.html:32
msgid "curious-text"
msgstr ""
"Whether you just want to test it out, or are a veteran of VR-"
"development, we have both equipment and expertise in Virtual Reality on"
" Hackerspace."
"Whether you just want to test it out, or are a veteran of VR-development, we "
"have both equipment and expertise in Virtual Reality on Hackerspace."

#: templates/website/index.html:38
msgid "Kreativt, innovativt og ikke minst sosialt"
Expand All @@ -46,8 +108,8 @@ msgstr "Creative, innovative and social"
#: templates/website/index.html:39
msgid "arena-text"
msgstr ""
"Hackerspace offers an arena for projects, whether it's IoT gadgets,"
" software, 3D printing, or other cool stuff."
"Hackerspace offers an arena for projects, whether it's IoT gadgets, "
"software, 3D printing, or other cool stuff."

#: templates/website/index.html:51
msgid "Hvem er vi?"
Expand All @@ -68,9 +130,9 @@ msgstr ""
#: templates/website/index.html:54
msgid "who3"
msgstr ""
"Whether you want to make an LED light flash or make a 3D model of "
"Trondheim, the members of Hackerspace can offer varied and good expertise "
"and help you with that, regardless of your Hackerspace membership."
"Whether you want to make an LED light flash or make a 3D model of Trondheim, "
"the members of Hackerspace can offer varied and good expertise and help you "
"with that, regardless of your Hackerspace membership."

#: templates/website/index.html:55
msgid "who4"
Expand Down
68 changes: 65 additions & 3 deletions website/locale/nb/LC_MESSAGES/django.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-03-30 21:17+0200\n"
"POT-Creation-Date: 2022-04-20 20:12+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand All @@ -18,12 +18,75 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"

#: templates/website/header.html:30 templates/website/header.html:77
msgid "Nyheter"
msgstr ""

#: templates/website/header.html:31 templates/website/header.html:78
msgid "Arrangementer"
msgstr ""

#: templates/website/header.html:76
msgid "Hjem"
msgstr ""

#: templates/website/header.html:79 templates/website/header.html:112
msgid "Medlemmer"
msgstr ""

#: templates/website/header.html:80 templates/website/header.html:115
msgid "Vaktliste"
msgstr ""

#: templates/website/header.html:81 templates/website/header.html:118
msgid "Lager"
msgstr ""

#: templates/website/header.html:83 templates/website/header.html:137
msgid "Internportal"
msgstr ""

#: templates/website/header.html:85 templates/website/header.html:121
msgid "Reservasjoner"
msgstr ""

#: templates/website/header.html:86 templates/website/header.html:124
msgid "Regler"
msgstr ""

#: templates/website/header.html:87 templates/website/header.html:127
msgid "Opptak"
msgstr ""

#: templates/website/header.html:88 templates/website/header.html:130
msgid "Prosjektarkiv"
msgstr ""

#: templates/website/header.html:89 templates/website/header.html:133
msgid "Om oss"
msgstr ""

#: templates/website/header.html:93 templates/website/header.html:101
msgid "Logg ut"
msgstr ""

#: templates/website/header.html:95 templates/website/header.html:103
msgid "Logg inn"
msgstr ""

#: templates/website/header.html:100
msgid "Profil"
msgstr ""

#: templates/website/header.html:109
msgid "Kart"
msgstr ""

#: templates/website/index.html:24
msgid "Har du en skaper i magen?"
msgstr ""

#: templates/website/index.html:25
#| msgid "creator-header"
msgid "creator-text"
msgstr ""
"Vi disponerer nødvendig utstyr, lokaler og ikke minst kunnskap for å bistå i "
Expand All @@ -45,7 +108,6 @@ msgid "Kreativt, innovativt og ikke minst sosialt"
msgstr ""

#: templates/website/index.html:39
#| msgid "creator-header"
msgid "arena-text"
msgstr ""
"Hackerspace tilbyr en arena for prosjekter, enten det er IoT-dingser, "
Expand Down
69 changes: 66 additions & 3 deletions website/templates/website/header.html
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{% load static %}
{% load i18n %}
{% if request.user.is_authenticated and not request.user.profile.has_accepted_most_recent_tos %}
<!-- Checks if path should display TOS prompt. Slice check disables TOS display for all tos-related pages -->
{% if request.path != "/tos/returning-user/" and request.path|slice:":5" != "/tos/" %}
Expand Down Expand Up @@ -26,9 +27,9 @@
</a>
<!-- Hovedmeny -->
<ul class="right hide-on-med-and-down">
<li id="news"><a class="waves-effect" href="{% url 'news:all' %}">Nyheter</a></li>
<li id="events"><a class="waves-effect" href="{% url 'events:all' %}">Arrangementer</a></li>
<li id="search" class="tooltipped" data-position="bottom" data-tooltip="Søk i hele siden">
<li id="news"><a class="waves-effect" href="{% url 'news:all' %}">{% trans "Nyheter" %}</a></li>
<li id="events"><a class="waves-effect" href="{% url 'events:all' %}">{% trans "Arrangementer" %}</a></li>
<li id="search" class="tooltipped" data-position="bottom" data-tooltip="{% trans "Søk i hele siden" %}">
<a class="waves-effect" href="{% url 'search' %}"><i class="material-icons">search</i></a>
</li>
<li id="resources"><a class="trigger-resources" href="#" data-target="resourcedropdown"><i class="material-icons">apps</i></a></li>
Expand Down Expand Up @@ -75,6 +76,7 @@
{% endif %}
</div>
</li>
<<<<<<< HEAD
<li>
<a class="waves-effect" href="/">
<i class="material-icons">home</i>Hjem
Expand Down Expand Up @@ -159,10 +161,33 @@
<li><a class="waves-effect" href="{% url 'social:begin' 'dataporten_feide' %}?next={{ request.path }}">
<i class="material-icons small">login</i>Logg inn
</a></li>
=======
<li><a class="waves-effect" href="/">{% trans "Hjem" %}</a></li>
<li><a class="waves-effect" href="{% url 'news:all' %}">{% trans "Nyheter" %}</a></li>
<li><a class="waves-effect" href="{% url 'events:all' %}">{% trans "Arrangementer" %}</a></li>
<li><a class="waves-effect" href="{% url 'member-list' %}">{% trans "Medlemmer" %}</a></li>
<li><a class="waves-effect" href="{% url 'watchlist:vaktliste' %}">{% trans "Vaktliste" %}</a></li>
<li><a class="waves-effect" href="{% url 'inventory:inventory' %}">{% trans "Lager" %}</a></li>
{% if user.is_authenticated and perms.userprofile.is_active_member %}
<li><a class="waves-effect" href="{% url 'intranet' %}">{% trans "Internportal" %}</a></li>
{% endif %}
<li><a class="waves-effect" href="{% url 'reservations:queue_list' %}">{% trans "Reservasjoner" %}</a></li>
<li><a class="waves-effect" href="{% url 'rules' %}">{% trans "Regler" %}</a></li>
<li><a class="waves-effect" href="{% url 'application:application_info' %}">{% trans "Opptak" %}</a></li>
<li><a class="waves-effect" href="{% url 'projectarchive:Article_List' %}">{% trans "Prosjektarkiv" %}</a></li>
<li><a class="waves-effect" href="{% url 'about' %}">{% trans "Om oss" %}</a></li>

<li><div class="divider"></div></li>
{% if user.is_authenticated %}
<li><a class="waves-effect" href="{% url 'auth:logout' %}">{% trans "Logg ut" %}</a></li>
{% else %}
<li><a class="waves-effect" href="{% url 'social:begin' 'dataporten_feide' %}?next={{ request.path }}">{% trans "Logg inn" %}</a></li>
>>>>>>> 990c18f0 (Translation of header (#649))
{% endif %}
<!-- Dropdown user list for desktop-->
<ul id="userdropdown" class="dropdown-content">
{% if user.is_authenticated %}
<<<<<<< HEAD
<li><a href="{% url 'userprofile:profile' %}">
<i class="material-icons small">account_circle</i>Profil
</a></li>
Expand All @@ -173,11 +198,18 @@
<li><a class="modal-trigger" href="{% url 'social:begin' 'dataporten_feide' %}?next={{ request.path }}">
<i class="material-icons small">login</i>Logg inn
</a></li>
=======
<li><a href="{% url 'userprofile:profile' %}">{% trans "Profil" %}</a></li>
<li><a href="{% url 'auth:logout' %}">{% trans "Logg ut" %}</a></li>
{% else %}
<li><a class="modal-trigger" href="{% url 'social:begin' 'dataporten_feide' %}?next={{ request.path }}">{% trans "Logg inn" %}</a></li>
>>>>>>> 990c18f0 (Translation of header (#649))
{% endif %}
</ul>
<!-- Dropdown for ressurser -->
<ul id="resourcedropdown" class="dropdown-content">
<li class="tooltipped" data-position="left" data-tooltip="Se hvor vi befinner oss">
<<<<<<< HEAD
<a class="modal-trigger waves-effect hs-green-text" target="_blank" href="{{ mazemap_link }}">
<i class="material-icons small">map</i>Kart
</a>
Expand Down Expand Up @@ -227,6 +259,37 @@
<a href="{% url 'intranet' %}">
<i class="material-icons small">dashboard</i>Internportal
</a>
=======
<a class="modal-trigger waves-effect hs-green-text" target="_blank" href="{{ mazemap_link }}">{% trans "Kart" %}</a>
</li>
<li class="tooltipped" data-position="left" data-tooltip="Se liste over medlemmer">
<a href="{% url 'member-list' %}">{% trans "Medlemmer" %}</a>
</li>
<li class="tooltipped" data-position="left" data-tooltip="Se vaktlista vår">
<a class="waves-effect" href="{% url 'watchlist:vaktliste' %}">{% trans "Vaktliste" %}</a>
</li>
<li class="tooltipped" data-position="left" data-tooltip="Se lagerbeholdningen vår">
<a href="{% url 'inventory:inventory' %}">{% trans "Lager" %}</a>
</li>
<li class="tooltipped" data-position="left" data-tooltip="Se utstyr og reserver tid">
<a href="{% url 'reservations:queue_list' %}">{% trans "Reservasjoner" %}</a>
</li>
<li class="tooltipped" data-position="left" data-tooltip="Se regler">
<a href="{% url 'rules' %}">{% trans "Regler" %}</a>
</li>
<li>
<a class="waves-effect" href="{% url 'application:application_info' %}">{% trans "Opptak" %}</a>
</li>
<li class="tooltipped" data-position="left" data-tooltip="Les om våres tidligere prosjekter her">
<a href="{% url 'projectarchive:Article_List' %}">{% trans "Prosjektarkiv" %}</a>
</li>
<li class="tooltipped" data-position="left" data-tooltip="Les om vår organisasjon og grupper her">
<a href="{% url 'about' %}">{% trans "Om oss" %}</a>
</li>
{% if user.is_authenticated and perms.userprofile.is_active_member %}
<li class="tooltipped" data-position="left" data-tooltip="Dashbord for medlemmer av Hackerspace">
<a href="{% url 'intranet' %}">{% trans "Internportal" %}</a>
>>>>>>> 990c18f0 (Translation of header (#649))
</li>
{% endif %}
</ul>
Expand Down

0 comments on commit 1d59c05

Please sign in to comment.