Skip to content

Commit

Permalink
Fixed login button
Browse files Browse the repository at this point in the history
  • Loading branch information
AndersSeverinsen committed Jul 1, 2024
1 parent f70c995 commit af0648f
Show file tree
Hide file tree
Showing 5 changed files with 35 additions and 38 deletions.
2 changes: 1 addition & 1 deletion bartenders/templates/ballots_update.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% extends 'base.html' %}

{% load i18n %}
{% load static %}
{% load bootstrap3 %}

Expand Down
1 change: 1 addition & 0 deletions fredagscafeen/settings/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -304,6 +304,7 @@
ADMINS = [
("Oskar Haarklou Veileborg", "oskarv@post.au.dk"),
("Jonathan Eilath", "201804772@post.au.dk"),
("Anders Bruun Severinsen", "202204885@post.au.dk"),
]

# Allow more fields in GET/POST requests (necessary for BarTabAdmin to function with large snapshots)
Expand Down
2 changes: 1 addition & 1 deletion locale/da/LC_MESSAGES/django.po
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: 2024-06-30 21:55+0200\n"
"POT-Creation-Date: 2024-07-01 11:10+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
Expand Down
66 changes: 31 additions & 35 deletions locale/en/LC_MESSAGES/django.po
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: 2024-06-30 21:55+0200\n"
"POT-Creation-Date: 2024-07-01 11:10+0200\n"
"PO-Revision-Date: 2024-06-30 21:55+0050\n"
"Last-Translator: <abs@post.au.dk>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
Expand Down Expand Up @@ -153,8 +153,7 @@ msgstr "If you wish to be active again, contact"

#: bartenders/templates/bartender_info.html:49
msgid ""
"Husk at du som inaktiv bartender ikke kan komme til "
"bartenderarrangementerne."
"Husk at du som inaktiv bartender ikke kan komme til bartenderarrangementerne."
msgstr ""
"Remember that as an inactive bartender you cannot come to the bartending "
"events."
Expand Down Expand Up @@ -254,8 +253,8 @@ msgid ""
"begivenheder, såsom ølsmagning og lign. Alt sammen gratis for bartendere."
msgstr ""
"In addition to this, you are invited to our annual events for bartenders, "
"such as the Summer Party and the Christmas Lunch. In addition, there will be"
" ongoing cool events, such as beer tasting and the like. All free for "
"such as the Summer Party and the Christmas Lunch. In addition, there will be "
"ongoing cool events, such as beer tasting and the like. All free for "
"bartenders."

#: bartenders/templates/index.html:16
Expand Down Expand Up @@ -411,8 +410,8 @@ msgstr "Guides"
#: guides/templates/guides.html:9
msgctxt "Fredagscaféen"
msgid ""
"Her ligger alle de lækre guides, som er rare at have, når man involverer sig"
" i driften af"
"Her ligger alle de lækre guides, som er rare at have, når man involverer sig "
"i driften af"
msgstr ""
"Here are all the delicious guides that are nice to have when you get "
"involved in the operation of"
Expand Down Expand Up @@ -503,8 +502,8 @@ msgstr "Expected consumption"

#: udlejning/models.py:64
msgid ""
"Hvilke slags øl eller andre drikkevarer ønskes der og hvor mange fustager af"
" hver type?"
"Hvilke slags øl eller andre drikkevarer ønskes der og hvor mange fustager af "
"hver type?"
msgstr ""
"What types of beer or other beverages are desired and how many kegs of each "
"type?"
Expand Down Expand Up @@ -606,8 +605,8 @@ msgid ""
"Hvis vores anlæg ikke allerede er udlånt, kan du låne det ved at udfylde "
"ansøgninsformularen nederst på denne side."
msgstr ""
"If our equipment is not already on loan, you can borrow it by filling in the"
" application form at the bottom of this page."
"If our equipment is not already on loan, you can borrow it by filling in the "
"application form at the bottom of this page."

#: udlejning/templates/udlejning.html:37
msgid "Anlæg udlånes kun til"
Expand All @@ -631,8 +630,7 @@ msgstr "Internal events"

#: udlejning/templates/udlejning.html:41
msgid ""
"Udelukkende arrangementer der finder sted på universitetet. Dette "
"inkluderer:"
"Udelukkende arrangementer der finder sted på universitetet. Dette inkluderer:"
msgstr "Exclusive events that take place at the university. This includes:"

#: udlejning/templates/udlejning.html:43
Expand All @@ -649,8 +647,8 @@ msgstr "Events with association"

#: udlejning/templates/udlejning.html:49
msgid ""
"Arrangementer der finder sted på universitetet eller andetsteds, kan være af"
" privat natur. Dette inkluderer:"
"Arrangementer der finder sted på universitetet eller andetsteds, kan være af "
"privat natur. Dette inkluderer:"
msgstr ""
"Events that take place at the university or elsewhere may be of a private "
"nature. This includes:"
Expand Down Expand Up @@ -680,9 +678,9 @@ msgid ""
"Forløber som det har gjort indtil nu, udlån inkluderer opstilling, kulsyre "
"og skylning af anlægget, 50 glas (1 rulle) tilkøbes for 150,- pr. stk."
msgstr ""
"Precursor as it has been until now, lending includes setting up, carbonation"
" and rinsing of the system, 50 cups (1 roll) can be purchased for DKK 150 "
"per PCS."
"Precursor as it has been until now, lending includes setting up, carbonation "
"and rinsing of the system, 50 cups (1 roll) can be purchased for DKK 150 per "
"PCS."

#: udlejning/templates/udlejning.html:65
msgid ""
Expand All @@ -691,9 +689,9 @@ msgid ""
"Afleveringstid af anlægget skal aftales i dialog med den ansvarlige for det "
"praktiske, og er ikke nødvendigvis samme dag."
msgstr ""
"Here, loans only include unlocking and unlocking of the draft beer facility."
" This means that the plant must be picked up in Ada-0, and delivered cleaned"
" in Ada-0. The delivery time of the installation must be agreed in dialogue "
"Here, loans only include unlocking and unlocking of the draft beer facility. "
"This means that the plant must be picked up in Ada-0, and delivered cleaned "
"in Ada-0. The delivery time of the installation must be agreed in dialogue "
"with the person responsible for the practical, and is not necessarily the "
"same day."

Expand All @@ -703,10 +701,10 @@ msgstr "Request rental in good time"

#: udlejning/templates/udlejning.html:71
msgid ""
"Når du låner et anlæg, skal der på udlåningsdagen samt tilbagelevering, være"
" et bestyrelsesmedlem der står for det praktiske. Vi er alle frivillige og "
"har studier og jobs ved siden af vorest bestyrelsesarbejde, og derfor kan vi"
" ikke være sikre på at kunne stille et besyterelsesmedlem til rådighed."
"Når du låner et anlæg, skal der på udlåningsdagen samt tilbagelevering, være "
"et bestyrelsesmedlem der står for det praktiske. Vi er alle frivillige og "
"har studier og jobs ved siden af vorest bestyrelsesarbejde, og derfor kan vi "
"ikke være sikre på at kunne stille et besyterelsesmedlem til rådighed."
msgstr ""
"When you borrow a facility, there must be a board member responsible for "
"practical matters on the day of lending and return. We are all volunteers "
Expand All @@ -727,15 +725,15 @@ msgid ""
"mulighed for at være der i en af de mulige tidsrum. Hvis ikke du skriver "
"mindst 7 dage i forvejen, kan vi ikke garantere at vi kan melde ud hvorvidt "
"udlejning er muligt i god tid, dog er det stadig muligt at kunne låne "
"anlægget selv hvis man melder ud i dårlig tid, vi kan blot ikke garantere at"
" der kommer et svar i god tid."
"anlægget selv hvis man melder ud i dårlig tid, vi kan blot ikke garantere at "
"der kommer et svar i god tid."
msgstr ""
"We will therefore, no later than 5 days before, announce whether someone on "
"the board has the opportunity to be there during one of the possible times. "
"If you do not write at least 7 days in advance, we cannot guarantee that we "
"can announce whether or not renting is possible in good time, however it is "
"still possible to borrow the facility even if you announce at a bad time, we"
" just cannot guarantee that there will be an answer in good time."
"still possible to borrow the facility even if you announce at a bad time, we "
"just cannot guarantee that there will be an answer in good time."

#: udlejning/templates/udlejning.html:78
msgid "Generelle informationer"
Expand All @@ -751,8 +749,7 @@ msgstr "Our primary draft beer is"

#: udlejning/templates/udlejning.html:90
msgid ""
", som kommer i 25 liters fustager. Prisen er 750 kr. pr. fustage (incl. "
"moms)"
", som kommer i 25 liters fustager. Prisen er 750 kr. pr. fustage (incl. moms)"
msgstr ""
", which comes in 25 liter kegs. The price is DKK 750 per keg (incl. VAT)"

Expand All @@ -777,16 +774,15 @@ msgid ""
"Vi sælger også Magners Cider på fustage, der koster 1250 kr. pr. fustage "
"(incl. moms)."
msgstr ""
"We also sell Magners Cider in kegs, which costs DKK 1250 per keg (incl. "
"VAT)."
"We also sell Magners Cider in kegs, which costs DKK 1250 per keg (incl. VAT)."

#: udlejning/templates/udlejning.html:105
msgid ""
"Vi har et sortiment af special-øl tilgængeligt på: (det er ikke tilgængelig "
"pt. men man kan skrive en mail til"
msgstr ""
"We have a range of specialty beers available at: (it is not available at the"
" moment, but you can write an email to"
"We have a range of specialty beers available at: (it is not available at the "
"moment, but you can write an email to"

#: udlejning/templates/udlejning.html:108
msgid ""
Expand Down
2 changes: 1 addition & 1 deletion web/templates/login.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% extends 'base.html' %}

{% load i18n %}
{% load static %}
{% load bootstrap3 %}

Expand Down

0 comments on commit af0648f

Please sign in to comment.