diff --git a/bartenders/templates/ballots_update.html b/bartenders/templates/ballots_update.html index 004b5ab..cbe49c1 100644 --- a/bartenders/templates/ballots_update.html +++ b/bartenders/templates/ballots_update.html @@ -1,5 +1,5 @@ {% extends 'base.html' %} - +{% load i18n %} {% load static %} {% load bootstrap3 %} @@ -15,7 +15,8 @@

Tilføj poll

{% csrf_token %} {% bootstrap_form form %} {% buttons %} - {% bootstrap_button "Gem" button_type="submit" icon="floppy-disk" button_class="btn-primary" %} + {% translate "Gem" as BUTTON_TEXT %} + {% bootstrap_button BUTTON_TEXT button_type="submit" icon="floppy-disk" button_class="btn-primary" %} {% endbuttons %} diff --git a/bartenders/templates/bartender_info.html b/bartenders/templates/bartender_info.html index b6e4dfd..427e64a 100644 --- a/bartenders/templates/bartender_info.html +++ b/bartenders/templates/bartender_info.html @@ -33,15 +33,16 @@
{% csrf_token %} {% buttons %} - {% bootstrap_button "Gem" button_type="submit" icon="floppy-disk" button_class="btn-primary" %} + {% translate "Gem" as BUTTON_TEXT %} + {% bootstrap_button BUTTON_TEXT button_type="submit" icon="floppy-disk" button_class="btn-primary" %} {% endbuttons %}

{% translate "Bartender status" %}: {% if object.isActiveBartender %} {% translate "Aktiv" %} - + {% else %} {% translate "Inaktiv" %} - ({% translate "Hvis du gerne vil være aktive igen, så kontakt" %} best@fredagscafeen.dk) + ({% translate "Hvis du gerne vil være aktiv igen, så kontakt" %} best@fredagscafeen.dk) {% endif %}

{% if not object.isActiveBartender %} @@ -80,7 +81,8 @@ {% buttons %} - {% bootstrap_button "Gem" button_type="submit" icon="floppy-disk" button_class="btn-primary" %} + {% translate "Gem" as BUTTON_TEXT %} + {% bootstrap_button BUTTON_TEXT button_type="submit" icon="floppy-disk" button_class="btn-primary" %} {% endbuttons %}
{% else %} diff --git a/events/templates/events.html b/events/templates/events.html index b69e36a..bb679b4 100644 --- a/events/templates/events.html +++ b/events/templates/events.html @@ -46,7 +46,8 @@

{% translate "Tilmelding" %}

{% bootstrap_form events_data.form %} {% buttons %} - {% bootstrap_button "Gem" button_type="submit" icon="floppy-disk" button_class="btn-primary" %} + {% translate "Gem" as BUTTON_TEXT %} + {% bootstrap_button BUTTON_TEXT button_type="submit" icon="floppy-disk" button_class="btn-primary" %} {% endbuttons %} diff --git a/fredagscafeen/settings/base.py b/fredagscafeen/settings/base.py index c6b54de..e868940 100644 --- a/fredagscafeen/settings/base.py +++ b/fredagscafeen/settings/base.py @@ -302,9 +302,8 @@ # Server admins (get an email when server errors happen) ADMINS = [ - ("Oskar Haarklou Veileborg", "oskarv@post.au.dk"), - ("Asger Hautop Drewsen", "asgerdrewsen@gmail.com"), ("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) diff --git a/locale/da/LC_MESSAGES/django.po b/locale/da/LC_MESSAGES/django.po index 35fc735..0d66526 100644 --- a/locale/da/LC_MESSAGES/django.po +++ b/locale/da/LC_MESSAGES/django.po @@ -8,60 +8,15 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-07-11 18:46+0200\n" -"PO-Revision-Date: 2024-07-11 18:47+0050\n" -"Last-Translator: \n" +"POT-Creation-Date: 2024-07-10 11:24+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" "Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Translated-Using: django-rosetta 0.9.9\n" - -#: bartab/forms.py:9 -msgid "First to include" -msgstr "Inkluder først" - -#: bartab/forms.py:12 -msgid "Last to include" -msgstr "Inkluder sidst" - -#: bartab/models.py:87 -msgid "Can't have both bartender shift and custom datetime" -msgstr "Kan ikke have både bartenderskift og tilpasset datetime" - -#: bartab/models.py:90 -msgid "Must have either bartender shift or custom datetime" -msgstr "Skal have enten bartendervagt eller tilpasset datetime" - -#: bartab/models.py:135 -msgid "Kontant?" -msgstr "" - -#: bartab/models.py:138 bartab/templates/bartab.html:20 -msgid "Indsat" -msgstr "" - -#: bartab/models.py:139 bartab/templates/bartab.html:21 -msgid "Køb" -msgstr "" - -#: bartab/models.py:143 -msgid "entries" -msgstr "" - -#: bartab/models.py:144 -msgid "Bruger" -msgstr "" - -#: bartab/models.py:161 -msgid "Vælg kontant eller ej." -msgstr "" - -#: bartab/sumfield.py:31 -msgid "Invalid sum" -msgstr "" #: bartab/templates/bartab.html:8 msgid "Krydslisteaktivitet" @@ -83,24 +38,16 @@ msgstr "" msgid "Dato" msgstr "" -#: bartab/templates/bartab.html:37 -msgid "er ikke på krydslisten." -msgstr "" - -#: bartab/templates/bartab/consumption.html:7 -msgid "Submit" -msgstr "Indsend" - -#: bartab/templates/bartab/consumption.html:10 -msgid "Result" +#: bartab/templates/bartab.html:20 +msgid "Indsat" msgstr "" -#: bartab/templates/bartab/consumption.html:15 events/templates/events.html:68 -msgid "Navn" +#: bartab/templates/bartab.html:21 +msgid "Køb" msgstr "" -#: bartab/templates/bartab/consumption.html:16 -msgid "Forbrug" +#: bartab/templates/bartab.html:37 +msgid "er ikke på krydslisten." msgstr "" #: bartenders/models.py:51 @@ -143,16 +90,22 @@ msgstr "" msgid "Eventuelle ekstra info til bestyrelsen skrives her" msgstr "" +#: bartenders/templates/ballots_update.html:18 +#: bartenders/templates/bartender_info.html:36 +#: bartenders/templates/bartender_info.html:84 events/templates/events.html:49 +msgid "Gem" +msgstr "" + #: bartenders/templates/barplan.html:8 web/templates/base.html:60 msgid "Barplan" msgstr "" -#: bartenders/templates/barplan.html:11 bartenders/templates/barplan.html:53 +#: bartenders/templates/barplan.html:11 bartenders/templates/barplan.html:52 #: events/templates/events.html:12 msgid "Vis nuværende" msgstr "" -#: bartenders/templates/barplan.html:13 bartenders/templates/barplan.html:55 +#: bartenders/templates/barplan.html:13 bartenders/templates/barplan.html:54 #: events/templates/events.html:14 msgid "Vis også tidligere" msgstr "" @@ -166,81 +119,73 @@ msgstr "" msgid "Bartendere" msgstr "" -#: bartenders/templates/barplan.html:34 -msgid "Bartender's first shift" -msgstr "" - -#: bartenders/templates/barplan.html:50 bartenders/views.py:147 +#: bartenders/templates/barplan.html:49 msgid "Pantvagter" msgstr "" -#: bartenders/templates/barplan.html:61 +#: bartenders/templates/barplan.html:60 msgid "Uge" msgstr "" -#: bartenders/templates/barplan.html:62 udlejning/models.py:107 +#: bartenders/templates/barplan.html:61 udlejning/models.py:107 msgid "Ansvarlige" msgstr "" -#: bartenders/templates/barplan.html:74 -msgid "Bartender's first deposit shift" -msgstr "" - -#: bartenders/templates/barplan.html:79 -msgid "Edit" -msgstr "Rediger" - -#: bartenders/templates/bartender_info.html:38 +#: bartenders/templates/bartender_info.html:39 msgid "Bartender status" msgstr "" -#: bartenders/templates/bartender_info.html:40 +#: bartenders/templates/bartender_info.html:41 msgid "Aktiv" msgstr "" -#: bartenders/templates/bartender_info.html:41 -msgid "Bliv inaktiv" +#: bartenders/templates/bartender_info.html:42 +msgid "Er du sikker?" msgstr "" -#: bartenders/templates/bartender_info.html:43 -msgid "Inaktiv" +#: bartenders/templates/bartender_info.html:42 +#: bartenders/templates/bartender_info.html:49 +msgid "" +"Husk at du som inaktiv bartender ikke kan komme til bartenderarrangementerne." +msgstr "" + +#: bartenders/templates/bartender_info.html:42 +msgid "Bliv inaktiv" msgstr "" #: bartenders/templates/bartender_info.html:44 -msgid "Hvis du gerne vil være aktive igen, så kontakt" +msgid "Inaktiv" msgstr "" -#: bartenders/templates/bartender_info.html:48 -msgid "" -"Husk at du som inaktiv bartender ikke kan komme til " -"bartenderarrangementerne." +#: bartenders/templates/bartender_info.html:45 +msgid "Hvis du gerne vil være aktiv igen, så kontakt" msgstr "" -#: bartenders/templates/bartender_info.html:51 +#: bartenders/templates/bartender_info.html:52 msgid "Mailinglist status" msgstr "" -#: bartenders/templates/bartender_info.html:53 +#: bartenders/templates/bartender_info.html:54 msgid "På mailinglisten" msgstr "" -#: bartenders/templates/bartender_info.html:55 +#: bartenders/templates/bartender_info.html:56 msgid "Meld dig af mailinglisten" msgstr "" -#: bartenders/templates/bartender_info.html:58 +#: bartenders/templates/bartender_info.html:59 msgid "Ikke på mailinglisten" msgstr "" -#: bartenders/templates/bartender_info.html:59 +#: bartenders/templates/bartender_info.html:60 msgid "Meld dig på mailinglisten" msgstr "" -#: bartenders/templates/bartender_info.html:65 +#: bartenders/templates/bartender_info.html:66 msgid "Datoer, hvor du ikke har mulighed for at stå i bar" msgstr "" -#: bartenders/templates/bartender_info.html:87 +#: bartenders/templates/bartender_info.html:89 msgid "er ikke bartender." msgstr "" @@ -323,42 +268,6 @@ msgstr "" msgid "Bartendertilmeldingen er lukket." msgstr "" -#: bartenders/views.py:62 -msgid "Din ansøgning er blevet indsendt." -msgstr "" - -#: bartenders/views.py:108 -msgid "Barvagter" -msgstr "" - -#: bartenders/views.py:131 bartenders/views.py:170 -msgid "Responsible" -msgstr "Ansvarlige" - -#: bartenders/views.py:132 -msgid "Other bartenders" -msgstr "Andre bartendere" - -#: bartenders/views.py:281 -msgid "Profil opdateret" -msgstr "" - -#: events/admin.py:16 -msgid "Chosen options" -msgstr "Valgte muligheder" - -#: events/admin.py:72 -msgid "Default allowed attendees" -msgstr "Standard tilladte deltagere" - -#: events/admin.py:73 -msgid "Can be overwritten using the whitelist and blacklist above." -msgstr "Kan overskrives ved hjælp af whitelisten og blacklisten ovenfor." - -#: events/admin.py:86 -msgid "bartenders" -msgstr "bartendere" - #: events/forms.py:21 events/forms.py:59 msgid "Deltager" msgstr "" @@ -367,16 +276,6 @@ msgstr "" msgid "Deltager ikke" msgstr "" -#: events/forms.py:91 -#, python-format -msgid "Du skal udfylde %(choice_name)s, når du deltager" -msgstr "" - -#: events/forms.py:98 -#, python-format -msgid "Der er for mange der har valgt %(option_option)s. Vælg noget andet." -msgstr "" - #: events/templates/events.html:8 msgid "Bartender events" msgstr "" @@ -422,7 +321,7 @@ msgid "" "end en måned siden." msgstr "" -#: events/templates/events.html:37 events/views.py:97 +#: events/templates/events.html:37 msgid "Tilmeldingsfrist" msgstr "" @@ -442,25 +341,12 @@ msgstr "" msgid "Tilmelding" msgstr "" -#: events/templates/events.html:59 +#: events/templates/events.html:60 msgid "Tilmeldte" msgstr "" -#: events/views.py:57 -msgid "Event with id does not exist" -msgstr "Event med id findes ikke" - -#: events/views.py:61 -msgid "Not logged in as an active bartender" -msgstr "Ikke logget ind som en aktiv bartender" - -#: events/views.py:71 -#, python-format -msgid "Opdateret tilmelding til %(event_name)s" -msgstr "" - -#: events/views.py:79 -msgid "Bartender Events" +#: events/templates/events.html:69 +msgid "Navn" msgstr "" #: fredagscafeen/admin_filters.py:30 @@ -502,8 +388,8 @@ msgstr "" #: 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 "" #: guides/templates/guides.html:12 @@ -588,8 +474,8 @@ msgstr "" #: 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 "" #: udlejning/models.py:67 @@ -712,8 +598,7 @@ msgstr "" #: 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 "" #: udlejning/templates/udlejning.html:43 @@ -730,8 +615,8 @@ msgstr "" #: 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 "" #: udlejning/templates/udlejning.html:51 @@ -774,10 +659,10 @@ msgstr "" #: 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 "" #: udlejning/templates/udlejning.html:73 @@ -794,8 +679,8 @@ 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 "" #: udlejning/templates/udlejning.html:78 @@ -812,8 +697,7 @@ msgstr "" #: 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 "" #: udlejning/templates/udlejning.html:93 @@ -958,48 +842,54 @@ msgstr "" msgid "højtalere" msgstr "" -#: web/templates/about.html:26 +#: udlejning/views.py:40 +msgid "" +"Din anmodning om at låne fadølsanlægget er modtaget. Vi vender tilbage til " +"dig med et svar hurtigst muligt." +msgstr "" + +#: web/templates/about.html:6 msgid "Generel info" msgstr "" -#: web/templates/about.html:28 +#: web/templates/about.html:8 msgid "befinder sig kælderen i Nygaard-bygningen på Institut for Datalogi" msgstr "" -#: web/templates/about.html:29 +#: web/templates/about.html:9 msgid "Baren har åbent" msgstr "" -#: web/templates/about.html:29 +#: web/templates/about.html:9 msgctxt "Baren har åbent alle fredage..." msgid "alle" msgstr "" -#: web/templates/about.html:29 +#: web/templates/about.html:9 msgid "fredage fra klokken 15.00 til vi lukker." msgstr "" -#: web/templates/about.html:37 +#: web/templates/about.html:17 msgid "Direktion" msgstr "" -#: web/templates/about.html:38 +#: web/templates/about.html:18 msgid "s direktion består af" msgstr "" -#: web/templates/about.html:47 +#: web/templates/about.html:27 msgid "Postadresse" msgstr "" -#: web/templates/about.html:49 +#: web/templates/about.html:29 msgid "Vores postadresse er" msgstr "" -#: web/templates/about.html:58 +#: web/templates/about.html:38 msgid "Bestyrelsen kan kontaktes på" msgstr "" -#: web/templates/about.html:63 +#: web/templates/about.html:43 msgid "Vores CVR-nr er" msgstr "" @@ -1055,11 +945,10 @@ msgstr "" msgid "Log ud" msgstr "" -#: web/templates/base.html:109 +#: web/templates/base.html:124 msgid "er en fredagsbar for datalogi og IT på Aarhus Universitet." msgstr "" -#: web/views.py:47 -msgid "" -"Login mail sendt: Tryk på linket i din modtagede mail for at logge ind." +#: web/templates/login.html:12 +msgid "Log ind" msgstr "" diff --git a/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo index 3eac809..009eb9c 100644 Binary files a/locale/en/LC_MESSAGES/django.mo and b/locale/en/LC_MESSAGES/django.mo differ diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po index b9048cc..5ec6efa 100644 --- a/locale/en/LC_MESSAGES/django.po +++ b/locale/en/LC_MESSAGES/django.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-07-11 18:46+0200\n" -"PO-Revision-Date: 2024-07-11 18:35+0050\n" +"POT-Creation-Date: 2024-07-10 11:24+0200\n" +"PO-Revision-Date: 2024-07-10 11:27+0050\n" "Last-Translator: \n" "Language-Team: LANGUAGE \n" "Language: \n" @@ -19,50 +19,6 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Translated-Using: django-rosetta 0.9.9\n" -#: bartab/forms.py:9 -msgid "First to include" -msgstr "First to include" - -#: bartab/forms.py:12 -msgid "Last to include" -msgstr "Last to include" - -#: bartab/models.py:87 -msgid "Can't have both bartender shift and custom datetime" -msgstr "Can't have both bartender shift and custom datetime" - -#: bartab/models.py:90 -msgid "Must have either bartender shift or custom datetime" -msgstr "Must have either bartender shift or custom datetime" - -#: bartab/models.py:135 -msgid "Kontant?" -msgstr "Cash?" - -#: bartab/models.py:138 bartab/templates/bartab.html:20 -msgid "Indsat" -msgstr "Deposited" - -#: bartab/models.py:139 bartab/templates/bartab.html:21 -msgid "Køb" -msgstr "Purchases" - -#: bartab/models.py:143 -msgid "entries" -msgstr "entries" - -#: bartab/models.py:144 -msgid "Bruger" -msgstr "User" - -#: bartab/models.py:161 -msgid "Vælg kontant eller ej." -msgstr "Choose cash or not." - -#: bartab/sumfield.py:31 -msgid "Invalid sum" -msgstr "Invalid sum" - #: bartab/templates/bartab.html:8 msgid "Krydslisteaktivitet" msgstr "Tab activity" @@ -83,26 +39,18 @@ msgstr "Total consumption" msgid "Dato" msgstr "Date" +#: bartab/templates/bartab.html:20 +msgid "Indsat" +msgstr "Deposited" + +#: bartab/templates/bartab.html:21 +msgid "Køb" +msgstr "Purchases" + #: bartab/templates/bartab.html:37 msgid "er ikke på krydslisten." msgstr "is not on the tab." -#: bartab/templates/bartab/consumption.html:7 -msgid "Submit" -msgstr "" - -#: bartab/templates/bartab/consumption.html:10 -msgid "Result" -msgstr "Result" - -#: bartab/templates/bartab/consumption.html:15 events/templates/events.html:68 -msgid "Navn" -msgstr "Name" - -#: bartab/templates/bartab/consumption.html:16 -msgid "Forbrug" -msgstr "Consumption" - #: bartenders/models.py:51 msgid "Fulde navn" msgstr "Full name" @@ -143,16 +91,22 @@ msgstr "Year" msgid "Eventuelle ekstra info til bestyrelsen skrives her" msgstr "Any additional information for the board can be written here" +#: bartenders/templates/ballots_update.html:18 +#: bartenders/templates/bartender_info.html:36 +#: bartenders/templates/bartender_info.html:84 events/templates/events.html:49 +msgid "Gem" +msgstr "Save" + #: bartenders/templates/barplan.html:8 web/templates/base.html:60 msgid "Barplan" msgstr "Bar Plan" -#: bartenders/templates/barplan.html:11 bartenders/templates/barplan.html:53 +#: bartenders/templates/barplan.html:11 bartenders/templates/barplan.html:52 #: events/templates/events.html:12 msgid "Vis nuværende" msgstr "Show current" -#: bartenders/templates/barplan.html:13 bartenders/templates/barplan.html:55 +#: bartenders/templates/barplan.html:13 bartenders/templates/barplan.html:54 #: events/templates/events.html:14 msgid "Vis også tidligere" msgstr "Also show earlier" @@ -166,82 +120,77 @@ msgstr "Responsible" msgid "Bartendere" msgstr "Bartenders" -#: bartenders/templates/barplan.html:34 -msgid "Bartender's first shift" -msgstr "Bartender's first shift" - -#: bartenders/templates/barplan.html:50 bartenders/views.py:147 +#: bartenders/templates/barplan.html:49 msgid "Pantvagter" msgstr "Deposit shifts" -#: bartenders/templates/barplan.html:61 +#: bartenders/templates/barplan.html:60 msgid "Uge" msgstr "Week" -#: bartenders/templates/barplan.html:62 udlejning/models.py:107 +#: bartenders/templates/barplan.html:61 udlejning/models.py:107 msgid "Ansvarlige" msgstr "Responsible" -#: bartenders/templates/barplan.html:74 -msgid "Bartender's first deposit shift" -msgstr "Bartender's first deposit shift" - -#: bartenders/templates/barplan.html:79 -msgid "Edit" -msgstr "Edit" - -#: bartenders/templates/bartender_info.html:38 +#: bartenders/templates/bartender_info.html:39 msgid "Bartender status" msgstr "Bartender status" -#: bartenders/templates/bartender_info.html:40 +#: bartenders/templates/bartender_info.html:41 msgid "Aktiv" msgstr "Active" -#: bartenders/templates/bartender_info.html:41 +#: bartenders/templates/bartender_info.html:42 +msgid "Er du sikker?" +msgstr "Are you sure?" + +#: bartenders/templates/bartender_info.html:42 +#: bartenders/templates/bartender_info.html:49 +msgid "" +"Husk at du som inaktiv bartender ikke kan komme til " +"bartenderarrangementerne." +msgstr "" +"Remember that as an inactive bartender you cannot come to the bartender " +"events." + +#: bartenders/templates/bartender_info.html:42 msgid "Bliv inaktiv" -msgstr "Become active" +msgstr "Become inactive" -#: bartenders/templates/bartender_info.html:43 +#: bartenders/templates/bartender_info.html:44 msgid "Inaktiv" msgstr "Inactive" -#: bartenders/templates/bartender_info.html:44 -msgid "Hvis du gerne vil være aktive igen, så kontakt" -msgstr "If you wish to be active again, contact" - -#: bartenders/templates/bartender_info.html:48 -msgid "" -"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." +#: bartenders/templates/bartender_info.html:45 +#| msgid "Hvis du gerne vil være aktive igen, så kontakt" +msgid "Hvis du gerne vil være aktiv igen, så kontakt" +msgstr "If you wish to become active again, please contact" -#: bartenders/templates/bartender_info.html:51 +#: bartenders/templates/bartender_info.html:52 msgid "Mailinglist status" msgstr "Mailing list status" -#: bartenders/templates/bartender_info.html:53 +#: bartenders/templates/bartender_info.html:54 msgid "På mailinglisten" msgstr "On the mailing list" -#: bartenders/templates/bartender_info.html:55 +#: bartenders/templates/bartender_info.html:56 msgid "Meld dig af mailinglisten" msgstr "Sign up for the mailing list" -#: bartenders/templates/bartender_info.html:58 +#: bartenders/templates/bartender_info.html:59 msgid "Ikke på mailinglisten" msgstr "Not on the mailing list" -#: bartenders/templates/bartender_info.html:59 +#: bartenders/templates/bartender_info.html:60 msgid "Meld dig på mailinglisten" msgstr "Sign up for the mailing list" -#: bartenders/templates/bartender_info.html:65 +#: bartenders/templates/bartender_info.html:66 msgid "Datoer, hvor du ikke har mulighed for at stå i bar" msgstr "Dates when you do not have the opportunity to stand at the bar" -#: bartenders/templates/bartender_info.html:87 +#: bartenders/templates/bartender_info.html:89 msgid "er ikke bartender." msgstr "is not a bartender." @@ -308,8 +257,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 @@ -336,42 +285,6 @@ msgstr "Submit" msgid "Bartendertilmeldingen er lukket." msgstr "Bartender applications are closed." -#: bartenders/views.py:62 -msgid "Din ansøgning er blevet indsendt." -msgstr "Your application has been submitted." - -#: bartenders/views.py:108 -msgid "Barvagter" -msgstr "Bar shifts" - -#: bartenders/views.py:131 bartenders/views.py:170 -msgid "Responsible" -msgstr "Responsible" - -#: bartenders/views.py:132 -msgid "Other bartenders" -msgstr "Other bartenders" - -#: bartenders/views.py:281 -msgid "Profil opdateret" -msgstr "Profile updated" - -#: events/admin.py:16 -msgid "Chosen options" -msgstr "Chosen options" - -#: events/admin.py:72 -msgid "Default allowed attendees" -msgstr "Default allowed attendees" - -#: events/admin.py:73 -msgid "Can be overwritten using the whitelist and blacklist above." -msgstr "Can be overwritten using the whitelist and blacklist above." - -#: events/admin.py:86 -msgid "bartenders" -msgstr "bartenders" - #: events/forms.py:21 events/forms.py:59 msgid "Deltager" msgstr "Attending" @@ -380,17 +293,6 @@ msgstr "Attending" msgid "Deltager ikke" msgstr "Not attending" -#: events/forms.py:91 -#, python-format -msgid "Du skal udfylde %(choice_name)s, når du deltager" -msgstr "You must fill in %(choice_name)s when you attend" - -#: events/forms.py:98 -#, python-format -msgid "Der er for mange der har valgt %(option_option)s. Vælg noget andet." -msgstr "" -"There are too many who have chosen %(option_option)s. Choose something else." - #: events/templates/events.html:8 msgid "Bartender events" msgstr "Bartender events" @@ -445,7 +347,7 @@ msgstr "" "There has been a bar guard during a bar guard plan period that ended less " "than a month ago." -#: events/templates/events.html:37 events/views.py:97 +#: events/templates/events.html:37 msgid "Tilmeldingsfrist" msgstr "Registration deadline" @@ -465,26 +367,13 @@ msgstr "Description" msgid "Tilmelding" msgstr "Sign up" -#: events/templates/events.html:59 +#: events/templates/events.html:60 msgid "Tilmeldte" msgstr "Registered participant" -#: events/views.py:57 -msgid "Event with id does not exist" -msgstr "Event with id does not exist" - -#: events/views.py:61 -msgid "Not logged in as an active bartender" -msgstr "Not logged in as an active bartender" - -#: events/views.py:71 -#, python-format -msgid "Opdateret tilmelding til %(event_name)s" -msgstr "Updated registration for %(event_name)s" - -#: events/views.py:79 -msgid "Bartender Events" -msgstr "Bartender Events" +#: events/templates/events.html:69 +msgid "Navn" +msgstr "Name" #: fredagscafeen/admin_filters.py:30 msgid "All" @@ -525,8 +414,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" @@ -617,8 +506,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?" @@ -720,8 +609,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" @@ -745,7 +634,8 @@ 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 @@ -762,8 +652,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:" @@ -793,9 +683,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 "" @@ -804,9 +694,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." @@ -816,10 +706,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 " @@ -840,15 +730,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" @@ -864,7 +754,8 @@ 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)" @@ -889,15 +780,16 @@ 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 "" @@ -1018,50 +910,58 @@ msgstr "Speakers" msgid "højtalere" msgstr "speakers" -#: web/templates/about.html:26 +#: udlejning/views.py:40 +msgid "" +"Din anmodning om at låne fadølsanlægget er modtaget. Vi vender tilbage til " +"dig med et svar hurtigst muligt." +msgstr "" +"Your request to borrow the draft beer system has been received. We will get " +"back to you with an answer as soon as possible." + +#: web/templates/about.html:6 msgid "Generel info" msgstr "General info" -#: web/templates/about.html:28 +#: web/templates/about.html:8 msgid "befinder sig kælderen i Nygaard-bygningen på Institut for Datalogi" msgstr "" "is located in the basement of the Nygaard building at the Department of " "Computer Science" -#: web/templates/about.html:29 +#: web/templates/about.html:9 msgid "Baren har åbent" msgstr "The bar is open" -#: web/templates/about.html:29 +#: web/templates/about.html:9 msgctxt "Baren har åbent alle fredage..." msgid "alle" msgstr "every" -#: web/templates/about.html:29 +#: web/templates/about.html:9 msgid "fredage fra klokken 15.00 til vi lukker." msgstr "friday from 3pm until we close." -#: web/templates/about.html:37 +#: web/templates/about.html:17 msgid "Direktion" msgstr "Management" -#: web/templates/about.html:38 +#: web/templates/about.html:18 msgid "s direktion består af" msgstr "'s management consists of" -#: web/templates/about.html:47 +#: web/templates/about.html:27 msgid "Postadresse" msgstr "Postal address" -#: web/templates/about.html:49 +#: web/templates/about.html:29 msgid "Vores postadresse er" msgstr "Our postal address is" -#: web/templates/about.html:58 +#: web/templates/about.html:38 msgid "Bestyrelsen kan kontaktes på" msgstr "The board can be contacted at" -#: web/templates/about.html:63 +#: web/templates/about.html:43 msgid "Vores CVR-nr er" msgstr "Our CVR number is" @@ -1117,13 +1017,13 @@ msgstr "Admin" msgid "Log ud" msgstr "Log out" -#: web/templates/base.html:109 +#: web/templates/base.html:124 msgid "er en fredagsbar for datalogi og IT på Aarhus Universitet." msgstr "is a friday bar for computer science and IT at Aarhus University." -#: web/views.py:47 -msgid "Login mail sendt: Tryk på linket i din modtagede mail for at logge ind." -msgstr "" +#: web/templates/login.html:12 +msgid "Log ind" +msgstr "Log in" #~ msgid "Fadølsanlæggene" #~ msgstr "Kegerators" diff --git a/udlejning/views.py b/udlejning/views.py index ef45707..91f6f62 100644 --- a/udlejning/views.py +++ b/udlejning/views.py @@ -2,6 +2,7 @@ from django.contrib import messages from django.utils import timezone +from django.utils.translation import ugettext_lazy as _ from django.views.generic import CreateView, ListView from .forms import UdlejningApplicationForm @@ -35,7 +36,9 @@ def form_valid(self, form): form.send_email(self.object.pk) messages.success( self.request, - "Din anmodning om at låne fadølsanlægget er modtaget. Vi vender tilbage til dig med et svar hurtigst muligt.", + _( + "Din anmodning om at låne fadølsanlægget er modtaget. Vi vender tilbage til dig med et svar hurtigst muligt." + ), ) return response diff --git a/web/static/css/stylesheet.css b/web/static/css/stylesheet.css index 2d22feb..d1bc386 100644 --- a/web/static/css/stylesheet.css +++ b/web/static/css/stylesheet.css @@ -132,3 +132,34 @@ footer { display: block !important; padding: 8px !important; } + +.google-maps { + max-width: 600px; + max-height: 450px; + position: relative; + padding-bottom: 450px; + height: 0; + overflow: hidden; +} + +.google-maps iframe { + position: absolute; + top: 0; + left: 0; + width: 100% !important; + height: 100% !important; +} + +.social-link { + flex: right; + padding: 0px; + height: 25px; + border: solid; + border-width: 0px; + border-radius: 5px; + border-color: white; +} + +.social-link:hover { + opacity: 0.6; +} diff --git a/web/static/images/facebook.png b/web/static/images/facebook.png new file mode 100644 index 0000000..bc92a32 Binary files /dev/null and b/web/static/images/facebook.png differ diff --git a/web/static/images/facebook_negative.png b/web/static/images/facebook_negative.png new file mode 100644 index 0000000..1c1eabe Binary files /dev/null and b/web/static/images/facebook_negative.png differ diff --git a/web/static/images/github.png b/web/static/images/github.png new file mode 100644 index 0000000..e0edec5 Binary files /dev/null and b/web/static/images/github.png differ diff --git a/web/static/images/github_negative.png b/web/static/images/github_negative.png new file mode 100644 index 0000000..903c52b Binary files /dev/null and b/web/static/images/github_negative.png differ diff --git a/web/static/images/instagram.png b/web/static/images/instagram.png new file mode 100644 index 0000000..845b7b6 Binary files /dev/null and b/web/static/images/instagram.png differ diff --git a/web/static/images/instagram_negative.png b/web/static/images/instagram_negative.png new file mode 100644 index 0000000..0fd9b16 Binary files /dev/null and b/web/static/images/instagram_negative.png differ diff --git a/web/templates/about.html b/web/templates/about.html index 190c835..9d100b8 100644 --- a/web/templates/about.html +++ b/web/templates/about.html @@ -3,26 +3,6 @@ {% block content %} {% load i18n %} - -

{% translate "Generel info" %}

Fredagscaféen {% translate "befinder sig kælderen i Nygaard-bygningen på Institut for Datalogi" %}, Finlandsgade 21, 8200 Aarhus N. diff --git a/web/templates/base.html b/web/templates/base.html index 4a3f695..4dacfe0 100644 --- a/web/templates/base.html +++ b/web/templates/base.html @@ -43,11 +43,11 @@

Fredagscaféen {% if LANGUAGE_CODE == 'da' %} - + {% elif LANGUAGE_CODE == 'en' %} - + {% endif %} @@ -72,7 +72,7 @@

  • {% translate "Guides" %}
    • -
  • Facebook
    • +
  • {% translate "Bestyrelsen" %}
  • {% translate "Events" %}
  • {% translate "Om baren" %}
    • @@ -106,8 +106,25 @@

    {% endblock %} diff --git a/web/templates/login.html b/web/templates/login.html index 0ed4416..663482f 100644 --- a/web/templates/login.html +++ b/web/templates/login.html @@ -1,5 +1,5 @@ {% extends 'base.html' %} - +{% load i18n %} {% load static %} {% load bootstrap3 %} @@ -9,7 +9,8 @@ {% csrf_token %} {% bootstrap_form form %} {% buttons %} - {% bootstrap_button "Log ind" button_type="submit" button_class="btn-primary" %} + {% translate "Log ind" as BUTTON_TEXT %} + {% bootstrap_button BUTTON_TEXT button_type="submit" button_class="btn-primary" %} {% endbuttons %}