From 8d0d043e579d7ba245efaf0969a68e1a222e8230 Mon Sep 17 00:00:00 2001 From: Anders Bruun Severinsen <202204885@post.au.dk> Date: Sat, 29 Jun 2024 23:31:57 +0200 Subject: [PATCH 01/10] Fixed mobile translation --- udlejning/views.py | 5 ++++- web/templates/base.html | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) 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/templates/base.html b/web/templates/base.html index 4a3f695..a92cbe5 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 %} From 37de3972bf0bb7bcaece4afa93cbe525bb574136 Mon Sep 17 00:00:00 2001 From: Anders Bruun Severinsen <202204885@post.au.dk> Date: Sat, 29 Jun 2024 23:42:36 +0200 Subject: [PATCH 02/10] Fixed some translations --- locale/da/LC_MESSAGES/django.po | 10 ++++- locale/en/LC_MESSAGES/django.po | 76 ++++++++++++++++----------------- 2 files changed, 46 insertions(+), 40 deletions(-) diff --git a/locale/da/LC_MESSAGES/django.po b/locale/da/LC_MESSAGES/django.po index d925f74..cc9a538 100644 --- a/locale/da/LC_MESSAGES/django.po +++ b/locale/da/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-29 19:40+0200\n" +"POT-Creation-Date: 2024-06-29 23:42+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -249,7 +249,7 @@ msgid "" "indebærer." msgstr "" -#: bartenders/templates/index.html:23 +#: bartenders/templates/index.html:23 udlejning/templates/udlejning.html:120 msgid "Indsend" msgstr "" @@ -823,6 +823,12 @@ msgstr "" msgid "højtalere" msgstr "" +#: 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:26 msgid "Generel info" msgstr "" diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po index a296597..a3a74b6 100644 --- a/locale/en/LC_MESSAGES/django.po +++ b/locale/en/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-29 19:40+0200\n" +"POT-Creation-Date: 2024-06-29 23:42+0200\n" "PO-Revision-Date: 2024-06-29 21:31+0050\n" "Last-Translator: \n" "Language-Team: LANGUAGE \n" @@ -148,8 +148,7 @@ 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." +"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." @@ -245,8 +244,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 @@ -265,8 +264,7 @@ msgstr "" "before you sign up, so you know what a typical shift in Fredagscaféen " "involve." -#: bartenders/templates/index.html:23 -#| msgid "Indsat" +#: bartenders/templates/index.html:23 udlejning/templates/udlejning.html:120 msgid "Indsend" msgstr "Submit" @@ -395,8 +393,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" @@ -487,8 +485,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?" @@ -570,7 +568,6 @@ msgid "Uspecificeret" msgstr "Unspecified" #: udlejning/templates/udlejning.html:21 -#| msgid "reserveret af" msgid "anlæg, reserveret af" msgstr "kegerator, reserved by" @@ -591,8 +588,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" @@ -616,8 +613,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 @@ -634,8 +630,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:" @@ -665,9 +661,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 "" @@ -676,9 +672,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." @@ -688,10 +684,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 " @@ -712,15 +708,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" @@ -736,8 +732,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)" @@ -762,16 +757,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 "" @@ -892,6 +886,12 @@ msgstr "Speakers" msgid "højtalere" msgstr "speakers" +#: 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:26 msgid "Generel info" msgstr "General info" From 5fa3c87b37c88e77d1a51a65e0b7f0c1ce982eba Mon Sep 17 00:00:00 2001 From: Anders Bruun Severinsen <202204885@post.au.dk> Date: Sun, 30 Jun 2024 21:57:23 +0200 Subject: [PATCH 03/10] Translated buttons --- bartenders/templates/ballots_update.html | 3 +- bartenders/templates/bartender_info.html | 6 +- events/forms.py | 7 +- events/templates/events.html | 3 +- locale/da/LC_MESSAGES/django.po | 49 ++++++---- locale/en/LC_MESSAGES/django.mo | Bin 18547 -> 18933 bytes locale/en/LC_MESSAGES/django.po | 117 ++++++++++++++--------- web/templates/login.html | 3 +- 8 files changed, 117 insertions(+), 71 deletions(-) diff --git a/bartenders/templates/ballots_update.html b/bartenders/templates/ballots_update.html index 004b5ab..7dc8f4b 100644 --- a/bartenders/templates/ballots_update.html +++ b/bartenders/templates/ballots_update.html @@ -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..feece40 100644 --- a/bartenders/templates/bartender_info.html +++ b/bartenders/templates/bartender_info.html @@ -33,7 +33,8 @@
{% 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 %} @@ -80,7 +81,8 @@ {% buttons %} - {% bootstrap_button "Gem" button_type="submit" icon="floppy-disk" button_class="btn-primary" %} + {% translate "Log ind" as BUTTON_TEXT %} + {% bootstrap_button BUTTON_TEXT button_type="submit" icon="floppy-disk" button_class="btn-primary" %} {% endbuttons %}

{% else %} diff --git a/events/forms.py b/events/forms.py index 8d13dd7..918902c 100644 --- a/events/forms.py +++ b/events/forms.py @@ -1,4 +1,5 @@ from django import forms +from django.utils.translation import ugettext_lazy as _ from .models import EventChoiceOption, EventResponse @@ -17,8 +18,8 @@ def create_option(self, *args, **kwargs): class EventResponseForm(forms.Form): ATTENDING_CHOICES = ( (None, "---------"), - (True, "Deltager"), - (False, "Deltager ikke"), + (True, _("Deltager")), + (False, _("Deltager ikke")), ) def _to_bool(self, s): @@ -55,7 +56,7 @@ def __init__(self, *args, event, bartender, **kwargs): attending_choices = self.ATTENDING_CHOICES[1:] self.fields["attending"] = forms.TypedChoiceField( - label="Deltager", choices=attending_choices, coerce=self._to_bool + label=_("Deltager"), choices=attending_choices, coerce=self._to_bool ) if event_response: self.fields["attending"].initial = event_response.attending 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/locale/da/LC_MESSAGES/django.po b/locale/da/LC_MESSAGES/django.po index cc9a538..d9bdde1 100644 --- a/locale/da/LC_MESSAGES/django.po +++ b/locale/da/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-29 23:42+0200\n" +"POT-Creation-Date: 2024-06-30 21:55+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -90,6 +90,11 @@ msgstr "" msgid "Eventuelle ekstra info til bestyrelsen skrives her" msgstr "" +#: bartenders/templates/ballots_update.html:18 +#: bartenders/templates/bartender_info.html:36 events/templates/events.html:49 +msgid "Gem" +msgstr "" + #: bartenders/templates/barplan.html:8 web/templates/base.html:60 msgid "Barplan" msgstr "" @@ -125,56 +130,60 @@ msgstr "" msgid "Ansvarlige" msgstr "" -#: 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 +#: bartenders/templates/bartender_info.html:42 msgid "Bliv inaktiv" msgstr "" -#: bartenders/templates/bartender_info.html:43 +#: bartenders/templates/bartender_info.html:44 msgid "Inaktiv" msgstr "" -#: bartenders/templates/bartender_info.html:44 +#: bartenders/templates/bartender_info.html:45 msgid "Hvis du gerne vil være aktive igen, så kontakt" msgstr "" -#: bartenders/templates/bartender_info.html:48 +#: bartenders/templates/bartender_info.html:49 msgid "" "Husk at du som inaktiv bartender ikke kan komme til bartenderarrangementerne." 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:84 web/templates/login.html:12 +msgid "Log ind" +msgstr "" + +#: bartenders/templates/bartender_info.html:89 msgid "er ikke bartender." msgstr "" @@ -257,6 +266,14 @@ msgstr "" msgid "Bartendertilmeldingen er lukket." msgstr "" +#: events/forms.py:21 events/forms.py:59 +msgid "Deltager" +msgstr "" + +#: events/forms.py:22 +msgid "Deltager ikke" +msgstr "" + #: events/templates/events.html:8 msgid "Bartender events" msgstr "" @@ -322,11 +339,11 @@ msgstr "" msgid "Tilmelding" msgstr "" -#: events/templates/events.html:59 +#: events/templates/events.html:60 msgid "Tilmeldte" msgstr "" -#: events/templates/events.html:68 +#: events/templates/events.html:69 msgid "Navn" msgstr "" diff --git a/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo index 0a1442ff3697b952dc4ebcf9517b4cdca92d72dd..1c7c49f290d910460175fef659a8335074e45bcf 100644 GIT binary patch delta 3848 zcmYM$3vg7`9mnyr*$_g6n1qDzhQzemzkGiK$m|2vyvBlY>%jf3!_>t*y({}S`@ z8cxN$OlQ11aR~JQX5bpk!TWKjF$wcHg+dyh$1onno3QLgW3q4|>Uk3m#x1A;ceu}= zcKs1*g2TvPSB z0(l*kiMLT(a|*R3dAZIOj6ppw$4;Dy3j7y11rMSE{S*@w6uzXOl$GT{<&Sg*D#Rt! zOK}-)MWyUREX8Z64ERPFvmU48Slox>@I4%j{aA}RR3_mvoQzvgd%quj`1)w_PcY_l z8Wd?7vz1^bD&py=_G+xedZeq_RfXHfy~N4 z@e|Za3U6};tVDiH1HaO7Bhtle#>Kc72cfQ%GL(j2$81ypcbAa=G79Z948|8Q1^1v1 z(JQDFA4a9@7-|ncKxJwG^`3VkpJg&}18Rb2xb*e-dsF~Llby3M3H4q%YGDpsk&-kYGH zmA->Y$vNaWn17%G8O29I0~VrA`$XiXnku}0%5fO=HrMs2iMOC`!{eBWyYXxI94eqQ zsP_`*DJZ3XN9}!1DW6?jikj#H+=$mu5pQ6>)NeB`z~k78Bd72TH=$B|71e(L6;K9g zuEyc01$`6AWWp?`pgoMD2DlFu`4_1BeiapQ^@1io$jScu2 zauZE8|4FoPg>$3zd;t)CnDU*HPNx}E&br4VAH3-Fh&r%(f3!V>I9 z?b*0l&iA1h@1b6Tn&@GihublmE&ClRpuceBbv7=!4xsvHRyhkEQAPe0*+d$$unM)p zMQ**(t%p&W*of-C9d!u1-TFS%z;C+scaYsPAEDkWsCN2K!ffhQr~n%h6g1&d*A~|` zcr)z}pay;cm61KDd;1eqz=u&2yp8%^oJIA&fO+^i>I@8;?Mz&N>gU5bn3zF919zcT zwiz|x)2J1`;Ae+fGbdEpdFRUUtQFv_x9I+FrLd5OAEE~8$8@}g8YqnustM~+*XkZj!$;7IJ5gJ)3zdl;)B^UQ zg}=cRyok!!B{UQKt6O_}!hvMour_aQDDDr~QBz|(1uNLzZYS^0@^}(q%OCEDw1k7< zfEDSm{BbMPyC-a0tNks#2SYJ`IMmw{2-tDUj#~87IB}n~BxtR*!!5MMgP~^Hq}37( zSRHnYMeo>Jf7EL2jK+h3SlsI93gh=Km69%o{rH47qf!gXuOe&0|}Vp*g! z%AjjHZ6=LJtma5G8d+z>TWzZ)>R%nVnr%XkZHUF~4y)B4Q$5TJtL)%fyTxZMwXJo* zP{`7HoBgZWHO7WWCynt|^2ASU9Ru)UEE1s_v%VFH#e&Tt+h^wc!^yPLd8yuS_}3;E QP4%Ru1jEUBGm10+3+qhzz5oCK delta 3442 zcmYM$3rv<(9LMqV!pr3qLFDcQL;)2=1w^?h0)h$(lA0`Ximq^`g-v2Qa+^lI{ zmYUVvv127_g5}7MspD5THex*P z#3200@dU;&ziFqT344%WjfYWXG!mgnLJgdbDo!rCu?WXw2@b&q%*Q?WG+x9(Sk>PS zxE_n>H{vY(92YaciJ~6L{7Fk^S&QRvGivV~M=fQmMMIIaVIa1n2D*SM@$a|@{W(i> zu^LIr96@3*?Wp&E!vwsBnjnT9?Srvcj`66)r$GRGdx!VduUVRr+J7Ksr%N)q~n2zU zMhw8C=!2i4_RtAbB|4L-ze?841+C$2R3@<;QoT47pQjSZs0lt8&G#N}q5>%5@M~|( zM7=i$mDzk8kM+m_GVh|+yv^|(YRP{{q5f)I+l`m#Q}$NJL<;X)j~f@4sbokE@0 zuW$)=qXsI@uq!kd!|7L{uGgX}(}0=mnP>1m`X5iQ?*}uxDjSW;JQ3&U{MXXpWSLeR zfmcxjMP%9;4MLT0JF3K9jKB`e$6t``W0JG%U0;E!SQ94T7L3Nj&h^vCDw(tBVSeM6 zZBN(_siKL(C@e+|RE64v%N$o@BK;;*AkC=fT2K{fLp^^9wS>K>%x@sYFabGsMRL*7 zTF#)MH7r97G#@q4BGmC&g$wWnEWs<=_u^JqOb*LqL4R!9{#0T(g)I2UW zMk#tGQ~&;~RRtFm$g*5}FVr|TpkCO7%5)nlu>BZ{$55Gl;q)&!{i~=7{EK?t!x7P@ zi$(QQQR5a(q5is1$_1)p7NcI=g?ix~?2pG#0iHok_>JRb$6k!%`YqJJgYxW(B%qG* zC{(~%sPRisAEZi)hF+*feJCD7t^Een#Jf-r9>A%11Xb#rsK9;l?E#}u0S`xA&&Ewy zhCkzZ)RMFm*yDYMjr6S!8cS$YGWse!ie)&qkgQ$&qlC&hXPO<*497}Tz$52sGQcj_!tOoJHAN>tKsjuL4ogH(*indpNnP$jD=_C6R~=exB# z^p1C4Sc==bA!@k4_u%07LITsX\n" "Language-Team: LANGUAGE \n" "Language: \n" @@ -91,6 +91,11 @@ 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 events/templates/events.html:49 +msgid "Gem" +msgstr "Save" + #: bartenders/templates/barplan.html:8 web/templates/base.html:60 msgid "Barplan" msgstr "Bar Plan" @@ -126,58 +131,63 @@ msgstr "Week" msgid "Ansvarlige" msgstr "Responsible" -#: 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 "Bliv inaktiv" msgstr "Become active" -#: bartenders/templates/bartender_info.html:43 +#: bartenders/templates/bartender_info.html:44 msgid "Inaktiv" msgstr "Inactive" -#: bartenders/templates/bartender_info.html:44 +#: bartenders/templates/bartender_info.html:45 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 +#: 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." -#: 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:84 web/templates/login.html:12 +msgid "Log ind" +msgstr "Log in" + +#: bartenders/templates/bartender_info.html:89 msgid "er ikke bartender." msgstr "is not a bartender." @@ -244,8 +254,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 @@ -272,6 +282,14 @@ msgstr "Submit" msgid "Bartendertilmeldingen er lukket." msgstr "Bartender applications are closed." +#: events/forms.py:21 events/forms.py:59 +msgid "Deltager" +msgstr "Attending" + +#: events/forms.py:22 +msgid "Deltager ikke" +msgstr "Not attending" + #: events/templates/events.html:8 msgid "Bartender events" msgstr "Bartender events" @@ -346,11 +364,11 @@ msgstr "Description" msgid "Tilmelding" msgstr "Sign up" -#: events/templates/events.html:59 +#: events/templates/events.html:60 msgid "Tilmeldte" msgstr "Registered participant" -#: events/templates/events.html:68 +#: events/templates/events.html:69 msgid "Navn" msgstr "Name" @@ -393,8 +411,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" @@ -485,8 +503,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?" @@ -588,8 +606,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" @@ -613,7 +631,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 @@ -630,8 +649,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:" @@ -661,9 +680,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 "" @@ -672,9 +691,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." @@ -684,10 +703,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 " @@ -708,15 +727,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" @@ -732,7 +751,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)" @@ -757,15 +777,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 "" @@ -891,6 +912,8 @@ 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:26 msgid "Generel info" diff --git a/web/templates/login.html b/web/templates/login.html index 0ed4416..3c39a82 100644 --- a/web/templates/login.html +++ b/web/templates/login.html @@ -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 %} From 631f0e5e97617f662fdb21acc6105c274bddc739 Mon Sep 17 00:00:00 2001 From: Asger Hautop Drewsen Date: Mon, 1 Jul 2024 10:58:00 +0200 Subject: [PATCH 04/10] Update list of admins --- fredagscafeen/settings/base.py | 1 - 1 file changed, 1 deletion(-) diff --git a/fredagscafeen/settings/base.py b/fredagscafeen/settings/base.py index c6b54de..17f0cf1 100644 --- a/fredagscafeen/settings/base.py +++ b/fredagscafeen/settings/base.py @@ -303,7 +303,6 @@ # 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"), ] From af0648f2b8c02505cc9ce8a083745529a53d7159 Mon Sep 17 00:00:00 2001 From: Anders Bruun Severinsen <202204885@post.au.dk> Date: Mon, 1 Jul 2024 11:12:03 +0200 Subject: [PATCH 05/10] Fixed login button --- bartenders/templates/ballots_update.html | 2 +- fredagscafeen/settings/base.py | 1 + locale/da/LC_MESSAGES/django.po | 2 +- locale/en/LC_MESSAGES/django.po | 66 +++++++++++------------- web/templates/login.html | 2 +- 5 files changed, 35 insertions(+), 38 deletions(-) diff --git a/bartenders/templates/ballots_update.html b/bartenders/templates/ballots_update.html index 7dc8f4b..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 %} diff --git a/fredagscafeen/settings/base.py b/fredagscafeen/settings/base.py index 17f0cf1..1a0ce50 100644 --- a/fredagscafeen/settings/base.py +++ b/fredagscafeen/settings/base.py @@ -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) diff --git a/locale/da/LC_MESSAGES/django.po b/locale/da/LC_MESSAGES/django.po index d9bdde1..c23d0b1 100644 --- a/locale/da/LC_MESSAGES/django.po +++ b/locale/da/LC_MESSAGES/django.po @@ -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 \n" "Language-Team: LANGUAGE \n" diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po index 52aaf82..ab3c5c0 100644 --- a/locale/en/LC_MESSAGES/django.po +++ b/locale/en/LC_MESSAGES/django.po @@ -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: \n" "Language-Team: LANGUAGE \n" @@ -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." @@ -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 @@ -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" @@ -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?" @@ -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" @@ -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 @@ -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:" @@ -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 "" @@ -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." @@ -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 " @@ -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" @@ -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)" @@ -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 "" diff --git a/web/templates/login.html b/web/templates/login.html index 3c39a82..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 %} From 54eb6bfaa1ace71d27b10ff829ab61668b28a94d Mon Sep 17 00:00:00 2001 From: Anders Bruun Severinsen <202204885@post.au.dk> Date: Thu, 4 Jul 2024 23:35:59 +0200 Subject: [PATCH 06/10] Removed admin mail --- fredagscafeen/settings/base.py | 1 - 1 file changed, 1 deletion(-) diff --git a/fredagscafeen/settings/base.py b/fredagscafeen/settings/base.py index 1a0ce50..e868940 100644 --- a/fredagscafeen/settings/base.py +++ b/fredagscafeen/settings/base.py @@ -302,7 +302,6 @@ # Server admins (get an email when server errors happen) ADMINS = [ - ("Oskar Haarklou Veileborg", "oskarv@post.au.dk"), ("Jonathan Eilath", "201804772@post.au.dk"), ("Anders Bruun Severinsen", "202204885@post.au.dk"), ] From 177c3cf65638e2274cec5b6859a22622d5bee89b Mon Sep 17 00:00:00 2001 From: Anders Bruun Severinsen <202204885@post.au.dk> Date: Fri, 5 Jul 2024 00:44:23 +0200 Subject: [PATCH 07/10] Added social links --- web/static/css/stylesheet.css | 14 ++++++++++++++ web/static/images/facebook.png | Bin 0 -> 1959 bytes web/static/images/facebook_negative.png | Bin 0 -> 750 bytes web/static/images/github.png | Bin 0 -> 1401 bytes web/static/images/github_negative.png | Bin 0 -> 1815 bytes web/static/images/instagram.png | Bin 0 -> 2314 bytes web/static/images/instagram_negative.png | Bin 0 -> 1045 bytes web/templates/base.html | 23 ++++++++++++++++++++--- 8 files changed, 34 insertions(+), 3 deletions(-) create mode 100644 web/static/images/facebook.png create mode 100644 web/static/images/facebook_negative.png create mode 100644 web/static/images/github.png create mode 100644 web/static/images/github_negative.png create mode 100644 web/static/images/instagram.png create mode 100644 web/static/images/instagram_negative.png diff --git a/web/static/css/stylesheet.css b/web/static/css/stylesheet.css index 2d22feb..36955c0 100644 --- a/web/static/css/stylesheet.css +++ b/web/static/css/stylesheet.css @@ -132,3 +132,17 @@ footer { display: block !important; padding: 8px !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 0000000000000000000000000000000000000000..bc92a323e98f146e8ac4d4c0774d3de7b99bf5f3 GIT binary patch literal 1959 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTCmUKs7M+SzC{oH>NS%G|oWRD45dJguM!v-tY$DUh!@P+6=(yLXi1ImO!M_+&;qhK7+4vF z7?^=9Mj&Khlwtsx24pdKF-pVPL5vzuHB1Z)?U@WLP&H9N8U#Fm7^DY6GcRC7n7Dum zuG(M$GlC7$roqd|52QE?JR*x37`TN&n2}-D90>*nrW2VV5hW46K32*3xq68y`AMmI z6}bft z&@)i7<5EyiuqjGOvkG!?gK7uzY?U%fN(!v>^~=l4^~#O)@{7{-4J|D#^$m>ljf`}G zDs+o0^GXscbn}XpA%?)raY-#sF3Kz@$;{7F0GXSZlwVq6tE2?72o50bEXhnm*pycc z^%l^B`XCv7Lp=k1Y}!&QGI3}F$w0J${ROek24t93WKe2xeoiUKS$5_|Heef21QG6o zXh5hB&C4vYgK0q%M%NXAkVja9EQqebzbG>m7?5Ch8A6?fEQX{WnG45j99yKL zE-gL%guSAqWMg%kV#v#aeF~Yei9Z;Rh%Yc{yVS~k-hkQi_|2~;Hp%VQj`pxtUcaUK z`@Q0C_jd1|l$*_Zv~bR^5-Z!9>gwMdrG2@#b7M+vt~0-?z4JTc^M&sXzaM`7Y<$~D z^mfS>hT5Kw>vn7jZR}uovNyOeqsNSqQ|6ezlkpl~1(OB+&*!ZR-@;)c)%!l1LGDpv zspBH?yq@YXC58t*ukX+JST<*o==R?iwy%HG>oqH};Xl`h@0LyKDtjaPGMJOiHSE<7 zTyQ+@lpYZ9_1~K}XRItN0z|J*YZmXTl$yZ&oaMp+RpVkyE2~p$lsy@pIoXd3YZ`ke z8UF6ybaBf$DYJ;bQ+$jUnwy)K*W8!)=HKC^%&jEyJQq6o~*JHP{5w{AhvUqOq z;Oc#B^*Lw%u3bh(?))}MOBNef$;uhrQLfQjJdf{3)5%|=Q}(kmFXdr>_&*?v-=Ios zYt-9*qo<~vd~D3YXPtjK6*Kd$TPfBT?3r`erMIQ^!^e5^=6%~Cy!p<*^`|~}e|VT) zneE1qSQ0tquR}6ddofeZ_9;CkB72r+#MeETq?j`G47aUibup9br$dMKTWk*X*pzrT z$E^1s_lZo=Pl8s~j(dvvPq;lf^jt}8%YiNWg{P`I874EU_$_q^%o6yaCT!l3*~wt7 zc*EV)Uu4_f;+Kjp%KkhPSvbU0cCF}gX!7*dnW#FAVX39S@~h=1IR!uS%+6COx;Vq5 z!Kg&GsHtA-N6op#413&XGu-#zJl(5-Yr%=*N1tY|Ra8yed)!$n_flC@ppwE=hfMMB zDxbW!tz9(jz|WI0Hv+=4wY}R|j@EPO^?W{EcDq1X+Uc!szo89hi;sq_lrTq@y5x?% ze}Db*a{3eUvctPe@Q%dpJ;%c%1it-HO67{uO8v|KWPQzB{R?{}LDi3^tDnm{r-UW| D=^@2| literal 0 HcmV?d00001 diff --git a/web/static/images/facebook_negative.png b/web/static/images/facebook_negative.png new file mode 100644 index 0000000000000000000000000000000000000000..1c1eabe1355baacd54ed7175b01c4b12a4215c14 GIT binary patch literal 750 zcmVE18wCmDEX1>11tXW2H!vq{O9QrLD}YEGe9om8q2seX*zb zJLxj-+>nkGKV$}Ncx9+^cVBEt%Nur}d+L7Go8UPoh=Hn*xin!RMZ-|O#?J`bVM5)( zp|N%1!@X4bjC5muNiDgasx=ao-HCEdHCjs9ko{9AOa5qzPxbb`WnPj+VZ$SKd|zEnl&RspAR`{IFJZ`Qn>5;Mr40I?3ZMY=JpvQy_7(<5-L7TYh z@|ZCjFhUPdl{LIhW&s%+kf9&6m1jnM8qfvl4X&FM6o!E^6nF<=4@j~{9|UE?AsKK7 ze@ZrBjbRYtft>+wxG)iC#AYZS2(1RzY``lnPpAP!!mrkaOZXLa1&)ii$F|4iE=-L4_z6+b55ZF$)2bg!5C6F6J`R{AiC7^=CSe% z-R}#|G#u}@o&Ao&t>i-40~{{A-@15q)T+>wz7IYlXn)8uR`CQ1xOn|=}ZC)fn0t<807*qoM6N<$f?cmp*Z=?k literal 0 HcmV?d00001 diff --git a/web/static/images/github.png b/web/static/images/github.png new file mode 100644 index 0000000000000000000000000000000000000000..e0edec5357002a27b9ed3928e6e5c869426bd052 GIT binary patch literal 1401 zcmV-<1%~>GP)K~#7F%~{QE z+eQ$cp%gT!i&k}##z7C2Q5ldDz@~3K%D3KP-+GIB>&?~^SbhTAPf+Cv>fU+_bL%Zs zfJ6qQ0y?^=k;s?2O(afcR#HS$BzLJF+8-cDB4^2&-TB*Z5$1q=-p<`xf^G7=4FJp| zfK3QFApQ)&*E+->0CLf?8ks&gr>AZQW(2~N5T&zAPyvsg@ZT~_2Q~(eXE7$R0ZQ@D zyIq+kgIk z5hWC9fGAIZM{w=H^78$M7jMtc{tUevc2SlNLHYcR0Z-=6UrqNUczwbE3D`c;bMZsC zS?Fd7H-mva5yY{|XK<_CZ1CdX76Lv)Ras{QLYHUvSe`k0c7$YZmJebD%QmtXL; z|AI=dz||OO->(o7b}49_v=%^le+?1E` z;enyEqsC^SY|;{}J+^J=b4t#D+j{M~VKRl%hRk$S3hnkTadl*Lc67CG(LT|1em_*Y zZX!EW+KrQ8_q-sf2I1gV2KM;7CVx~6ayu=3x<3(&6gWb#uPaO(rN!rH7u zsa4`Zyu>1xy~D8wLj%a8r=Wi*jI2%pdA*2g

u1cQDaJ*)<^#lqm>j)7EJCe-?X zCQTYTty8xSDWQGpI{fA6zYDa(o;^+91^K2|N#Mi%Z{zPB5$oSv1rta8Znt zk+8J15s&dXd%@_$-IU1}7s|&8@lvJ}xFO({q!D+YT{~wjbbmV|xS)Nd5y@${l-CUH z^1T%? zsS*%z5%CWk6qB+46aH}b{z~QUgNGMiF0FLB-LwB-M#b-ayYfpWD=vyZnvP?RXy^R= ztow_*-j>j@qwZRpsYe(XNn1hY@YZ30IRB()49}(9y9HqHyL8l-Ymt>TpE% zBZ=FYF+(yoK=LlrDgjAXEET09?)#p}%$YaIoCTq{Bw@Q}=)w3@XLCf!d}<|z{dchM zw?}N4+*b@*r2cqf!sja))0hi;4`SWVCtc}8Obh`Y~f*`|C!=qoUjLz1<$}7 z4om@c@ZrHh;M!Fvf5(ZOe}z^Y!~{GMH{i3ajz{o&l3kndP}%?K9V7&I4L=9>=27(e z5m(>c!0;=a% ztvaygvt9pQ8JSb%z^X$6n6Cgjy-V1M;-s{vl;Q3)3B~OvfQbQe2GMG|l{gvgj!e0e z0Y@``U{$BQz-Uj*HK4`?ZFMduGJ3d!(;BmcVZ5oA0@P|YRwb1!#1K_~B-1rEht#4G z60;JLhl7SpW6*evbd^}`{fn#fOw-1YBco|{YcgiYjL(FR0)h|r9*(Td00000NkvXX Hu0mjf-@cg2 literal 0 HcmV?d00001 diff --git a/web/static/images/github_negative.png b/web/static/images/github_negative.png new file mode 100644 index 0000000000000000000000000000000000000000..903c52bfa06778ea3d3e2b53d33c8a3554b2174a GIT binary patch literal 1815 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 P00000NkvXXu0mjf+Kkte literal 0 HcmV?d00001 diff --git a/web/templates/base.html b/web/templates/base.html index a92cbe5..4dacfe0 100644 --- a/web/templates/base.html +++ b/web/templates/base.html @@ -72,7 +72,7 @@

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

    - Fredagscaféen {% translate "er en fredagsbar for datalogi og IT på Aarhus Universitet." %}
    - 1993-{% now "Y" %} Fredagscaféen +
    +
    + + + + + + + + + + + +
    +
    + Fredagscaféen {% translate "er en fredagsbar for datalogi og IT på Aarhus Universitet." %}
    + 1993-{% now "Y" %} Fredagscaféen +
    +
    {% endblock %} From e11483cd78d59c195d9c3607520b8f56661cd95a Mon Sep 17 00:00:00 2001 From: Anders Bruun Severinsen <202204885@post.au.dk> Date: Fri, 5 Jul 2024 01:16:31 +0200 Subject: [PATCH 08/10] Moved styling to stylesheet --- web/static/css/stylesheet.css | 17 +++++++++++++++++ web/templates/about.html | 20 -------------------- 2 files changed, 17 insertions(+), 20 deletions(-) diff --git a/web/static/css/stylesheet.css b/web/static/css/stylesheet.css index 36955c0..d1bc386 100644 --- a/web/static/css/stylesheet.css +++ b/web/static/css/stylesheet.css @@ -133,6 +133,23 @@ footer { 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; 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. From 41cb0821ad6b7481c0f6e8016c06845e467d576a Mon Sep 17 00:00:00 2001 From: Anders Bruun Severinsen <202204885@post.au.dk> Date: Mon, 8 Jul 2024 15:33:16 +0200 Subject: [PATCH 09/10] Fixed bad translation --- locale/en/LC_MESSAGES/django.mo | Bin 18933 -> 18935 bytes locale/en/LC_MESSAGES/django.po | 68 +++++++++++++++++--------------- 2 files changed, 36 insertions(+), 32 deletions(-) diff --git a/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo index 1c7c49f290d910460175fef659a8335074e45bcf..1762dd4c4eddb4a8faff7e6cdc074edbf6af8bc1 100644 GIT binary patch delta 1502 zcmXZcNk~;u9LMqVG>6Q&%tn=z2FLdtvR;;&HfWP2RF)YoiiDD=Xu#q|r448xFDinH z7LALDbP=J^q9U|OqD7&LqJbdNEDZy(@6UTzpL5PT!~g$3=e_}->#xssuPw-mFvc9r zFeVsJVIVf+7`%v!@G_3YZVbb(7>|Fj7$>-mIf)fG9Y10nj$jDZdF*)&xSD<^?!YOT z#xjR!9M3eyABRy3Tv>KNp;$ma1_N+C#$qJ~;Xc&*!>GUqF%O4P0eiEJnTy33jdiGX zXE7YlXIsWxp>dr7Wn7#?HdunyScTf?G3xgY48_+t9=o02`%nS=!(0~$aB3O-`MLJ` zGpKdvP!+g_Yq8IwF_XsPdB)7b8XUa>RAv`ZC5@hMm)wmCunY@u8>Zq7q^jmE>M8@g z#w21m#$qOFycE;19F>@LjD`+uL~Y>1iTD(?pc^Cbi{k($(GOT)2a=4MmyfE*a@71v z)K%_8WqtrDjyZuk_#twomU%)$0d%15rVF*7ORyHF;RDBasD1h| z8HZ3;mbB0qKb(UbF%@-AJ+9<@(?lbRJNtloWIuTFdK~?Zu6%nzB&zh2P=TdkBo?AF zT<7$+I{n?KN*qDWZ$dr7YfirvgDeJ~I|FZ!>ocEG3*!px1?d7DsmI`+1^D3+=kl!C0gTX^w7|P?-+x>P;Vfp&^|a0HP4NUF%Pw|h03e} zwc#aHhIgFtc5I~Ih2OA>#k!KEMfQFxil~1*0~;8q#va^*`NhVp!u#0nqOruz_|Z~3 zpiajgRKUGB83UHt|0D6J1QKxudQkyxLA`-ps7gLtX4#+L3kC?%{6=Mzv)s<41QY33 zq8{Z@jK|Zs25+M_8p2>4LG2UF3)O+8sIO`h24W-nqYrfz7iQB?X>Xx2XvGA4g?`wJ vDp`L^MOa{5NN$?jli=}qJ#Jr3%4m09f+xqDmD$pq^3&h1rnbe(*gxez5zDm_ delta 1499 zcmYk+Nk~^w6vy#n|57tGwZR641* zhT_>Y$Ltb~%M2*v{B*O)Sd5ief!gQ+>h~@T#uqpVd%WKVPyzhLOg|F9b@Vec-SwwX z>&~Dm(1xWr;Lun=BQMJ=7PsTSD?nw|iYjT?61U`ur~ubs9&W`1yn}t`3AMmAjaVk z>dInr%*J3WZo)X!ImdAo=UXFXCin$?I_pdXAzNgyy;#Pelb5k71aL%5a_6 z-{ST6qAF31n%{_egl%5G0|Oieo_GT3uqAGF~_1WG;1$+m!|1)$Z(CDS11${ULzoOp2xE1cfQK)%|n2*`0jgO!*t3z#g z9+lw@Z~QJc(SL<~SixdlNnwGz-^v2&e}aJx3{+w-?#G-$v(?y+_x;TNpfbK!@wg-T#9#$XmIz;e_Z*o~^><6_7C{GKvEkoFCgQEG{sNipg(DnmWW z8jQwzT#MIH8x3I~j-dAO=Y{IP64Y0<3H`AFeb|h;igOETsI=Em8Fb(re2#jx{iu=+ lc5V*wpB6R|93l^;|F}5wMhqO`~^t|w$=au diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po index ab3c5c0..3501623 100644 --- a/locale/en/LC_MESSAGES/django.po +++ b/locale/en/LC_MESSAGES/django.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-07-01 11:10+0200\n" -"PO-Revision-Date: 2024-06-30 21:55+0050\n" +"PO-Revision-Date: 2024-07-08 15:32+0050\n" "Last-Translator: \n" "Language-Team: LANGUAGE \n" "Language: \n" @@ -141,7 +141,7 @@ msgstr "Active" #: bartenders/templates/bartender_info.html:42 msgid "Bliv inaktiv" -msgstr "Become active" +msgstr "Become inactive" #: bartenders/templates/bartender_info.html:44 msgid "Inaktiv" @@ -153,7 +153,8 @@ 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." @@ -253,8 +254,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 @@ -410,8 +411,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" @@ -502,8 +503,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?" @@ -605,8 +606,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" @@ -630,7 +631,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 @@ -647,8 +649,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:" @@ -678,9 +680,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 "" @@ -689,9 +691,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." @@ -701,10 +703,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 " @@ -725,15 +727,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" @@ -749,7 +751,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)" @@ -774,15 +777,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 "" From 9d1b3d6a2d1f6563e89bd35b94ce16a59243248d Mon Sep 17 00:00:00 2001 From: Anders Bruun Severinsen <202204885@post.au.dk> Date: Wed, 10 Jul 2024 11:28:21 +0200 Subject: [PATCH 10/10] Added confirmation to become inactive --- bartenders/templates/bartender_info.html | 6 +-- locale/da/LC_MESSAGES/django.po | 54 ++++++++++--------- locale/en/LC_MESSAGES/django.mo | Bin 18935 -> 18988 bytes locale/en/LC_MESSAGES/django.po | 65 +++++++++++++---------- 4 files changed, 69 insertions(+), 56 deletions(-) diff --git a/bartenders/templates/bartender_info.html b/bartenders/templates/bartender_info.html index feece40..427e64a 100644 --- a/bartenders/templates/bartender_info.html +++ b/bartenders/templates/bartender_info.html @@ -39,10 +39,10 @@

    {% 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 %} @@ -81,7 +81,7 @@ {% buttons %} - {% translate "Log ind" as BUTTON_TEXT %} + {% translate "Gem" as BUTTON_TEXT %} {% bootstrap_button BUTTON_TEXT button_type="submit" icon="floppy-disk" button_class="btn-primary" %} {% endbuttons %} diff --git a/locale/da/LC_MESSAGES/django.po b/locale/da/LC_MESSAGES/django.po index c23d0b1..0d66526 100644 --- a/locale/da/LC_MESSAGES/django.po +++ b/locale/da/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-07-01 11:10+0200\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" @@ -91,7 +91,8 @@ msgid "Eventuelle ekstra info til bestyrelsen skrives her" msgstr "" #: bartenders/templates/ballots_update.html:18 -#: bartenders/templates/bartender_info.html:36 events/templates/events.html:49 +#: bartenders/templates/bartender_info.html:36 +#: bartenders/templates/bartender_info.html:84 events/templates/events.html:49 msgid "Gem" msgstr "" @@ -138,6 +139,16 @@ msgstr "" msgid "Aktiv" msgstr "" +#: bartenders/templates/bartender_info.html:42 +msgid "Er du sikker?" +msgstr "" + +#: 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 "" @@ -147,12 +158,7 @@ msgid "Inaktiv" msgstr "" #: bartenders/templates/bartender_info.html:45 -msgid "Hvis du gerne vil være aktive igen, så kontakt" -msgstr "" - -#: bartenders/templates/bartender_info.html:49 -msgid "" -"Husk at du som inaktiv bartender ikke kan komme til bartenderarrangementerne." +msgid "Hvis du gerne vil være aktiv igen, så kontakt" msgstr "" #: bartenders/templates/bartender_info.html:52 @@ -179,10 +185,6 @@ msgstr "" msgid "Datoer, hvor du ikke har mulighed for at stå i bar" msgstr "" -#: bartenders/templates/bartender_info.html:84 web/templates/login.html:12 -msgid "Log ind" -msgstr "" - #: bartenders/templates/bartender_info.html:89 msgid "er ikke bartender." msgstr "" @@ -846,48 +848,48 @@ msgid "" "dig med et svar hurtigst muligt." msgstr "" -#: web/templates/about.html:26 +#: 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 "" @@ -943,6 +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/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 1762dd4c4eddb4a8faff7e6cdc074edbf6af8bc1..009eb9c8cd25c400cb7aa7b5c6ec42a846ff3dbf 100644 GIT binary patch delta 3576 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\n" "Language-Team: LANGUAGE \n" "Language: \n" @@ -92,7 +92,8 @@ 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 events/templates/events.html:49 +#: bartenders/templates/bartender_info.html:36 +#: bartenders/templates/bartender_info.html:84 events/templates/events.html:49 msgid "Gem" msgstr "Save" @@ -139,6 +140,19 @@ msgstr "Bartender status" msgid "Aktiv" msgstr "Active" +#: 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 inactive" @@ -148,16 +162,9 @@ msgid "Inaktiv" msgstr "Inactive" #: bartenders/templates/bartender_info.html:45 -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: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 bartending " -"events." +#| 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:52 msgid "Mailinglist status" @@ -183,10 +190,6 @@ msgstr "Sign up for the mailing list" 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:84 web/templates/login.html:12 -msgid "Log ind" -msgstr "Log in" - #: bartenders/templates/bartender_info.html:89 msgid "er ikke bartender." msgstr "is not a bartender." @@ -915,50 +918,50 @@ 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:26 +#: 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" @@ -1014,9 +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/templates/login.html:12 +msgid "Log ind" +msgstr "Log in" + #~ msgid "Fadølsanlæggene" #~ msgstr "Kegerators"