Skip to content

Commit

Permalink
Added confirmation to become inactive
Browse files Browse the repository at this point in the history
  • Loading branch information
@AndersSeverinsen
AndersSeverinsen committed Jul 10, 2024
1 parent 41cb082 commit 9d1b3d6
Show file tree
Hide file tree
Showing 4 changed files with 69 additions and 56 deletions.
6 changes: 3 additions & 3 deletions bartenders/templates/bartender_info.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@
<p><b>{% translate "Bartender status" %}:</b>
{% if object.isActiveBartender %}
{% translate "Aktiv" %}
<button type="submit" class="btn btn-danger pull-right" name="deactivate">{% translate "Bliv inaktiv" %}</button>
<button type="submit" class="btn btn-danger pull-right" name="deactivate" onclick="return confirm('{% translate "Er du sikker?" %} \n{% translate "Husk at du som inaktiv bartender ikke kan komme til bartenderarrangementerne." %}');">{% translate "Bliv inaktiv" %}</button>
{% else %}
{% translate "Inaktiv" %}
<span class="pull-right">({% translate "Hvis du gerne vil være aktive igen, så kontakt" %} <a href="mailto:[email protected]">[email protected]</a>)</span>
<span class="pull-right">({% translate "Hvis du gerne vil være aktiv igen, så kontakt" %} <a href="mailto:[email protected]">[email protected]</a>)</span>
{% endif %}
</p>
{% if not object.isActiveBartender %}
Expand Down Expand Up @@ -81,7 +81,7 @@
</tbody>
</table>
{% 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 %}
</form>
Expand Down
54 changes: 30 additions & 24 deletions locale/da/LC_MESSAGES/django.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-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 <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand Down Expand Up @@ -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 ""

Expand Down Expand Up @@ -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 ""
Expand All @@ -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
Expand All @@ -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 ""
Expand Down Expand Up @@ -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 ""

Expand Down Expand Up @@ -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 ""
Binary file modified locale/en/LC_MESSAGES/django.mo
View file
Binary file not shown.
65 changes: 36 additions & 29 deletions locale/en/LC_MESSAGES/django.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ msgid ""
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-07-08 15:32+0050\n"
"POT-Creation-Date: 2024-07-10 11:24+0200\n"
"PO-Revision-Date: 2024-07-10 11:27+0050\n"
"Last-Translator: <[email protected]>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
"Language: \n"
Expand Down Expand Up @@ -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"

Expand Down Expand Up @@ -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"
Expand All @@ -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"
Expand All @@ -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."
Expand Down Expand Up @@ -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"

Expand Down Expand Up @@ -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"

0 comments on commit 9d1b3d6

Please sign in to comment.