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] 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"