Skip to content

Commit

Permalink
Merge pull request #687 from MAKENTNU/fix/apply-button-header
Browse files Browse the repository at this point in the history
Fix/apply button header
  • Loading branch information
Gunvor4 authored Oct 5, 2023
2 parents c463a89 + d0129a0 commit 6f55b7d
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 11 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Binary file modified src/locale/nb/LC_MESSAGES/django.mo
Binary file not shown.
20 changes: 12 additions & 8 deletions src/locale/nb/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"

Expand Down Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion src/web/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -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': (
"",
Expand Down
2 changes: 1 addition & 1 deletion src/web/templates/web/header.html
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
Expand Down

0 comments on commit 6f55b7d

Please sign in to comment.