Merge branch 'dev' into dependabot/pip/dev/django-phonenumber-field-p…

…honenumbers--7.2.0

CHANGELOG.md

@@ -6,7 +6,7 @@ A summary of changes made to the codebase, grouped per deployment.
 
 ### New features
 
-- 
+- The apply button in the English header, which previously read "søk verv", has now been translated to English ("apply to MAKE")
 
 ### Improvements
 

requirements.txt

@@ -10,7 +10,7 @@ django-extensions==3.2.3
 django-ical==1.9.2
 django-multiselectfield==0.1.12
 django-phonenumber-field[phonenumbers]==7.2.0
-django-simple-history==3.3.0
+django-simple-history==3.4.0
 sorl-thumbnail==12.9.0
 
 # Packages related to authentication and other "social" stuff
@@ -27,6 +27,6 @@ channels-redis==4.1.0
 
 # Misc. packages
 bleach[css]==6.0.0
-Pillow==10.0.0
+Pillow==10.1.0
 uuid==1.30
 XlsxWriter==3.1.2

src/locale/nb/LC_MESSAGES/django.po

@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MAKE NTNU website\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-05-07 21:15+0200\n"
+"POT-Creation-Date: 2023-10-05 18:43+0200\n"
 "PO-Revision-Date: 2018-10-09 14:05+0200\n"
 "Last-Translator: Sindre Stephansen <[email protected]>\n"
 "Language-Team: Norwegian Bokmål <[email protected]>\n"
@@ -3052,31 +3052,31 @@ msgstr ""
 msgid "One or more languages have no content."
 msgstr "Ett eller flere språk mangler innhold."
 
-#: src/web/settings.py:307
+#: src/web/settings.py:306
 msgid ""
-"Determines whether the “Søk verv” button in the navigation menu in the "
+"Determines whether the “Apply to MAKE” button in the navigation menu in the "
 "header is visible."
 msgstr ""
 "Bestemmer om «Søk verv»-knappen skal være synlig i navigasjonsmenyen i "
 "toppteksten."
 
-#: src/web/settings.py:311
+#: src/web/settings.py:310
 msgid "Link to the guide on what should be done when a new member enrolls."
 msgstr "Lenke til guiden med ting som skal gjøres når et nytt medlem tas opp."
 
-#: src/web/settings.py:316
+#: src/web/settings.py:315
 msgid "Link to the guide on what should be done when a member retires."
 msgstr "Lenke til guiden med ting som skal gjøres når et medlem panger."
 
-#: src/web/settings.py:321
+#: src/web/settings.py:320
 msgid "Link to the guide on what should be done when a member quits."
 msgstr "Lenke til guiden med ting som skal gjøres når et medlem slutter."
 
-#: src/web/settings.py:327
+#: src/web/settings.py:326
 msgid "Main Site Settings"
 msgstr "Hovedsideinnstillinger"
 
-#: src/web/settings.py:330
+#: src/web/settings.py:329
 msgid "Internal Site Settings"
 msgstr "Internsideinnstillinger"
 
@@ -3266,6 +3266,10 @@ msgstr "Om"
 msgid "About us"
 msgstr "Om oss"
 
+#: src/web/templates/web/header.html:76
+msgid "Apply to MAKE"
+msgstr "Søk verv"
+
 #: src/web/templates/web/header.html:99
 msgid "Administration"
 msgstr "Administrasjon"

src/web/settings.py

@@ -303,7 +303,7 @@ def generate_all_hosts(subdomains):
 CONSTANCE_CONFIG = {
     'SHOW_APPLY_BUTTON_IN_HEADER_NAV': (
         True,
-        _("Determines whether the “Søk verv” button in the navigation menu in the header is visible."),
+        _("Determines whether the “Apply to MAKE” button in the navigation menu in the header is visible."),
     ),
     'ENROLL_MEMBERS_GUIDE_LINK': (
         "",

src/web/templates/web/header.html

@@ -73,7 +73,7 @@
 
             {% if config.SHOW_APPLY_BUTTON_IN_HEADER_NAV %}
                 <a class="item" href="{% url 'apply' %}">
-                    <div class="text">Søk verv</div>
+                    <div class="text">{% translate "Apply to MAKE" %}</div>
                     <div class="make-bg-blue bubble-background"></div>
                 </a>
             {% endif %}