From cbce7f9fd6041f88352ae62938a5f71a3a961314 Mon Sep 17 00:00:00 2001 From: Anders Bruun Severinsen <202204885@post.au.dk> Date: Mon, 30 Dec 2024 22:04:56 +0100 Subject: [PATCH] Added bartenders only event albums --- gallery/admin.py | 6 +- gallery/migrations/0006_auto_20241230_2158.py | 32 +++ gallery/models.py | 8 +- gallery/templates/gallery.html | 8 +- locale/da/LC_MESSAGES/django.mo | Bin 4202 -> 4007 bytes locale/da/LC_MESSAGES/django.po | 124 +++++------ locale/en/LC_MESSAGES/django.mo | Bin 29535 -> 27991 bytes locale/en/LC_MESSAGES/django.po | 194 +++++++++--------- web/templatetags/is_bartender.py | 17 ++ 9 files changed, 222 insertions(+), 167 deletions(-) create mode 100644 gallery/migrations/0006_auto_20241230_2158.py create mode 100644 web/templatetags/is_bartender.py diff --git a/gallery/admin.py b/gallery/admin.py index c79b877..21e1d42 100644 --- a/gallery/admin.py +++ b/gallery/admin.py @@ -36,7 +36,7 @@ class Meta: "publish_date", "year", "thumbnail", - "eventalbum", + "bartenderalbum", "description", "slug", ] @@ -47,11 +47,11 @@ class AlbumAdmin(admin.ModelAdmin): list_display = ("title", "year", "publish_date", "get_visibility_link") ordering = [ "-year", - "eventalbum", + "bartenderalbum", "-oldFolder", "-publish_date", ] # Reverse of models.Album.ordering - list_filter = ("year", "eventalbum") + list_filter = ("year", "bartenderalbum") # Form display of single album inlines = [InlineBaseMediaAdmin] diff --git a/gallery/migrations/0006_auto_20241230_2158.py b/gallery/migrations/0006_auto_20241230_2158.py new file mode 100644 index 0000000..da58789 --- /dev/null +++ b/gallery/migrations/0006_auto_20241230_2158.py @@ -0,0 +1,32 @@ +# Generated by Django 3.2.25 on 2024-12-30 20:58 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("gallery", "0005_alter_album_options"), + ] + + operations = [ + migrations.AlterModelOptions( + name="album", + options={ + "ordering": ["year", "bartenderalbum", "oldFolder", "-publish_date"] + }, + ), + migrations.RemoveField( + model_name="album", + name="eventalbum", + ), + migrations.AddField( + model_name="album", + name="bartenderalbum", + field=models.BooleanField( + default=False, + help_text="Bartenderarrangementer er kun synlige for bartendere", + verbose_name="Bartenderarrangement", + ), + ), + ] diff --git a/gallery/models.py b/gallery/models.py index 7b71294..bc301ce 100644 --- a/gallery/models.py +++ b/gallery/models.py @@ -26,7 +26,7 @@ @python_2_unicode_compatible class Album(models.Model): class Meta: - ordering = ["year", "-eventalbum", "oldFolder", "-publish_date"] + ordering = ["year", "bartenderalbum", "oldFolder", "-publish_date"] unique_together = (("year", "slug"),) title = models.CharField(max_length=200, verbose_name=_("Titel")) @@ -36,7 +36,11 @@ class Meta: thumbnail = models.ImageField( upload_to="galleries", blank=True, null=True, verbose_name=_("Thumbnail") ) - eventalbum = models.BooleanField(default=True, verbose_name=_("Arrangement")) + bartenderalbum = models.BooleanField( + default=False, + verbose_name=_("Bartenderarrangement"), + help_text=_("Bartenderarrangementer er kun synlige for bartendere"), + ) year = models.PositiveSmallIntegerField(default=get_year, verbose_name=_("Årgang")) slug = models.SlugField(verbose_name=_("Kort titel")) description = models.TextField(blank=True, verbose_name=_("Beskrivelse")) diff --git a/gallery/templates/gallery.html b/gallery/templates/gallery.html index 0ea83a7..3652b40 100644 --- a/gallery/templates/gallery.html +++ b/gallery/templates/gallery.html @@ -1,6 +1,7 @@ {% extends 'base.html' %} {% load i18n %} {% load static %} +{% load is_bartender %} {% load bootstrap5 bootstrap_icons %} @@ -32,14 +33,16 @@

{% for album, firstFile in albumSets %} - {% ifchanged album.eventalbum %}{% if not album.eventalbum %} + {% ifchanged album.bartenderalbum %}{% if album.bartenderalbum and user|is_bartender %}
-

{% translate "Årets gang" %}:

+

{% translate "Bartenderarrangementer" %}:

{% endif %}{% endifchanged %} + {% if album.bartenderalbum and not user|is_bartender %} + {% else %}
@@ -63,6 +66,7 @@
{{ album.title }}
+ {% endif %} {% endfor %}
diff --git a/locale/da/LC_MESSAGES/django.mo b/locale/da/LC_MESSAGES/django.mo index 8e0de0c384c4ba94107bb0129e7dd57d82213b4e..b6fc89a2718a9df698d60642f48abd35dbb320c7 100644 GIT binary patch delta 1272 zcma*lPe@cz6vy#n&ZLe1$|5Tbr*vY<8G18jnOQ*^wG^~XBskG4!kS>3TFhoDf@)C_ zQxSyySxAMgGBSuvhzJRxO|=tpsU^4yT~yy+T&QKkoAh4!HP;i;p6gz2&At#&IovMHTuBwXhOiwiFvt@fHk` z-*&pde$-04FoHeEe=Ucb@Emg45VtaXhDjX7Qk=u(xPY6nk}N8G7gk{huEK6q2TtfY z`RxG%b$t*U@iD5>2~?s<<>j!BUIE(7UO;r3Ts<7v7{sz^7_oy@S!NupWiTOM#afJR;lf_VHq!m?o zKdR$d)ET*)XQ0Yoq7uJGwdNCU#c%F;1Itz7C^ldWbw;{SEl=T}1gMT=QHA7?n(RDk zLDx`cHs7%we|w4(7ULF_p1u` zf(O^9GMQBRn19kwXKha^ll9X_{LDW=KQlZVydK!l6Yt3QsqFDn>3C-<>$ioIUUEx3 sk&HKc;bfw%WqXsC@Vr7UR9mV@vdv2l4}|)P{v$zQHdr$pD(?&Y1}wadg8%>k delta 1490 zcmXxkK}geK7{~EPo#oVJZKW%#tz1^i)JCmAOjV;eT33O|Z5u zWXofO`RxTas`N8zqF<f8jTwYSf?X~#Ua;CEEzjr2?JJCQ|O7oILN>p`tFOSSx|Jw&~qMs39mYU|!1e`-IS ze{nD4YF5#O2W#oSS~bE0Rh~f>Z&_5ulc)~lQ4`K$Bfdm+LQWOT}V$S|pBC40$@ zq)vJ%BHSe0U=3\n" "Language-Team: LANGUAGE \n" "Language: \n" @@ -76,7 +76,7 @@ msgid "Total forbrug" msgstr "Total forbrug" #: bartab/templates/bartab.html:23 bartenders/templates/barplan.html:31 -#: gallery/models.py:101 +#: gallery/models.py:103 msgid "Dato" msgstr "Dato" @@ -145,7 +145,7 @@ msgstr "til" msgid "Studie" msgstr "Studie" -#: bartenders/models.py:243 gallery/models.py:40 +#: bartenders/models.py:243 gallery/models.py:42 msgid "Årgang" msgstr "Årgang" @@ -196,7 +196,7 @@ msgid "Bartender's first shift" msgstr "Bartenderens første vagt" #: bartenders/templates/barplan.html:50 bartenders/templates/barplan.html:134 -#: bartenders/templates/board.html:34 gallery/templates/gallery.html:24 +#: bartenders/templates/board.html:34 gallery/templates/gallery.html:25 #: items/templates/items.html:79 msgid "Edit" msgstr "Rediger" @@ -240,7 +240,8 @@ msgstr "" #: bartenders/templates/bartender_info.html:49 #: bartenders/templates/bartender_info.html:56 msgid "" -"Husk at du som inaktiv bartender ikke kan komme til bartenderarrangementerne." +"Husk at du som inaktiv bartender ikke kan komme til " +"bartenderarrangementerne." msgstr "" #: bartenders/templates/bartender_info.html:49 @@ -486,7 +487,7 @@ msgstr "" msgid "Lokation" msgstr "" -#: events/templates/events.html:39 gallery/models.py:42 +#: events/templates/events.html:39 gallery/models.py:44 msgid "Beskrivelse" msgstr "" @@ -551,59 +552,64 @@ msgstr "" msgid "Udgivelsesdato" msgstr "" -#: gallery/models.py:37 gallery/models.py:122 gallery/models.py:155 +#: gallery/models.py:37 gallery/models.py:124 gallery/models.py:157 msgid "Thumbnail" msgstr "" -#: gallery/models.py:39 -msgid "Arrangement" +#: gallery/models.py:40 +#| msgid "Bartendere" +msgid "Bartenderarrangement" +msgstr "Bartenderarrangement" + +#: gallery/models.py:41 +msgid "Bartenderarrangementer er kun synlige for bartendere" msgstr "" -#: gallery/models.py:41 gallery/models.py:107 +#: gallery/models.py:43 gallery/models.py:109 msgid "Kort titel" msgstr "" -#: gallery/models.py:77 items/templates/items.html:55 +#: gallery/models.py:79 items/templates/items.html:55 msgid "Image" msgstr "Billede" -#: gallery/models.py:78 +#: gallery/models.py:80 msgid "Video" msgstr "" -#: gallery/models.py:79 +#: gallery/models.py:81 msgid "Audio" msgstr "" -#: gallery/models.py:80 +#: gallery/models.py:82 msgid "Other" msgstr "" -#: gallery/models.py:89 +#: gallery/models.py:91 msgid "Synligt" msgstr "" -#: gallery/models.py:90 +#: gallery/models.py:92 msgid "Frasorteret" msgstr "" -#: gallery/models.py:91 +#: gallery/models.py:93 msgid "Skjult" msgstr "" -#: gallery/models.py:92 +#: gallery/models.py:94 msgid "Slet" msgstr "" -#: gallery/models.py:93 +#: gallery/models.py:95 msgid "Ubesluttet" msgstr "" -#: gallery/models.py:103 +#: gallery/models.py:105 msgid "Synlighed" msgstr "" -#: gallery/models.py:105 +#: gallery/models.py:107 msgid "Overskrift" msgstr "" @@ -692,11 +698,12 @@ msgstr "" msgid "Tilbage til" msgstr "" -#: gallery/templates/gallery.html:39 -msgid "Årets gang" -msgstr "" +#: gallery/templates/gallery.html:40 +#| msgid "Bartendere" +msgid "Bartenderarrangementer" +msgstr "Bartenderarrangementer" -#: gallery/templates/gallery.html:55 +#: gallery/templates/gallery.html:58 msgid "" "\n" " billede\n" @@ -708,7 +715,7 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: gallery/templates/gallery.html:76 +#: gallery/templates/gallery.html:80 msgid "Ingen albums med billeder fundet." msgstr "" @@ -775,8 +782,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 @@ -788,12 +795,9 @@ msgstr "" #: items/templates/items.html:11 msgid "" "\n" -"\tHer kan du se Fredagscaféens faste sortiment, og mange af de ting vi er " -"kendte for at sælge.\n" -"\tMen derudover finder du altid et stort sortiment af spændende og nye " -"specialøl, for enhver smag, i baren.\n" -"\tVi har i Fredagscaféen et stort fokus på at have noget for alle, så derfor " -"finder du også flere\n" +"\tHer kan du se Fredagscaféens faste sortiment, og mange af de ting vi er kendte for at sælge.\n" +"\tMen derudover finder du altid et stort sortiment af spændende og nye specialøl, for enhver smag, i baren.\n" +"\tVi har i Fredagscaféen et stort fokus på at have noget for alle, så derfor finder du også flere\n" "\tglutenfrie og alkoholfrie øl.\n" "\t" msgstr "" @@ -922,8 +926,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 @@ -1046,7 +1050,8 @@ msgstr "" #: udlejning/templates/udlejning.html:42 msgid "" -"Udelukkende arrangementer der finder sted på universitetet. Dette inkluderer:" +"Udelukkende arrangementer der finder sted på universitetet. Dette " +"inkluderer:" msgstr "" #: udlejning/templates/udlejning.html:44 @@ -1063,8 +1068,8 @@ msgstr "" #: udlejning/templates/udlejning.html:50 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:52 @@ -1107,10 +1112,10 @@ msgstr "" #: udlejning/templates/udlejning.html:72 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:74 @@ -1127,8 +1132,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:79 @@ -1145,7 +1150,8 @@ msgstr "" #: udlejning/templates/udlejning.html:91 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:94 @@ -1299,16 +1305,11 @@ msgstr "" #: web/templates/about.html:11 msgid "" "\n" -"Fredagscaféen er en studenterdrevet bar på Institut for Datalogi, Aarhus " -"Universitet,\n" -"som siden 1993 har været et socialt samlingspunkt for studerende og ansatte " -"på instituttet.\n" -"Vi er kendt for vores store udvalg af specialøl, der kontinuerligt " -"udskiftes.\n" -"Derudover har vi fokus på at have noget for enhver smag og prisklasse, og vi " -"har altid\n" -"et stort udvalg af sodavand, cider, shots, glutenfri øl og alkoholfrie " -"alternativer.\n" +"Fredagscaféen er en studenterdrevet bar på Institut for Datalogi, Aarhus Universitet,\n" +"som siden 1993 har været et socialt samlingspunkt for studerende og ansatte på instituttet.\n" +"Vi er kendt for vores store udvalg af specialøl, der kontinuerligt udskiftes.\n" +"Derudover har vi fokus på at have noget for enhver smag og prisklasse, og vi har altid\n" +"et stort udvalg af sodavand, cider, shots, glutenfri øl og alkoholfrie alternativer.\n" "Vi er samtidig den eneste fredagsbar i landet, der fast har pilsner fra\n" msgstr "" @@ -1327,16 +1328,14 @@ msgstr "" #: web/templates/about.html:27 msgid "" "\n" -"Fredagscaféen drives af en frivillig bestyrelse, der består af studerende på " -"instituttet,\n" +"Fredagscaféen drives af en frivillig bestyrelse, der består af studerende på instituttet,\n" "som også kan ses\n" msgstr "" #: web/templates/about.html:32 msgid "" "\n" -"Baren er non-profit, og overskuddet går til vedligeholdelse af baren og " -"arrangementer for bartenderene.\n" +"Baren er non-profit, og overskuddet går til vedligeholdelse af baren og arrangementer for bartenderene.\n" msgstr "" #: web/templates/about.html:39 @@ -1486,7 +1485,8 @@ msgid "Missing from environment" msgstr "Fraværende i miljøet" #: web/views.py:52 -msgid "Login mail sendt: Tryk på linket i din modtagede mail for at logge ind." +msgid "" +"Login mail sendt: Tryk på linket i din modtagede mail for at logge ind." msgstr "" #~ msgid "Bar open" diff --git a/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo index 2054964bc361847f577c05b890d7987950f7177c..dc62321e6158cbae1b8f4ccef76e16ff8ddbd3c7 100644 GIT binary patch delta 5500 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 A?f?J) delta 7079 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 XWc>7z#ZyY-hfkb3rF5hjK*9V8rXvO* diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po index 8737253..c0442e2 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-12-30 13:27+0100\n" -"PO-Revision-Date: 2024-12-30 13:06+0050\n" +"POT-Creation-Date: 2024-12-30 21:59+0100\n" +"PO-Revision-Date: 2024-12-30 22:02+0050\n" "Last-Translator: \n" "Language-Team: LANGUAGE \n" "Language: \n" @@ -76,7 +76,7 @@ msgid "Total forbrug" msgstr "Total consumption" #: bartab/templates/bartab.html:23 bartenders/templates/barplan.html:31 -#: gallery/models.py:101 +#: gallery/models.py:103 msgid "Dato" msgstr "Date" @@ -145,7 +145,7 @@ msgstr "to" msgid "Studie" msgstr "Study" -#: bartenders/models.py:243 gallery/models.py:40 +#: bartenders/models.py:243 gallery/models.py:42 msgid "Årgang" msgstr "Year" @@ -198,7 +198,7 @@ msgid "Bartender's first shift" msgstr "Bartender's first shift" #: bartenders/templates/barplan.html:50 bartenders/templates/barplan.html:134 -#: bartenders/templates/board.html:34 gallery/templates/gallery.html:24 +#: bartenders/templates/board.html:34 gallery/templates/gallery.html:25 #: items/templates/items.html:79 msgid "Edit" msgstr "Edit" @@ -242,7 +242,8 @@ msgstr "Are you sure?" #: bartenders/templates/bartender_info.html:49 #: bartenders/templates/bartender_info.html:56 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 bartender " "events." @@ -350,8 +351,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 @@ -512,7 +513,7 @@ msgstr "too late" msgid "Lokation" msgstr "Location" -#: events/templates/events.html:39 gallery/models.py:42 +#: events/templates/events.html:39 gallery/models.py:44 msgid "Beskrivelse" msgstr "Description" @@ -577,59 +578,65 @@ msgstr "Title" msgid "Udgivelsesdato" msgstr "Release date" -#: gallery/models.py:37 gallery/models.py:122 gallery/models.py:155 +#: gallery/models.py:37 gallery/models.py:124 gallery/models.py:157 msgid "Thumbnail" msgstr "Thumbnail" -#: gallery/models.py:39 -msgid "Arrangement" -msgstr "Event" +#: gallery/models.py:40 +#| msgid "interne arrangementer" +msgid "Bartenderarrangement" +msgstr "Bartender event" + +#: gallery/models.py:41 +#| msgid "arrangementer med tilknytning til baren" +msgid "Bartenderarrangementer er kun synlige for bartendere" +msgstr "Bartender events are only visible to bartenders" -#: gallery/models.py:41 gallery/models.py:107 +#: gallery/models.py:43 gallery/models.py:109 msgid "Kort titel" msgstr "Short title" -#: gallery/models.py:77 items/templates/items.html:55 +#: gallery/models.py:79 items/templates/items.html:55 msgid "Image" msgstr "Image" -#: gallery/models.py:78 +#: gallery/models.py:80 msgid "Video" msgstr "Video" -#: gallery/models.py:79 +#: gallery/models.py:81 msgid "Audio" msgstr "Audio" -#: gallery/models.py:80 +#: gallery/models.py:82 msgid "Other" msgstr "Other" -#: gallery/models.py:89 +#: gallery/models.py:91 msgid "Synligt" msgstr "Visible" -#: gallery/models.py:90 +#: gallery/models.py:92 msgid "Frasorteret" msgstr "Discarded" -#: gallery/models.py:91 +#: gallery/models.py:93 msgid "Skjult" msgstr "Hidden" -#: gallery/models.py:92 +#: gallery/models.py:94 msgid "Slet" msgstr "Delete" -#: gallery/models.py:93 +#: gallery/models.py:95 msgid "Ubesluttet" msgstr "Undecided" -#: gallery/models.py:103 +#: gallery/models.py:105 msgid "Synlighed" msgstr "Visibility" -#: gallery/models.py:105 +#: gallery/models.py:107 msgid "Overskrift" msgstr "Title" @@ -734,11 +741,12 @@ msgstr "has no images yet." msgid "Tilbage til" msgstr "Back to" -#: gallery/templates/gallery.html:39 -msgid "Årets gang" -msgstr "The years course" +#: gallery/templates/gallery.html:40 +#| msgid "interne arrangementer" +msgid "Bartenderarrangementer" +msgstr "Bartender events" -#: gallery/templates/gallery.html:55 +#: gallery/templates/gallery.html:58 msgid "" "\n" " billede\n" @@ -754,7 +762,7 @@ msgstr[1] "" "\n" "images" -#: gallery/templates/gallery.html:76 +#: gallery/templates/gallery.html:80 msgid "Ingen albums med billeder fundet." msgstr "No albums with images found." @@ -825,8 +833,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" @@ -842,22 +850,16 @@ msgstr "" #: items/templates/items.html:11 msgid "" "\n" -"\tHer kan du se Fredagscaféens faste sortiment, og mange af de ting vi er " -"kendte for at sælge.\n" -"\tMen derudover finder du altid et stort sortiment af spændende og nye " -"specialøl, for enhver smag, i baren.\n" -"\tVi har i Fredagscaféen et stort fokus på at have noget for alle, så derfor " -"finder du også flere\n" +"\tHer kan du se Fredagscaféens faste sortiment, og mange af de ting vi er kendte for at sælge.\n" +"\tMen derudover finder du altid et stort sortiment af spændende og nye specialøl, for enhver smag, i baren.\n" +"\tVi har i Fredagscaféen et stort fokus på at have noget for alle, så derfor finder du også flere\n" "\tglutenfrie og alkoholfrie øl.\n" "\t" msgstr "" "\n" -"Here you can see Fredagscaféen's fixed selection and many of the things we " -"are known for selling.\n" -"But in addition, you will always find a large range of exciting and new " -"specialty beers, for every taste, in the bar.\n" -"At Fredagscaféen, we have a big focus on having something for everyone, so " -"you will also find more\n" +"Here you can see Fredagscaféen's fixed selection and many of the things we are known for selling.\n" +"But in addition, you will always find a large range of exciting and new specialty beers, for every taste, in the bar.\n" +"At Fredagscaféen, we have a big focus on having something for everyone, so you will also find more\n" "gluten-free and alcohol-free beers." #: items/templates/items.html:22 @@ -986,8 +988,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?" @@ -1089,8 +1091,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:38 msgid "Anlæg udlånes kun til" @@ -1114,7 +1116,8 @@ msgstr "Internal events" #: udlejning/templates/udlejning.html:42 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:44 @@ -1131,8 +1134,8 @@ msgstr "Events with association" #: udlejning/templates/udlejning.html:50 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:" @@ -1162,9 +1165,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:66 msgid "" @@ -1173,9 +1176,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." @@ -1185,10 +1188,10 @@ msgstr "Request rental in good time" #: udlejning/templates/udlejning.html:72 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 " @@ -1209,15 +1212,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:79 msgid "Generelle informationer" @@ -1233,7 +1236,8 @@ msgstr "Our primary draft beer is" #: udlejning/templates/udlejning.html:91 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)" @@ -1254,15 +1258,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:106 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 e-mail to" +"We have a range of specialty beers available at: (it is not available at the" +" moment, but you can write an e-mail to" #: udlejning/templates/udlejning.html:109 msgid "" @@ -1398,29 +1403,19 @@ msgstr "General info" #: web/templates/about.html:11 msgid "" "\n" -"Fredagscaféen er en studenterdrevet bar på Institut for Datalogi, Aarhus " -"Universitet,\n" -"som siden 1993 har været et socialt samlingspunkt for studerende og ansatte " -"på instituttet.\n" -"Vi er kendt for vores store udvalg af specialøl, der kontinuerligt " -"udskiftes.\n" -"Derudover har vi fokus på at have noget for enhver smag og prisklasse, og vi " -"har altid\n" -"et stort udvalg af sodavand, cider, shots, glutenfri øl og alkoholfrie " -"alternativer.\n" +"Fredagscaféen er en studenterdrevet bar på Institut for Datalogi, Aarhus Universitet,\n" +"som siden 1993 har været et socialt samlingspunkt for studerende og ansatte på instituttet.\n" +"Vi er kendt for vores store udvalg af specialøl, der kontinuerligt udskiftes.\n" +"Derudover har vi fokus på at have noget for enhver smag og prisklasse, og vi har altid\n" +"et stort udvalg af sodavand, cider, shots, glutenfri øl og alkoholfrie alternativer.\n" "Vi er samtidig den eneste fredagsbar i landet, der fast har pilsner fra\n" msgstr "" "\n" -"Fredagscaféen is a student-run bar at the Department of Computer Science, " -"Aarhus University,\n" -"which has been a social gathering place for students and employees at the " -"department since 1993.\n" -"We are known for our large selection of specialty beers, which are " -"constantly being changed.\n" -"In addition, we focus on having something for every taste and price range, " -"and we always have\n" -"a large selection of soda, cider, shots, gluten-free beer and non-alcoholic " -"alternatives.\n" +"Fredagscaféen is a student-run bar at the Department of Computer Science, Aarhus University,\n" +"which has been a social gathering place for students and employees at the department since 1993.\n" +"We are known for our large selection of specialty beers, which are constantly being changed.\n" +"In addition, we focus on having something for every taste and price range, and we always have\n" +"a large selection of soda, cider, shots, gluten-free beer and non-alcoholic alternatives.\n" "We are also the only Friday bar in the country that always has lager from\n" #: web/templates/about.html:20 @@ -1441,24 +1436,20 @@ msgstr "here" #: web/templates/about.html:27 msgid "" "\n" -"Fredagscaféen drives af en frivillig bestyrelse, der består af studerende på " -"instituttet,\n" +"Fredagscaféen drives af en frivillig bestyrelse, der består af studerende på instituttet,\n" "som også kan ses\n" msgstr "" "\n" -"Fredagscaféen is run by a volunteer board of directors consisting of " -"students at the department,\n" +"Fredagscaféen is run by a volunteer board of directors consisting of students at the department,\n" "which can also be seen\n" #: web/templates/about.html:32 msgid "" "\n" -"Baren er non-profit, og overskuddet går til vedligeholdelse af baren og " -"arrangementer for bartenderene.\n" +"Baren er non-profit, og overskuddet går til vedligeholdelse af baren og arrangementer for bartenderene.\n" msgstr "" "\n" -"The bar is non-profit, and the profits go towards maintaining the bar and " -"events for the bartenders.\n" +"The bar is non-profit, and the profits go towards maintaining the bar and events for the bartenders.\n" #: web/templates/about.html:39 msgid "befinder sig kælderen i Nygaard-bygningen på Institut for Datalogi" @@ -1611,9 +1602,16 @@ msgid "Missing from environment" msgstr "Missing from environment" #: web/views.py:52 -msgid "Login mail sendt: Tryk på linket i din modtagede mail for at logge ind." +msgid "" +"Login mail sendt: Tryk på linket i din modtagede mail for at logge ind." msgstr "Login mail sent: Press the link in your received email to log in." +#~ msgid "Arrangement" +#~ msgstr "Event" + +#~ msgid "Årets gang" +#~ msgstr "The years course" + #~ msgid "Se bare tabellen nedenfor, over vores længste streaks." #~ msgstr "Just look at the table below, of our longest streaks." diff --git a/web/templatetags/is_bartender.py b/web/templatetags/is_bartender.py new file mode 100644 index 0000000..6b0c4c3 --- /dev/null +++ b/web/templatetags/is_bartender.py @@ -0,0 +1,17 @@ +from django import template + +from bartenders.models import Bartender + +register = template.Library() + + +@register.filter(name="is_bartender") +def is_bartender(user): + if not user.is_authenticated: + return False + + try: + bartender = Bartender.objects.get(email=user.email) + return bartender is not None + except Bartender.DoesNotExist: + return False