Commit de00d18a authored by Bengfort's avatar Bengfort
Browse files

Merge branch 'refine-wording' into 'master'

Refine wording

See merge request !8
parents 1ee11618 d17d6429
Pipeline #7968 passed with stages
in 3 minutes and 16 seconds
......@@ -21,6 +21,6 @@ from django.conf import settings
def get_settings(request):
return {
'TITEL': settings.TITEL,
'TITLE': settings.TITLE,
'NAV': settings.NAV,
}
......@@ -3,12 +3,11 @@
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-11-03 15:34+0000\n"
"POT-Creation-Date: 2020-11-11 17:23+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -50,7 +49,7 @@ msgstr "Kürzel"
msgid "Timeslot"
msgstr "Termin"
#: scheduler/main/templates/base.html:27
#: scheduler/main/templates/base.html:28
msgid "Logout"
msgstr "Abmelden"
......@@ -58,17 +57,13 @@ msgstr "Abmelden"
msgid "Schedule appointment"
msgstr "Termin buchen"
#: scheduler/main/templates/main/invitation_form.html:7
#, python-format
msgid "Schedule appointment for %(schedule)s"
msgstr "Termin für %(schedule)s buchen"
#: scheduler/main/templates/main/invitation_form.html:13
msgid ""
"Please select one of the available timeslots to make an appointment. You "
"will still be able to change your selection later."
msgstr ""
"Bitte wäheln Sie einen der verfügbaren Termine. Sie können Ihre Auswahl auch danach jederzeit ändern."
"Bitte wählen Sie einen der verfügbaren Termine. Sie können Ihre Auswahl auch "
"danach jederzeit ändern."
#: scheduler/main/templates/main/invitation_form.html:41
msgid "Reset"
......@@ -139,10 +134,14 @@ msgstr "Anmelden"
msgid "Login"
msgstr "Anmeldung"
#: scheduler/main/views.py:49
#: scheduler/main/views.py:59
msgid "Data has been saved."
msgstr "Daten wurden gespeichert."
#: scheduler/main/views.py:110
msgid "Your reservation has been saved."
msgstr "Ihre Reservierung wurde gespeichert."
#: scheduler/main/views.py:131
msgid "Your booking has been saved."
msgstr "Ihre Buchung wurde gespeichert."
#: scheduler/main/views.py:135
msgid "An error occured."
msgstr "Ein Fehler ist aufgetreten."
......@@ -6,7 +6,7 @@
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width" />
<meta http-equiv="Content-Security-Policy" content="default-src 'self'" />
<title>{% block title %}{{ TITEL }}{% endblock %}</title>
<title>{% block title %}{{ TITLE }}{% endblock %}</title>
<link rel="shortcut icon" type="image/x-icon" href="{% static 'images/favicon.ico' %}" />
<link rel="stylesheet" type="text/css" href="{% static 'bootstrap/dist/css/bootstrap.min.css' %}" />
<link rel="stylesheet" type="text/css" href="{% static 'bootstrap-datepicker/dist/css/bootstrap-datepicker3.min.css' %}" />
......@@ -17,7 +17,7 @@
<nav class="container navbar navbar-expand-sm navbar-dark">
<ul class="navbar-nav mr-auto">
<li class="nav-item">
<a {% if user.is_authenticated %}href="/" rel="home"{% endif %} class="navbar-brand">{{ TITEL }}</a>
<a {% if user.is_authenticated %}href="/" rel="home"{% endif %} class="navbar-brand">{{ TITLE }}</a>
</li>
{% for href, label in NAV %}
<li class="nav-item">
......
......@@ -4,7 +4,7 @@
{% block title %}{% translate "Schedule appointment" %}{% endblock %}
{% block content %}
<h1>{% blocktranslate with schedule=object.schedule %}Schedule appointment for {{ schedule }}{% endblocktranslate %}</h1>
<h1>{{ object.schedule }}</h1>
<form method="post">
{% csrf_token %}
......
......@@ -128,7 +128,7 @@ class InvitationUpdateView(UpdateView):
))
ok = r.ok
if ok:
messages.success(self.request, _('Your reservation has been saved.'))
messages.success(self.request, _('Your booking has been saved.'))
else:
self.object.timeslot = None
self.object.save()
......
......@@ -124,7 +124,7 @@ BOOTSTRAP4 = {
'success_css_class': None,
}
TITEL = 'Scheduler'
TITLE = 'Scheduler'
NAV = []
PING_URL = ''
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment