[6876] remove django-capture-tag

.coveragerc

@@ -3,3 +3,4 @@ source =
     meinberlin/apps
 omit =
     */migrations/*
+    */apps/notifications/management/commands/send_test_emails.py

meinberlin/apps/actions/templates/meinberlin_actions/includes/action.html

@@ -5,13 +5,13 @@
     <div class="action__main">
         <div class="action__line">
             {% if action.type == 'comment' and action.verb == 'add' %}
-                {% blocktrans with name=action.actor.username comment_url=action.obj.get_absolute_url %}{{ name }} added a new <a href="{{ comment_url }}">comment</a>{% endblocktrans %}
+                {% blocktranslate with name=action.actor.username comment_url=action.obj.get_absolute_url %}{{ name }} added a new <a href="{{ comment_url }}">comment</a>{% endblocktranslate %}
             {% elif action.type == 'comment' and action.verb == 'update' %}
-                {% blocktrans with name=action.actor.username comment_url=action.obj.get_absolute_url %}{{ name }} updated a <a href="{{ comment_url }}">comment</a>{% endblocktrans %}
+                {% blocktranslate with name=action.actor.username comment_url=action.obj.get_absolute_url %}{{ name }} updated a <a href="{{ comment_url }}">comment</a>{% endblocktranslate %}
             {% elif action.type == 'item' and action.verb == 'add' %}
-                {% blocktrans with name=action.actor.username item_url=action.obj.get_absolute_url %}{{ name }} added a new <a href="{{ item_url }}">item</a>{% endblocktrans %}
+                {% blocktranslate with name=action.actor.username item_url=action.obj.get_absolute_url %}{{ name }} added a new <a href="{{ item_url }}">item</a>{% endblocktranslate %}
             {% elif action.type == 'item' and action.verb == 'update' %}
-                {% blocktrans with name=action.actor.username item_url=action.obj.get_absolute_url %}{{ name }} updated an <a href="{{ item_url }}">item</a>{% endblocktrans %}
+                {% blocktranslate with name=action.actor.username item_url=action.obj.get_absolute_url %}{{ name }} updated an <a href="{{ item_url }}">item</a>{% endblocktranslate %}
             {% elif action.type == 'project' and action.verb == 'start' %}
                 {% translate "New participation started" %}
             {% elif action.type == 'phase' and action.verb == 'schedule' %}
@@ -22,7 +22,7 @@
             {% endif %}
         </div>
         <div class="action__line">
-            {% blocktrans with url=action.project.get_absolute_url name=action.project.name %}on <a href="{{ url }}">{{ name }}</a>{% endblocktrans %}
+            {% blocktranslate with url=action.project.get_absolute_url name=action.project.name %}on <a href="{{ url }}">{{ name }}</a>{% endblocktranslate %}
         </div>
         <div class="action__date">
             {% html_date action.timestamp 'd.m.Y' class='relative' title=action.timestamp|date:'DATETIME_FORMAT' %}

meinberlin/apps/bplan/templates/meinberlin_bplan/emails/office_worker_notification.de.email

@@ -12,20 +12,26 @@
 {% block greeting %}{% endblock %}
 
 {% block content_left_aligned %}
-Name:
+<p>
+Name:<br>
 {{ statement.name }}
-
-Straße, Hausnummer:
+</p>
+<p>
+Straße, Hausnummer:<br>
 {{ statement.street_number }}
-
-PLZ, Ort:
+</p>
+<p>
+PLZ, Ort:<br>
 {{ statement.postal_code_city }}
-
-E-Mail Adresse:
+</p>
+<p>
+E-Mail Adresse:<br>
 {{ statement.email }}
-
-Stellungnahme:
+</p>
+<p>
+Stellungnahme:<br>
 {{ statement.statement }}
+</p>
 {% endblock %}
 
 {% block cta %}{% endblock %}

meinberlin/apps/bplan/templates/meinberlin_bplan/emails/office_worker_update_confirmation.de.email

@@ -9,14 +9,16 @@
 {% block sub-headline %}{{ bplan.name }}{% endblock %}
 
 {% block content %}
-
+<p>
 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 }}
+</p>
+<p>
+Bebauungsplan-Nr.: {{ bplan.identifier }}<br>
 Beteiligungszeitraum: {{ bplan.start_date }} Uhr – {{ bplan.end_date }} Uhr
-
+</p>
+<p>
 Falls der Bebauungsplan nicht korrekt angezeigt wird, können Sie sich an {{ contact_email }} wenden.
-
+</p>
 {% endblock %}
 
 {% block cta_label %}Zur Projektübersicht{% endblock %}

meinberlin/apps/bplan/templates/meinberlin_bplan/emails/submitter_confirmation.de.email

@@ -11,28 +11,37 @@
 {% block greeting %}{% endblock %}
 
 {% block content_left_aligned %}
+<p>
 Guten Tag,
-
+</p>
+<p>
 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.
-
+</p>
+<p>
 Ihre Angaben in der Übersicht:
-
-Name
+</p>
+<p>
+Name<br>
 {{ statement.name }}
-
-Straße, Hausnummer
+</p>
+<p>
+Straße, Hausnummer<br>
 {{ statement.street_number }}
-
-PLZ, Ort
+</p>
+<p>
+PLZ, Ort<br>
 {{ statement.postal_code_city }}
-
-E-Mail-Adresse
+</p>
+<p>
+E-Mail-Adresse<br>
 {{ statement.email }}
-
+</p>
+<p>
 Ihre Stellungnahme
-
+</p>
+<p>
 {{ statement.statement }}
-
+</p>
 {% endblock %}
 
 {% block cta_label %}Bebauungsplan anzeigen{% endblock %}

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 %}
 <div class="container">

meinberlin/apps/cms/templates/meinberlin_cms/emails/form_submission.en.email

@@ -6,12 +6,14 @@
 {% block headline %}{{ emailformpage.title }}{% endblock %}
 
 {% block content %}
+    <p>
     {{ emailformpage.email_content }}
-
+    </p>
     {% for key, value in field_values.items %}
-
-        {{key}}:
+        <p>
+        {{key}}:<br>
         {{value}}
+        </p>
     {% endfor %}
 
 {% endblock %}

meinberlin/apps/cms/templates/meinberlin_cms/emails/form_submission_attached.en.email

@@ -6,5 +6,7 @@
 {% block headline %}{{ emailformpage.title }}{% endblock %}
 
 {% block content %}
+<p>
     {{ emailformpage.email_content }}
+</p>
 {% endblock %}

meinberlin/apps/cms/templates/meinberlin_cms/home_page.html

@@ -36,7 +36,7 @@ <h1 class="storefront__lg-text">{{ self.storefront.teaser }}</h1>
                     </div>
                     <div class="storefront__item storefront__stat-sm tile__sm u-xs-down-display-none">
                         <h1 class="storefront__lg-text storefront__xl-text">{{ self.storefront.num_entries }}</h1>
-                        <p>{% blocktrans count counter=self.storefront.num_entries %}entry added by citizens{% plural %}entries added by citizens{% endblocktrans %}</p>
+                        <p>{% blocktranslate count counter=self.storefront.num_entries %}entry added by citizens{% plural %}entries added by citizens{% endblocktranslate %}</p>
                     </div>
                 </div>
                 <div class="storefront__col storefront__mid-col u-xs-down-display-none">
@@ -51,7 +51,7 @@ <h1 class="storefront__lg-text">{{ self.storefront.teaser }}</h1>
                     <div class="storefront__item storefront__stat-lg tile__md">
                         <span class="storefront__xxl-text">{{ self.storefront.num_projects }}</span>
                         <div class="storefront__stat-text">
-                            <p>{% blocktrans count counter=self.storefront.num_projects %}project you can participate in!{% plural %}projects you can participate in!{% endblocktrans %}</p>
+                            <p>{% blocktranslate count counter=self.storefront.num_projects %}project you can participate in!{% plural %}projects you can participate in!{% endblocktranslate %}</p>
                             <div class="storefront__stat-spacer"></div>
                         </div>
                         <div class="storefront__stat-arrow"><i class="fa fa-arrow-down" aria-label="{% translate 'Scroll down' %}"></i></div>

meinberlin/apps/cms/templates/meinberlin_cms/includes/storefronts.html

@@ -7,10 +7,10 @@
     class="storefront__item storefront__district tile__md"
 >
     <h2 class="storefront__district-text">
-        {% blocktrans with district=item.district %}What is happening in <strong>{{ district }}</strong>?{% endblocktrans %}
+        {% blocktranslate with district=item.district %}What is happening in <strong>{{ district }}</strong>?{% endblocktranslate %}
     </h2>
     <button class="btn btn--primary">
-        {% blocktrans count counter=item.district_project_count %}display {{ counter }} project{% plural %}display {{ counter }} projects{% endblocktrans %}
+        {% blocktranslate count counter=item.district_project_count %}display {{ counter }} project{% plural %}display {{ counter }} projects{% endblocktranslate %}
     </button>
 </a>
 {% elif item.project and not item.quote %}
@@ -49,7 +49,7 @@ <h2 class="storefront__proj-text {% if item.project.name|length > 95 %} storefro
         </div>
         <span class="status-bar__status"><i class="fas fa-clock"></i>
           {% if item.project.module_running_days_left < 365 %}
-            {% blocktrans with time_left=item.project.module_running_time_left %}{{ time_left }} remaining{% endblocktrans %}
+            {% blocktranslate with time_left=item.project.module_running_time_left %}{{ time_left }} remaining{% endblocktranslate %}
           {% else %}
           <span>{% translate 'more than 1 year remaining' %}</span>
           {% endif %}
@@ -58,12 +58,12 @@ <h2 class="storefront__proj-text {% if item.project.name|length > 95 %} storefro
 
     {% elif item.item_type != 'external' and item.project.future_modules %}
     <div class="status-item status-item__position-storefront status__future">
-      <span class="status-bar__status"><i class="fas fa-clock" ></i>{% blocktrans with date=item.project.future_modules.first.module_start|date:"d.m.Y" %}Participation: from {{ date }}{% endblocktrans %}</span>
+      <span class="status-bar__status"><i class="fas fa-clock" ></i>{% blocktranslate with date=item.project.future_modules.first.module_start|date:"d.m.Y" %}Participation: from {{ date }}{% endblocktranslate %}</span>
     </div>
 
     {% elif item.project.has_finished %}
     <div class="status-item status-item__position-storefront status-bar__past">
-      {% blocktrans %}Participation ended. Read result.{% endblocktrans %}
+      {% blocktranslate %}Participation ended. Read result.{% endblocktranslate %}
     </div>
     {% endif %}
 </a>
@@ -76,7 +76,7 @@ <h2 class="storefront__proj-text {% if item.project.name|length > 95 %} storefro
         „{{ item.quote|truncatechars:150 }}“
     </blockquote>
     <div class="storefront__opinion-text">
-        {% blocktrans with name=item.project.name|truncatechars:60 %}What is your opinion on this: {{ name }}?{% endblocktrans %}
+        {% blocktranslate with name=item.project.name|truncatechars:60 %}What is your opinion on this: {{ name }}?{% endblocktranslate %}
     </div>
 </a>
 {% elif not item.project and item.quote %}

meinberlin/apps/documents/templates/meinberlin_documents/chapter_detail.html

@@ -56,7 +56,7 @@ <h3 class="paragraph__title">
                                         href="{{ paragraph.get_absolute_url }}"
                                 >
                                     <i class="far fa-comment" aria-hidden="true"></i>
-                                    {% blocktrans count count=paragraph.comments.all|length %}{{ count }} Comment{% plural %}{{ count }} Comments{% endblocktrans %}
+                                    {% blocktranslate count count=paragraph.comments.all|length %}{{ count }} Comment{% plural %}{{ count }} Comments{% endblocktranslate %}
                                 </a>
                             </div>
                         </section>

meinberlin/apps/ideas/templates/meinberlin_ideas/idea_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 %}
 <div class="container">

meinberlin/apps/initiators/templates/meinberlin_initiators/emails/initiator_request.de.email

@@ -5,23 +5,30 @@
 
 {% block headline %}Neue Initiatorenanfrage von {{ user.username }}{% endblock %}
 
-{% block content %}{{ user.username }} möchte zur Initator*in gemacht werden.
-
-Name
+{% block content %}
+<p>
+{{ user.username }} möchte zur Initator*in gemacht werden.
+</p>
+<p>
+Name<br>
 {{ user.username }}
-
-Name der Behörde
+</p>
+<p>
+Name der Behörde<br>
 {{ organisation.name }}
-
-Dienstliche E-Mail-Adresse
+</p>
+<p>
+Dienstliche E-Mail-Adresse<br>
 {{ user.email }}
-
-Telefonnummer
+</p>
+<p>
+Telefonnummer<br>
 {{ phone }}
-
-Datum der Nutzerregistrierung auf meinBerlin
+</p>
+<p>
+Datum der Nutzerregistrierung auf meinBerlin<br>
 {{ user.date_joined }}
-
+</p>
 {% endblock %}
 
 {% block cta_label %}Zur Administration{% endblock %}

meinberlin/apps/initiators/templates/meinberlin_initiators/emails/initiator_request.en.email

@@ -5,23 +5,30 @@
 
 {% block headline %}New initiator request by {{ user.username }}{% endblock %}
 
-{% block content %}{{ user.username }} wants to become an initiator.
-
-Name
+{% block content %}
+<p>
+{{ user.username }} wants to become an initiator.
+</p>
+<p>
+Name<br>
 {{ user.username }}
-
-Name of the Organisation
+</p>
+<p>
+Name of the Organisation<br>
 {{ organisation.name }}
-
-Email address
+</p>
+<p>
+Email address<br>
 {{ user.email }}
-
-Phone number
+</p>
+<p>
+Phone number<br>
 {{ phone }}
-
-Date of registration on meinBerlin
+</p>
+<p>
+Date of registration on meinBerlin<br>
 {{ user.date_joined }}
-
+</p>
 {% endblock %}
 
 {% block cta_label %}Go to Administration{% endblock %}

meinberlin/apps/kiezkasse/templates/meinberlin_kiezkasse/proposal_moderate_form.html

@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {% load i18n %}
 
-{% block title %}{% blocktrans with name=object.name %}Moderate {{ name }}{% endblocktrans %}{% endblock %}
+{% block title %}{% blocktranslate with name=object.name %}Moderate {{ name }}{% endblocktranslate %}{% endblock %}
 {% block content %}
 <div class="container">
     <div class="offset-lg-3 col-lg-6">

meinberlin/apps/kiezkasse/templates/meinberlin_kiezkasse/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 %}
 <div class="container">

meinberlin/apps/livequestions/templates/meinberlin_livequestions/includes/module_affiliations_form.html

@@ -1,6 +1,6 @@
 {% load i18n %}
 
-<p class="form-hint">{% blocktrans %}Here you can specify affiliations. Users must classify questions accordingly. The questions can be filtered by affiliation and evaluated in the statistics.{% endblocktrans %}
+<p class="form-hint">{% blocktranslate %}Here you can specify affiliations. Users must classify questions accordingly. The questions can be filtered by affiliation and evaluated in the statistics.{% endblocktranslate %}
 </p>
 
 <div class="js-formset category-formset"

meinberlin/apps/mapideas/templates/meinberlin_mapideas/mapidea_moderate_form.html

@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {% load i18n %}
 
-{% block title %}{% blocktrans with name=object.name %}Moderate {{ name }}{% endblocktrans %}{% endblock %}
+{% block title %}{% blocktranslate with name=object.name %}Moderate {{ name }}{% endblocktranslate %}{% endblock %}
 {% block content %}
 <div class="container">
     <div class="offset-lg-3 col-lg-6">

meinberlin/apps/mapideas/templates/meinberlin_mapideas/mapidea_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 %}
 <div class="container">

meinberlin/apps/maptopicprio/templates/meinberlin_maptopicprio/maptopic_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 %}
 <div class="container">