Fix multi-line {% trans %} tags in templates

Author: fabiommendes

.editorconfig

@@ -18,9 +18,10 @@ known_first_party=ej
 multi_line_output=3
 default_section=THIRDPARTY
 
-[*.{html,json,yml}]
+[*.{html,json,yml,jinja2}]
 indent_style = space
-indent_size = 2
+indent_size = 4
+line_length = 150
 
 [*.{css,scss}]
 indent_style = space

locale/pt_BR/LC_MESSAGES/django.mo

@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: ej\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-07-14 18:19-0300\n"
-"PO-Revision-Date: 2019-07-14 18:21-0300\n"
+"PO-Revision-Date: 2019-07-23 14:34-0300\n"
 "Last-Translator: Fábio Mendes <[email protected]>\n"
 "Language-Team: Brazilian Portuguese\n"
 "Language: pt_BR\n"
@@ -1591,7 +1591,7 @@ msgstr "EJ - Uma plataforma de participação social."
 
 #: src/ej/templates/jinja2/pages/home.jinja2:14
 msgid "Create opinion surveys"
-msgstr "Crie consultas de opinião."
+msgstr "Crie consultas de opinião"
 
 #: src/ej/templates/jinja2/pages/home.jinja2:15
 msgid "Try it now!"
@@ -2322,7 +2322,7 @@ msgstr "Participar"
 
 #: src/ej_profiles/jinja2/ej_profiles/contributions.jinja2:71
 msgid "Empty."
-msgstr "Esvaziar."
+msgstr "Vazio."
 
 #: src/ej_profiles/jinja2/ej_profiles/detail.jinja2:5
 msgid "Info"

locale/pt_BR/LC_MESSAGES/django.po

@@ -28,12 +28,12 @@
     {% else %}
         <div class="pad-x3 rounded-3 color-negative border-1">
             <h2 class="h3 center">{{ _('Error') }}</h2>
-            <p class="center">{% trans %}Could not determine the opinion groups for this
-                conversation.{% endtrans %}</p>
+            <p class="center">{{ _('Could not determine the opinion groups for this conversation.') }}</p>
         </div>
         {% if has_edit_perm %}
-            <p class="center margin-3">{% trans link=edit_link %}You can edit the clusterization options for this
-                conversation {{ link }}.{% endtrans %}</p>
+            <p class="center margin-3">
+                {% trans link=edit_link %}You can edit the clusterization options for this conversation {{ link }}.{% endtrans %}
+            </p>
         {% endif %}
     {% endif %}
 {% endblock %}

src/ej_clusters/jinja2/ej_clusters/index.jinja2

@@ -5,12 +5,12 @@
         <h3>{% trans %}Ooops!{% endtrans %}</h3>
         <p>{% trans %}You reached the limit of comments in this conversation.{% endtrans %}</p>
     {% else %}
-        <p>{% trans %}Include something new and avoid similar opinions. You can post up to
-            <span class="text-accent">{{ n_comments }}</span> comments.{% endtrans %}</p>
+        <p>{% trans %}Include something new and avoid similar opinions.{% endtrans %}
+            {% trans %}You can post up to  <span class="text-accent">{{ n_comments }}</span> comments.{% endtrans %}</p>
         <form method="post" up-target="{{ target or 'main' }}" up-transition="move-to-right/fade-in">
             {{ csrf_input }}
             <input type="hidden" name="action" value="comment">
-            {{ form.non_field_errors()}}
+            {{ form.non_field_errors() }}
             {{ form.content.errors }}
             {{ form.content }}
             <div class="comment-form__count"><span>0</span> / 240</div>

src/ej_conversations/jinja2/ej/role/conversation-comment-form.jinja2

@@ -23,10 +23,9 @@
                 {# ADD COMMENTS #}
                 <h1 class="h2 text-accent center">{{ _('Initial comments') }}</h1>
                 <p class="center">
-                    {% trans %}Add as many comments as you like (including none).{% endtrans %}{{ ' ' }}
-                    {% trans %}Remember to give a minimum context and something for other users to
-                        explore.{% endtrans %}{{ ' ' }}
-                    {% trans %}You can add as many comments as you want later.{% endtrans %}
+                    {{ _('Add as many comments as you like (including none).') }}{{ ' ' }}
+                    {{ _('Remember to give a minimum context and something for other users to explore.') }}{{ ' ' }}
+                    {{ _('You can add as many comments as you want later.') }}
                 </p>
                 <input type="hidden" name="comments_count" value="3">
                 <div id="comment-list">

src/ej_conversations/jinja2/ej_conversations/create.jinja2

@@ -14,8 +14,8 @@
     {% if conversation.is_hidden %}
         <div class="color-negative margin-3 pad-x3 pad-y2 rounded-3 center">
             <h2>{{ _('Warning!') }}</h2>
-            <p>{% trans here=edit_link() %}This conversation is hidden. Click {{ here }} to edit and make it visible
-                again.{% endtrans %}</p>
+            <p>{% trans %}This conversation is hidden.{% endtrans %}
+                {% trans here=edit_link() %} Click {{ here }} to edit and make it visible again.{% endtrans %}</p>
         </div>
 
     {% else %}

src/ej_conversations/jinja2/ej_conversations/detail.jinja2

@@ -4,7 +4,8 @@
 
 {% block content %}
     {{ conversation|role('balloon', actions=False) }}
-    <p><a href="{{ conversation.get_absolute_url() }}" title="{{ _('Back to conversation') }}" class="lowercase bold text-brand">
+    <p><a href="{{ conversation.get_absolute_url() }}" title="{{ _('Back to conversation') }}"
+          class="lowercase bold text-brand">
         <i class="fa fa-chevron-left"></i>{% trans %}Back to conversation{% endtrans %}
     </a></p>
     <h1 class="h2 text-accent center">{{ _('Comments') }}</h1>
@@ -26,8 +27,8 @@
 
         {% if comments %}
             <p class="margin-t3">
-                {% trans count=n, n=n_strong %}Found {{ n }} comment.
-                    {% pluralize %}Found {{ n }} comments.{% endtrans %}
+                {% trans count=n, n=n_strong %}Found {{ n }} comment.{% endtrans %}
+                {% trans count=n, n=n_strong %}{% pluralize %}Found {{ n }} comments.{% endtrans %}
             </p>
 
             {# Rejection reason form #}

src/ej_conversations/jinja2/ej_conversations/moderate.jinja2

@@ -5,8 +5,8 @@
 {% block content %}
     <div class="measure margin-xauto margin-t3">
         <h1 class="h2 text-accent">{{ _('Administrative login') }}</h1>
-        <p>{% trans %}Administrative users do not have user accounts in Rocket.Chat. Instead, they all control
-            the common administrative account for Rocket.Chat.{% endtrans %}</p>
+        <p>{% trans %}Administrative users do not have user accounts in Rocket.Chat.{% endtrans %}
+            {% trans %}Instead, they all control the common administrative account for Rocket.Chat.{% endtrans %}</p>
         <h2 class="h3 text-accent">{{ _('Login') }}</h2>
         <p>{{ _('Please type the Rocket.Chat admin password') }}</p>
         <form method="post">
@@ -16,31 +16,30 @@
         </form>
 
         <h2 class="h3 text-accent">{{ _('Configuration') }}</h2>
-        <p>{% trans %}You can make the home page point to /talks/intro/ by copying the following fragment
-            into Rocket.Chat's <em>Administration > Layout > Content</em> panel.{% endtrans %}</p>
+        <p>{{ _("You can make the home page point to <code>/talks/intro/</code> by copying the following fragment into Rocket.Chat's <em>Administration > Layout > Content</em> panel.") }}</p>
         <pre><code>{{ "".__class__(code())|e }}</code></pre>
     </div>
 {% endblock %}
 
 
 {% macro code() %}
-<!DOCTYPE html>
-<html lang="pt-br">
-<style>
-    iframe {
-        width: 100%;
-        height: 100vh;
-    }
+    <!DOCTYPE html>
+    <html lang="pt-br">
+    <style>
+        iframe {
+            width: 100%;
+            height: 100vh;
+        }
 
-    .content {
-        margin: 0 !important;
-        padding: 0 !important;
-    }
-</style>
-<body>
-<iframe src="{{ base_url }}{{ url('rocket:intro') }}">
-    Bem vindos ao EJ!
-</iframe>
-</body>
-</html>
+        .content {
+            margin: 0 !important;
+            padding: 0 !important;
+        }
+    </style>
+    <body>
+    <iframe src="{{ base_url }}{{ url('rocket:intro') }}">
+        Bem vindos ao EJ!
+    </iframe>
+    </body>
+    </html>
 {% endmacro %}

src/ej_rocketchat/jinja2/ej_rocketchat/index.jinja2

@@ -6,9 +6,7 @@
 {% block content %}
     <div class="measure margin-xauto margin-t3">
         <h1 class="h2 text-accent">{{ _('Rocket.Chat user name') }}</h1>
-        <p>{% trans %}You need a unique username to use the Rocket.Chat panel.
-        Please select the username and we will create an account for you.
-        {% endtrans %}</p>
+        <p>{{ _('You need a unique username to use the Rocket.Chat panel. Please select the username and we will create an account for you.') }}</p>
          <form method="post">
             {{ csrf_input }}
             {{ form.as_p() }}