+Name:
{{ statement.name }}
-
-Straße, Hausnummer:
+
+Straße, Hausnummer:
{{ statement.street_number }}
-
-PLZ, Ort:
+
+PLZ, Ort:
{{ statement.postal_code_city }}
-
-E-Mail Adresse:
+
+E-Mail Adresse:
{{ statement.email }}
-
-Stellungnahme:
+
+Stellungnahme:
{{ statement.statement }}
+
der oben genannte Bebauungsplan wurde auf {{ site.name }} veröffentlicht, geändert oder als Entwurf angelegt. Alle eingehenden Stellungnahmen werden an {{ bplan.office_worker_email }} weitergeleitet. - -Bebauungsplan-Nr.: {{ bplan.identifier }} +
+
+Bebauungsplan-Nr.: {{ bplan.identifier }}
Beteiligungszeitraum: {{ bplan.start_date }} Uhr – {{ bplan.end_date }} Uhr
-
+
Falls der Bebauungsplan nicht korrekt angezeigt wird, können Sie sich an {{ contact_email }} wenden. - +
{% endblock %} {% block cta_label %}Zur Projektübersicht{% endblock %} diff --git a/meinberlin/apps/bplan/templates/meinberlin_bplan/emails/submitter_confirmation.de.email b/meinberlin/apps/bplan/templates/meinberlin_bplan/emails/submitter_confirmation.de.email index 2c733eec36..66056b2363 100644 --- a/meinberlin/apps/bplan/templates/meinberlin_bplan/emails/submitter_confirmation.de.email +++ b/meinberlin/apps/bplan/templates/meinberlin_bplan/emails/submitter_confirmation.de.email @@ -11,28 +11,37 @@ {% block greeting %}{% endblock %} {% block content_left_aligned %} +Guten Tag, - +
+vielen Dank für Ihre Stellungnahme. Sie ist an die zuständige Stelle weitergeleitet worden und geht in die Abwägung der öffentlichen und privaten Belange ein. Wenn Sie sich an einer öffentlichen Auslegung beteiligt haben, werden Sie außerdem nach Festsetzung des Bebauungsplans von der verantwortlichen Stelle schriftlich (per E-Mail oder postalisch) über das Ergebnis informiert, sofern Sie Ihre Adresse angegeben haben. - +
+Ihre Angaben in der Übersicht: - -Name +
+
+Name
{{ statement.name }}
-
-Straße, Hausnummer
+
+Straße, Hausnummer
{{ statement.street_number }}
-
-PLZ, Ort
+
+PLZ, Ort
{{ statement.postal_code_city }}
-
-E-Mail-Adresse
+
+E-Mail-Adresse
{{ statement.email }}
-
+
Ihre Stellungnahme - +
+{{ statement.statement }} - +
{% endblock %} {% block cta_label %}Bebauungsplan anzeigen{% endblock %} diff --git a/meinberlin/apps/budgeting/templates/meinberlin_budgeting/proposal_update_form.html b/meinberlin/apps/budgeting/templates/meinberlin_budgeting/proposal_update_form.html index bf9be9105b..235d9e0c6c 100644 --- a/meinberlin/apps/budgeting/templates/meinberlin_budgeting/proposal_update_form.html +++ b/meinberlin/apps/budgeting/templates/meinberlin_budgeting/proposal_update_form.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {% load i18n %} -{% block title %}{% blocktrans with title=object.name %}Edit {{ title }}{% endblocktrans %} — {{ block.super }}{% endblock %} +{% block title %}{% blocktranslate with title=object.name %}Edit {{ title }}{% endblocktranslate %} — {{ block.super }}{% endblock %} {% block content %}{{ emailformpage.email_content }} - +
{% for key, value in field_values.items %} - - {{key}}: +
+ {{key}}:
{{value}}
+
{{ emailformpage.email_content }} +
{% endblock %} diff --git a/meinberlin/apps/cms/templates/meinberlin_cms/home_page.html b/meinberlin/apps/cms/templates/meinberlin_cms/home_page.html index 94406c142d..6ea51bf22a 100644 --- a/meinberlin/apps/cms/templates/meinberlin_cms/home_page.html +++ b/meinberlin/apps/cms/templates/meinberlin_cms/home_page.html @@ -36,7 +36,7 @@{% blocktrans count counter=self.storefront.num_entries %}entry added by citizens{% plural %}entries added by citizens{% endblocktrans %}
+{% blocktranslate count counter=self.storefront.num_entries %}entry added by citizens{% plural %}entries added by citizens{% endblocktranslate %}
{% blocktrans count counter=self.storefront.num_projects %}project you can participate in!{% plural %}projects you can participate in!{% endblocktrans %}
+{% blocktranslate count counter=self.storefront.num_projects %}project you can participate in!{% plural %}projects you can participate in!{% endblocktranslate %}
+{{ user.username }} möchte zur Initator*in gemacht werden. +
+
+Name
{{ user.username }}
-
-Name der Behörde
+
+Name der Behörde
{{ organisation.name }}
-
-Dienstliche E-Mail-Adresse
+
+Dienstliche E-Mail-Adresse
{{ user.email }}
-
-Telefonnummer
+
+Telefonnummer
{{ phone }}
-
-Datum der Nutzerregistrierung auf meinBerlin
+
+Datum der Nutzerregistrierung auf meinBerlin
{{ user.date_joined }}
-
+
+{{ user.username }} wants to become an initiator. +
+
+Name
{{ user.username }}
-
-Name of the Organisation
+
+Name of the Organisation
{{ organisation.name }}
-
-Email address
+
+Email address
{{ user.email }}
-
-Phone number
+
+Phone number
{{ phone }}
-
-Date of registration on meinBerlin
+
+Date of registration on meinBerlin
{{ user.date_joined }}
-
+
{% blocktrans %}Here you can specify affiliations. Users must classify questions accordingly. The questions can be filtered by affiliation and evaluated in the statistics.{% endblocktrans %} +
{% blocktranslate %}Here you can specify affiliations. Users must classify questions accordingly. The questions can be filtered by affiliation and evaluated in the statistics.{% endblocktranslate %}
+{{ action.actor.username }} hat Ihren Beitrag kommentiert: +
{% if action.obj.comment %} +"{{ action.obj.comment|truncatewords:75 }}" +
{% endif %} -Möchten Sie antworten?{% endblock %} ++Möchten Sie antworten? +
+{% endblock %} {% block cta_url %}{% if action.obj.get_absolute_url %}{{ email.get_host }}{{ action.obj.get_absolute_url }}{% else %}{{ email.get_host }}{{ action.project.get_absolute_url }}{% endif %}{% endblock %} {% block cta_label %}{% if action.obj.get_absolute_url %}Beitrag anzeigen{% else %}Projekt anzeigen{% endif %}{% endblock %} diff --git a/meinberlin/apps/notifications/templates/meinberlin_notifications/emails/notify_creator.en.email b/meinberlin/apps/notifications/templates/meinberlin_notifications/emails/notify_creator.en.email index 98a1a1c7ef..e8233bfd5c 100644 --- a/meinberlin/apps/notifications/templates/meinberlin_notifications/emails/notify_creator.en.email +++ b/meinberlin/apps/notifications/templates/meinberlin_notifications/emails/notify_creator.en.email @@ -7,11 +7,19 @@ {% block greeting %}Hello {{ receiver.username }},{% endblock %} -{% block content %}{{ action.actor.username }} commented on your post: +{% block content %} ++{{ action.actor.username }} commented on your post: +
{% if action.obj.comment %} +"{{ action.obj.comment|truncatewords:75 }}" +
{% endif %} -Would you like to answer?{% endblock %} ++Would you like to answer? +
+{% endblock %} {% block cta_url %}{% if action.obj.get_absolute_url %}{{ email.get_host }}{{ action.obj.get_absolute_url }}{% else %}{{ email.get_host }}{{ action.project.get_absolute_url }}{% endif %}{% endblock %} {% block cta_label %}{% if action.obj.get_absolute_url %}View Post{% else %}Visit the project{% endif %}{% endblock %} diff --git a/meinberlin/apps/notifications/templates/meinberlin_notifications/emails/notify_creator_on_moderator_feedback.de.email b/meinberlin/apps/notifications/templates/meinberlin_notifications/emails/notify_creator_on_moderator_feedback.de.email index 1d7e84bee5..42dedf6396 100644 --- a/meinberlin/apps/notifications/templates/meinberlin_notifications/emails/notify_creator_on_moderator_feedback.de.email +++ b/meinberlin/apps/notifications/templates/meinberlin_notifications/emails/notify_creator_on_moderator_feedback.de.email @@ -8,15 +8,22 @@ {% block greeting %}{% if send_to_creator %}Hallo {{ receiver.username }},{% else %}Guten Tag,{% endif %}{% endblock %} {% block content %} +{{ object.module.project.organisation.name }} hat auf Ihren Beitrag reagiert. - -{% if object.moderator_feedback %}Der Status Ihres Beitrags hat sich geändert und steht nun auf “{{ object.get_moderator_feedback_display }}”. - +
+{% if object.moderator_feedback %} ++Der Status Ihres Beitrags hat sich geändert und steht nun auf “{{ object.get_moderator_feedback_display }}”. +
{% endif %} -{% if object.moderator_statement.statement %}Offizielle Rückmeldung: {{ object.moderator_statement.statement | safe }} - +{% if object.moderator_statement.statement %} ++Offizielle Rückmeldung: {{ object.moderator_statement.statement | safe }} +
{% endif %} +Möchten Sie antworten? +
{% endblock %} {% block cta_url %}{% if object.get_absolute_url %}{{ email.get_host }}{{ object.get_absolute_url }}{% else %}{{ email.get_host }}{{ object.project.get_absolute_url }}{% endif %}{% endblock %} diff --git a/meinberlin/apps/notifications/templates/meinberlin_notifications/emails/notify_creator_on_moderator_feedback.en.email b/meinberlin/apps/notifications/templates/meinberlin_notifications/emails/notify_creator_on_moderator_feedback.en.email index eb1db837a9..9d53b774f0 100644 --- a/meinberlin/apps/notifications/templates/meinberlin_notifications/emails/notify_creator_on_moderator_feedback.en.email +++ b/meinberlin/apps/notifications/templates/meinberlin_notifications/emails/notify_creator_on_moderator_feedback.en.email @@ -8,15 +8,22 @@ {% block greeting %}{% if send_to_creator %}Hello {{ receiver.username }},{% else %}Hello,{% endif %}{% endblock %} {% block content %} +{{ object.module.project.organisation.name }} reacted on your contribution. - -{% if object.moderator_feedback %}The status of your contribution has been changed and is now “{{ object.get_moderator_feedback_display }}". - +
+{% if object.moderator_feedback %} ++The status of your contribution has been changed and is now “{{ object.get_moderator_feedback_display }}". +
{% endif %} -{% if object.moderator_statement.statement %}Official feedback: {{ object.moderator_statement.statement | safe }} - +{% if object.moderator_statement.statement %} ++Official feedback: {{ object.moderator_statement.statement | safe }} +
{% endif %} +Do you want to answer? +
{% endblock %} {% block cta_url %}{% if object.get_absolute_url %}{{ email.get_host }}{{ object.get_absolute_url }}{% else %}{{ email.get_host }}{{ object.project.get_absolute_url }}{% endif %}{% endblock %} diff --git a/meinberlin/apps/notifications/templates/meinberlin_notifications/emails/notify_followers_event_upcomming.de.email b/meinberlin/apps/notifications/templates/meinberlin_notifications/emails/notify_followers_event_upcomming.de.email index bdde08105c..467378819f 100644 --- a/meinberlin/apps/notifications/templates/meinberlin_notifications/emails/notify_followers_event_upcomming.de.email +++ b/meinberlin/apps/notifications/templates/meinberlin_notifications/emails/notify_followers_event_upcomming.de.email @@ -7,11 +7,17 @@ {% block greeting %}Hallo {{ receiver.username }},{% endblock %} -{% block content %}am {{ action.obj.date }} Uhr findet die folgende Veranstaltung statt: - +{% block content %} ++am {{ action.obj.date }} Uhr findet die folgende Veranstaltung statt: +
+{{ action.obj.name }} - -Weitere Informationen zu der Veranstaltung finden Sie im Projekt.{% endblock %} +
++Weitere Informationen zu der Veranstaltung finden Sie im Projekt. +
+{% endblock %} {% block cta_url %}{{ email.get_host }}{{ action.obj.get_absolute_url }}{% endblock %} {% block cta_label %}Veranstaltung anzeigen{% endblock %} diff --git a/meinberlin/apps/notifications/templates/meinberlin_notifications/emails/notify_followers_event_upcomming.en.email b/meinberlin/apps/notifications/templates/meinberlin_notifications/emails/notify_followers_event_upcomming.en.email index 55d9669702..2c41e296c8 100644 --- a/meinberlin/apps/notifications/templates/meinberlin_notifications/emails/notify_followers_event_upcomming.en.email +++ b/meinberlin/apps/notifications/templates/meinberlin_notifications/emails/notify_followers_event_upcomming.en.email @@ -7,9 +7,17 @@ {% block greeting %}Hello {{ receiver.username }},{% endblock %} -{% block content %}The following event takes place on {{ action.obj.date }}: +{% block content %} ++The following event takes place on {{ action.obj.date }}: +
+{{ action.obj.name }} -Further information about the event can be found in the project.{% endblock %} +
++Further information about the event can be found in the project. +
+{% endblock %} {% block cta_url %}{{ email.get_host }}{{ action.obj.get_absolute_url }}{% endblock %} {% block cta_label %}Show Event{% endblock %} diff --git a/meinberlin/apps/notifications/templates/meinberlin_notifications/emails/notify_followers_phase_over_soon.de.email b/meinberlin/apps/notifications/templates/meinberlin_notifications/emails/notify_followers_phase_over_soon.de.email index a1af2a45bf..7c52e16483 100644 --- a/meinberlin/apps/notifications/templates/meinberlin_notifications/emails/notify_followers_phase_over_soon.de.email +++ b/meinberlin/apps/notifications/templates/meinberlin_notifications/emails/notify_followers_phase_over_soon.de.email @@ -7,9 +7,14 @@ {% block greeting %}Hallo {{ receiver.username }},{% endblock %} -{% block content %}die Online-Beteiligung im oben genannten Projekt endet bald. - -Sie können noch bis zum {{ action.obj.end_date }} Uhr daran teilnehmen.{% endblock %} +{% block content %} ++die Online-Beteiligung im oben genannten Projekt endet bald. +
++Sie können noch bis zum {{ action.obj.end_date }} Uhr daran teilnehmen. +
+{% endblock %} {% block cta_url %}{{ email.get_host }}{{ action.obj.module.get_detail_url }}{% endblock %} {% block cta_label %}Jetzt mitmachen{% endblock %} diff --git a/meinberlin/apps/notifications/templates/meinberlin_notifications/emails/notify_followers_phase_over_soon.en.email b/meinberlin/apps/notifications/templates/meinberlin_notifications/emails/notify_followers_phase_over_soon.en.email index 94a1437fa6..f594e06635 100644 --- a/meinberlin/apps/notifications/templates/meinberlin_notifications/emails/notify_followers_phase_over_soon.en.email +++ b/meinberlin/apps/notifications/templates/meinberlin_notifications/emails/notify_followers_phase_over_soon.en.email @@ -7,9 +7,14 @@ {% block greeting %}Hello {{ receiver.username }},{% endblock %} -{% block content %}the online participation in the above mentioned project will end soon. - -You can still participate until {{ action.obj.end_date }}.{% endblock %} +{% block content %} ++the online participation in the above mentioned project will end soon. +
++You can still participate until {{ action.obj.end_date }}. +
+{% endblock %} {% block cta_url %}{{ email.get_host }}{{ action.obj.module.get_detail_url }}{% endblock %} {% block cta_label %}Join now{% endblock %} diff --git a/meinberlin/apps/notifications/templates/meinberlin_notifications/emails/notify_followers_phase_started.de.email b/meinberlin/apps/notifications/templates/meinberlin_notifications/emails/notify_followers_phase_started.de.email index 503d9efc47..e4080feff5 100644 --- a/meinberlin/apps/notifications/templates/meinberlin_notifications/emails/notify_followers_phase_started.de.email +++ b/meinberlin/apps/notifications/templates/meinberlin_notifications/emails/notify_followers_phase_started.de.email @@ -7,9 +7,14 @@ {% block greeting %}Hallo {{ receiver.username }},{% endblock %} -{% block content %}die Online-Beteiligung im oben genannten Projekt hat begonnen. - -Sie können bis zum {{ action.obj.end_date }} Uhr daran teilnehmen.{% endblock %} +{% block content %} ++die Online-Beteiligung im oben genannten Projekt hat begonnen. +
++Sie können bis zum {{ action.obj.end_date }} Uhr daran teilnehmen. +
+{% endblock %} {% block cta_url %}{{ email.get_host }}{{ action.obj.module.get_detail_url }}{% endblock %} {% block cta_label %}Jetzt mitmachen{% endblock %} diff --git a/meinberlin/apps/notifications/templates/meinberlin_notifications/emails/notify_followers_phase_started.en.email b/meinberlin/apps/notifications/templates/meinberlin_notifications/emails/notify_followers_phase_started.en.email index 6ce95b4403..3db21df3de 100644 --- a/meinberlin/apps/notifications/templates/meinberlin_notifications/emails/notify_followers_phase_started.en.email +++ b/meinberlin/apps/notifications/templates/meinberlin_notifications/emails/notify_followers_phase_started.en.email @@ -7,9 +7,14 @@ {% block greeting %}Hello {{ receiver.username }},{% endblock %} -{% block content %}Online participation for the above project has started. - -You can participate untill {{ action.obj.end_date }}.{% endblock %} +{% block content %} ++Online participation for the above project has started. +
++You can participate untill {{ action.obj.end_date }}. +
+{% endblock %} {% block cta_url %}{{ email.get_host }}{{ action.obj.module.get_detail_url }}{% endblock %} {% block cta_label %}Join now{% endblock %} diff --git a/meinberlin/apps/notifications/templates/meinberlin_notifications/emails/notify_initiators_project_created.de.email b/meinberlin/apps/notifications/templates/meinberlin_notifications/emails/notify_initiators_project_created.de.email index bef56aaad8..c098695270 100644 --- a/meinberlin/apps/notifications/templates/meinberlin_notifications/emails/notify_initiators_project_created.de.email +++ b/meinberlin/apps/notifications/templates/meinberlin_notifications/emails/notify_initiators_project_created.de.email @@ -9,7 +9,9 @@ {% block greeting %}Hallo {{ receiver.username }},{% endblock %} {% block content %} +{{ creator.username }} hat ein neues Projekt für {{ project.organisation.name }} angelegt. +
{% endblock %} diff --git a/meinberlin/apps/notifications/templates/meinberlin_notifications/emails/notify_initiators_project_created.en.email b/meinberlin/apps/notifications/templates/meinberlin_notifications/emails/notify_initiators_project_created.en.email index 3b72a95c7f..fa2c4c062b 100644 --- a/meinberlin/apps/notifications/templates/meinberlin_notifications/emails/notify_initiators_project_created.en.email +++ b/meinberlin/apps/notifications/templates/meinberlin_notifications/emails/notify_initiators_project_created.en.email @@ -9,7 +9,10 @@ {% block greeting %}Hello {{ receiver.username }},{% endblock %} {% block content %} -{{ creator.username }} created a new project for {{ project.organisation.name }}.{% endblock %} ++{{ creator.username }} created a new project for {{ project.organisation.name }}. +
+{% endblock %} {% block cta_url %}{{ email.get_host }}{{ project.get_absolute_url }}{% endblock %} {% block cta_label %}Show project{% endblock %} diff --git a/meinberlin/apps/notifications/templates/meinberlin_notifications/emails/notify_moderator.de.email b/meinberlin/apps/notifications/templates/meinberlin_notifications/emails/notify_moderator.de.email index c6e72983d9..74931ea5fd 100644 --- a/meinberlin/apps/notifications/templates/meinberlin_notifications/emails/notify_moderator.de.email +++ b/meinberlin/apps/notifications/templates/meinberlin_notifications/emails/notify_moderator.de.email @@ -9,11 +9,15 @@ {% block greeting %}Hallo {{ receiver.username }},{% endblock %} {% block content %} +es gibt einen neuen Beitrag in dem Projekt, das Sie moderieren. - +
+{{ action.actor.username }} schrieb am {{ action.timestamp|date:"d. F Y, H:i"}} Uhr: - +
+„{{ action.obj }}“ +
{% endblock%} {% block cta_url %}{% if action.obj.get_absolute_url %}{{ email.get_host }}{{ action.obj.get_absolute_url }}{% else %}{{ email.get_host }}{{ action.project.get_absolute_url }}{% endif %}{% endblock %} diff --git a/meinberlin/apps/notifications/templates/meinberlin_notifications/emails/notify_moderator.en.email b/meinberlin/apps/notifications/templates/meinberlin_notifications/emails/notify_moderator.en.email index 82fb4d7610..96031d61b8 100644 --- a/meinberlin/apps/notifications/templates/meinberlin_notifications/emails/notify_moderator.en.email +++ b/meinberlin/apps/notifications/templates/meinberlin_notifications/emails/notify_moderator.en.email @@ -9,11 +9,15 @@ {% block greeting %}Hello {{ receiver.username }},{% endblock %} {% block content %} +there is a new post in the project you are moderating. - +
+{{ action.actor.username }} wrote on {% language 'en' %}{{ action.timestamp }}{% endlanguage %}: - +
+"{{ action.obj }}" +
{% endblock %} {% block cta_url %}{% if action.obj.get_absolute_url %}{{ email.get_host }}{{ action.obj.get_absolute_url }}{% else %}{{ email.get_host }}{{ action.project.get_absolute_url }}{% endif %}{% endblock %} diff --git a/meinberlin/apps/offlineevents/templates/meinberlin_offlineevents/offlineevent_list.html b/meinberlin/apps/offlineevents/templates/meinberlin_offlineevents/offlineevent_list.html index 297418a0f9..c44f2d2726 100644 --- a/meinberlin/apps/offlineevents/templates/meinberlin_offlineevents/offlineevent_list.html +++ b/meinberlin/apps/offlineevents/templates/meinberlin_offlineevents/offlineevent_list.html @@ -15,7 +15,7 @@{% blocktrans %}Here, you can include events that take place as part of the participation project.{% endblocktrans %}
+{% blocktranslate %}Here, you can include events that take place as part of the participation project.{% endblocktranslate %}
{% if object_list.count > 0 %}- {% blocktrans %}Please select the plan your project belongs to. Your project will be shown in the list of plans accordingly.{% endblocktrans %} + {% blocktranslate %}Please select the plan your project belongs to. Your project will be shown in the list of plans accordingly.{% endblocktranslate %}
{% if form.plans.field.choices %} {% include 'a4dashboard/includes/form_field.html' with field=form.plans %} {% else %}{% url 'a4dashboard:plan-create' form.instance.organisation.slug as plan_create_url %} - {% blocktrans %}No plan has been created yet. You can do that here.{% endblocktrans %} + {% blocktranslate %}No plan has been created yet. You can do that here.{% endblocktranslate %}
{% endif %} {% if form.plans.errors %} diff --git a/meinberlin/apps/platformemails/templates/meinberlin_platformemails/platformemail_form.html b/meinberlin/apps/platformemails/templates/meinberlin_platformemails/platformemail_form.html index 8a4c26786e..4b7f389090 100644 --- a/meinberlin/apps/platformemails/templates/meinberlin_platformemails/platformemail_form.html +++ b/meinberlin/apps/platformemails/templates/meinberlin_platformemails/platformemail_form.html @@ -6,7 +6,7 @@{% blocktrans %}This email will be sent to all registered and verified users of mein.berlin.de.{% endblocktrans %}
+{% blocktranslate %}This email will be sent to all registered and verified users of mein.berlin.de.{% endblocktranslate %}
- {% blocktrans with user=request.user.username %}You were invited by the initiator of the project. If you accept you will be able to participate in the project with your username "{{ user }}". If you want to join with a different profile please login with your other profile and follow the invitation link again. If you decline the invitation the link is not valid anymore.{% endblocktrans %} + {% blocktranslate with user=request.user.username %}You were invited by the initiator of the project. If you accept you will be able to participate in the project with your username "{{ user }}". If you want to join with a different profile please login with your other profile and follow the invitation link again. If you decline the invitation the link is not valid anymore.{% endblocktranslate %}
To sign in via Service-Konto on meinBerlin you will be redirected to the Service-Konto.
There you have to sign in with your credentials first, find the Service mein.Berlin and finally click on Hier starten to return to the meinBerlin platform.
{% endblocktrans %} + {% blocktranslate %}To sign in via Service-Konto on meinBerlin you will be redirected to the Service-Konto.
There you have to sign in with your credentials first, find the Service mein.Berlin and finally click on Hier starten to return to the meinBerlin platform.
{% endblocktranslate %} {% translate 'Service-Konto Login' %} diff --git a/meinberlin/apps/topicprio/templates/meinberlin_topicprio/topic_update_form.html b/meinberlin/apps/topicprio/templates/meinberlin_topicprio/topic_update_form.html index 6839b25746..43a9f2cdbf 100644 --- a/meinberlin/apps/topicprio/templates/meinberlin_topicprio/topic_update_form.html +++ b/meinberlin/apps/topicprio/templates/meinberlin_topicprio/topic_update_form.html @@ -1,7 +1,7 @@ {% extends "a4dashboard/base_dashboard_project.html" %} {% load i18n %} -{% block title %}{% blocktrans with title=object.name %}Edit {{ title }}{% endblocktrans %} — {{ block.super }}{% endblock %} +{% block title %}{% blocktranslate with title=object.name %}Edit {{ title }}{% endblocktranslate %} — {{ block.super }}{% endblock %} {% block dashboard_project_content %}herzlich Willkommen auf {{ site.name }}, der Partizipationsplattform des Landes Berlin! - +
+Hier finden Sie Projekte der Berliner Verwaltung, an denen Sie sich online und offline beteiligen können. - +
+Nutzen Sie Ihre Chance und gestalten Sie Berlin mit. Ihre Meinung ist uns wichtig! - +
+Bei Fragen können Sie sich an {{ contact_email }} wenden. +
{% endblock %} {% block cta_url %}{{ email.get_host }}{% url 'meinberlin_plans:plan-list' %}{% endblock %} diff --git a/meinberlin/apps/users/templates/meinberlin_users/emails/welcome.en.email b/meinberlin/apps/users/templates/meinberlin_users/emails/welcome.en.email index d73e50e213..a8ea6ed5b8 100644 --- a/meinberlin/apps/users/templates/meinberlin_users/emails/welcome.en.email +++ b/meinberlin/apps/users/templates/meinberlin_users/emails/welcome.en.email @@ -7,13 +7,18 @@ {% block greeting %}Hello {{ user.username }},{% endblock %} {% block content %} +welcome to {{ site.name }}, the participation platform of the state of Berlin! - +
+Here you will find projects of the Berlin administration in which you can participate online and offline. - +
+Take your chance and help shape Berlin. Your opinion is important to us! - +
+If you have any questions, please contact {{ contact_email }}. +
{% endblock %} {% block cta_url %}{{ email.get_host }}{% url 'meinberlin_plans:plan-list' %}{% endblock %} diff --git a/meinberlin/config/settings/base.py b/meinberlin/config/settings/base.py index b566ecfeda..304e155221 100644 --- a/meinberlin/config/settings/base.py +++ b/meinberlin/config/settings/base.py @@ -56,7 +56,6 @@ 'allauth.account', 'allauth.socialaccount', 'background_task', - 'capture_tag', 'ckeditor', 'ckeditor_uploader', 'django_filters', diff --git a/meinberlin/templates/a4categories/includes/module_categories_form.html b/meinberlin/templates/a4categories/includes/module_categories_form.html index 9a07b37697..8eab83c5cb 100644 --- a/meinberlin/templates/a4categories/includes/module_categories_form.html +++ b/meinberlin/templates/a4categories/includes/module_categories_form.html @@ -1,6 +1,6 @@ {% load i18n %} -{% blocktrans %}If you define categories, participants must assign their ideas accordingly (single choice, mandatory). Categories automatically appear in the display of ideas. In addition, the list of all ideas can be filtered by category.{% endblocktrans %}
+{% blocktranslate %}If you define categories, participants must assign their ideas accordingly (single choice, mandatory). Categories automatically appear in the display of ideas. In addition, the list of all ideas can be filtered by category.{% endblocktranslate %}
- {% blocktrans %}Depending on the selected module, the participation process has one or two phases. The name and description of the phase(s) should encourage the users to participate and let them know how they can participate.{% endblocktrans %} + {% blocktranslate %}Depending on the selected module, the participation process has one or two phases. The name and description of the phase(s) should encourage the users to participate and let them know how they can participate.{% endblocktranslate %}
{% for phase_form in form %} diff --git a/meinberlin/templates/a4dashboard/includes/nav_modules.html b/meinberlin/templates/a4dashboard/includes/nav_modules.html index 073d1fd833..9e7d27eb2d 100644 --- a/meinberlin/templates/a4dashboard/includes/nav_modules.html +++ b/meinberlin/templates/a4dashboard/includes/nav_modules.html @@ -1,7 +1,7 @@ {% load i18n static %}