Fixed some translation errors and added flag to language button (#649)

.gitignore

@@ -19,7 +19,6 @@ env/
 venv/
 .vscode/
 **/__pycache__
-
 /static/
 
 *.html.py

website/locale/en/LC_MESSAGES/django.po

@@ -3,12 +3,11 @@
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-21 19:54+0100\n"
+"POT-Creation-Date: 2023-03-21 19:59+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -101,60 +100,3 @@ msgstr "Recent news"
 #: templates/website/index.html:90
 msgid "Siste arrangementer"
 msgstr "Recent events"
-
-#, fuzzy
-#~| msgid "creator-header"
-#~ msgid "arena-text"
-#~ msgstr ""
-#~ "Hackerspace offers an arena for projects, whether it's IoT gadgets,"
-#~ "software, 3D printing, or other cool stuff."
-
-#, fuzzy
-#~| msgid "creator-header"
-#~ msgid "creator-text"
-#~ msgstr ""
-#~ "We have the necessary equipment, premises and knowledge to assist in your "
-#~ "next project."
-
-#~ 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 onHackerspace."
-
-#~ msgid "who1"
-#~ msgstr ""
-#~ "Hackerspace NTNU is a student-run project open to all students regardless "
-#~ "of field of study."
-
-#~ msgid "who2"
-#~ msgstr ""
-#~ "With us you will find new technology at your disposal, including drones, "
-#~ "3D-printers and Virtual Reality equipment."
-
-#~ msgid "who3"
-#~ msgstr ""
-#~ "Whether you want to make an LED light flash or make a 3D model of "
-#~ "itTrondheim, the members of Hackerspace can offer varied and good "
-#~ "expertise andhelp you with that, regardless of your Hackerspace "
-#~ "membership."
-
-#~ msgid "who4"
-#~ msgstr ""
-#~ "If you're wondering about something, have a project you want help with, "
-#~ "or just want to comeby for a chat, we warmly welcome you"
-
-#~ msgid "og"
-#~ msgstr "and"
-
-#~ msgid "who5"
-#~ msgstr ""
-#~ "The on-call system ensures that you always meet someone in the workshop "
-#~ "ready todemonstrate equipment or help you."
-
-#~ msgid " og "
-#~ msgstr " and "
-
-#, fuzzy
-#~| msgid "creator-header"
-#~ msgid "who-header"
-#~ msgstr "Are you a creator?"

website/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-03-21 19:54+0100\n"
+"POT-Creation-Date: 2023-03-21 19:59+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -101,54 +101,3 @@ msgstr ""
 #: templates/website/index.html:90
 msgid "Siste arrangementer"
 msgstr ""
-
-#, fuzzy
-#~| msgid "creator-header"
-#~ msgid "arena-text"
-#~ msgstr ""
-#~ "Hackerspace tilbyr en arena for prosjekter, enten det er IoT-dingser, "
-#~ "programvare, 3D-printing, eller andre kule ting."
-
-#, fuzzy
-#~| msgid "creator-header"
-#~ msgid "creator-text"
-#~ msgstr ""
-#~ "Vi disponerer nødvendig utstyr, lokaler og ikke minst kunnskap for å "
-#~ "bistå i ditt neste prosjekt."
-
-#~ msgid "curious-text"
-#~ msgstr ""
-#~ "Uansett om du bare har lyst til å teste det ut, eller er en veteran på VR-"
-#~ "utvikling, har vi både utstyr og kompetanse innenfor Virtual Reality på "
-#~ "Hackerspace."
-
-#~ msgid "who1"
-#~ msgstr ""
-#~ "Hackerspace NTNU er et studentdrevet prosjekt fra IDI og er åpent for "
-#~ "alle studenter uavhengig av studieretning."
-
-#~ msgid "who2"
-#~ msgstr ""
-#~ "Hos oss finner du ny teknologi til din disposisjon, blant annet 3D-"
-#~ "printere og Virtual Reality-utstyr."
-
-#~ msgid "who3"
-#~ msgstr ""
-#~ "Enten du ønsker å få en LED-lampe til å blinke eller lage en 3D-modell av "
-#~ "Trondheim, kan medlemmene i Hackerspace tilby variert og god kompetanse "
-#~ "og hjelpe deg med det, uavhengig av ditt medlemsskap i Hackerspace."
-
-#~ msgid "who4"
-#~ msgstr ""
-#~ "Om du lurer på noe, har et prosjekt du ønsker hjelp med, eller bare vil "
-#~ "slå av en prat, tar vi deg varmt imot på"
-
-#~ msgid "who5"
-#~ msgstr ""
-#~ "Vaktordningen sørger for at du alltid møter noen på verkstedet klare til "
-#~ "å demonstrere utstyr eller hjelpe deg."
-
-#, fuzzy
-#~| msgid "creator-header"
-#~ msgid "who-header"
-#~ msgstr "Hvem er vi?"

website/templates/website/header.html

@@ -49,6 +49,9 @@
 						{% else %}
 						<li><a class="dropdown-trigger-user" href="{% url 'social:begin' 'dataporten_feide' %}?next={{ request.path }}" data-target="userdropdown"><i class="material-icons">account_circle</i></a> </li>
 						{% endif %}
+                        <li>
+                        {% include "website/lang_toggle.html" with style="margin: 3px 10px"%}
+                        </li>
 					</ul>
 					<!-- Mobil dynamisk meny -->
 				<ul class="sidenav" id="mobile-sidebar">
@@ -230,7 +233,6 @@
 				</ul>
 
 			</div>
-      {% include "website/lang_toggle.html" %}
 			</div>
 		</nav>
 	</div>

website/templates/website/lang_toggle.html

@@ -1,6 +1,7 @@
 {% load i18n %}
+{% load static %}
 
-<form action="{% url 'set_language' %}" method="post">{% csrf_token %}
+<form action="{% url 'set_language' %}" method="post" style="{{ style }}">{% csrf_token %}
     {% get_current_language as LANGUAGE_CODE %}
     <input name="next" type="hidden" value="{{ redirect_to }}">
     <input name="language" type="hidden" 
@@ -11,5 +12,11 @@
         "nb"
       {% endif %}
     >
-    <input type="submit" value={{ LANGUAGE_CODE }}>
+    <input type="image" src=
+      {% if LANGUAGE_CODE == "nb" %}
+           "{% static 'website/img/icon/GB.png' %}"
+      {% else %}
+           "{% static 'website/img/icon/NO.png' %}"
+      {% endif %}
+    >
 </form>