From 7e4af695cec37507ebd394fdd2760a5a35c2a5ad Mon Sep 17 00:00:00 2001
From: Sunil Mohan Adapa <sunil@medhas.org>
Date: Sat, 12 Nov 2016 08:11:29 +0530
Subject: [PATCH] letsencrypt: I18n and minor fixes

- Fix indentation from a recent change.

- Internationalize 'no domains configured' message.

- Expand the message as per orignal pull request.
---
 .../letsencrypt/templates/letsencrypt.html    | 129 +++++++++---------
 1 file changed, 66 insertions(+), 63 deletions(-)

diff --git a/plinth/modules/letsencrypt/templates/letsencrypt.html b/plinth/modules/letsencrypt/templates/letsencrypt.html
index 32567c4aa..5bc9c225e 100644
--- a/plinth/modules/letsencrypt/templates/letsencrypt.html
+++ b/plinth/modules/letsencrypt/templates/letsencrypt.html
@@ -35,73 +35,76 @@
 
 {% block configuration %}
   {% if status.domains %}
-      <div class="row">
-        <div class="col-lg-12">
-          <table class="table table-bordered table-condensed table-striped">
-            <thead>
+    <div class="row">
+      <div class="col-lg-12">
+        <table class="table table-bordered table-condensed table-striped">
+          <thead>
+            <tr>
+              <th>{% trans "Domain" %}</th>
+              <th>{% trans "Certificate Status" %}</th>
+              <th>{% trans "Website Security" %}</th>
+              <th>{% trans "Actions" %}</th>
+            </tr>
+          </thead>
+          <tbody>
+            {% for domain, domain_status in status.domains.items %}
               <tr>
-                <th>{% trans "Domain" %}</th>
-                <th>{% trans "Certificate Status" %}</th>
-                <th>{% trans "Website Security" %}</th>
-                <th>{% trans "Actions" %}</th>
+                <td>{{ domain }}</td>
+                <td>
+                  {% if domain_status.certificate_available %}
+                    <span class="label label-success">
+                      {% blocktrans trimmed with expiry_date=domain_status.expiry_date %}
+                        Expires on {{ expiry_date }}
+                      {% endblocktrans %}
+                    </span>
+                  {% else %}
+                    <span class="label label-warning">
+                      {% trans "No certificate" %}
+                    </span>
+                  {% endif %}
+                </td>
+                <td>
+                  {% if domain_status.web_enabled %}
+                    <span class="label label-success">{% trans "Enabled" %}</span>
+                  {% else %}
+                    <span class="label label-warning">{% trans "Disabled" %}</span>
+                  {% endif %}
+                </td>
+                <td>
+                  {% if domain_status.certificate_available %}
+                    <form class="form form-inline" method="post"
+                          action="{% url 'letsencrypt:revoke' domain %}">
+                      {% csrf_token %}
+                      <button class="btn btn-sm btn-default" type="submit">
+                        {% trans "Revoke" %}</button>
+                    </form>
+                    <form class="form form-inline" method="post"
+                          action="{% url 'letsencrypt:obtain' domain %}">
+                      {% csrf_token %}
+                      <button class="btn btn-sm btn-default" type="submit">
+                        {% trans "Re-obtain" %}</button>
+                    </form>
+                  {% else %}
+                    <form class="form form-inline" method="post"
+                          action="{% url 'letsencrypt:obtain' domain %}">
+                      {% csrf_token %}
+                      <button class="btn btn-sm btn-primary" type="submit">
+                        {% trans "Obtain" %}</button>
+                    </form>
+                  {% endif %}
+                </td>
               </tr>
-            </thead>
-            <tbody>
-              {% for domain, domain_status in status.domains.items %}
-                <tr>
-                  <td>{{ domain }}</td>
-                  <td>
-                    {% if domain_status.certificate_available %}
-                      <span class="label label-success">
-                        {% blocktrans trimmed with expiry_date=domain_status.expiry_date %}
-                          Expires on {{ expiry_date }}
-                        {% endblocktrans %}
-                      </span>
-                    {% else %}
-                      <span class="label label-warning">
-                        {% trans "No certificate" %}
-                      </span>
-                    {% endif %}
-                  </td>
-                  <td>
-                    {% if domain_status.web_enabled %}
-                      <span class="label label-success">{% trans "Enabled" %}</span>
-                    {% else %}
-                      <span class="label label-warning">{% trans "Disabled" %}</span>
-                    {% endif %}
-                  </td>
-                  <td>
-                    {% if domain_status.certificate_available %}
-                      <form class="form form-inline" method="post"
-                            action="{% url 'letsencrypt:revoke' domain %}">
-                        {% csrf_token %}
-                        <button class="btn btn-sm btn-default" type="submit">
-                          {% trans "Revoke" %}</button>
-                      </form>
-                      <form class="form form-inline" method="post"
-                            action="{% url 'letsencrypt:obtain' domain %}">
-                        {% csrf_token %}
-                        <button class="btn btn-sm btn-default" type="submit">
-                          {% trans "Re-obtain" %}</button>
-                      </form>
-                    {% else %}
-                      <form class="form form-inline" method="post"
-                            action="{% url 'letsencrypt:obtain' domain %}">
-                        {% csrf_token %}
-                        <button class="btn btn-sm btn-primary" type="submit">
-                          {% trans "Obtain" %}</button>
-                      </form>
-                    {% endif %}
-                  </td>
-                </tr>
-              {% endfor %}
-            </tbody>
-          </table>
-        </div>
+            {% endfor %}
+          </tbody>
+        </table>
       </div>
+    </div>
 
-      {% include "diagnostics_button.html" with module="letsencrypt" %}
+    {% include "diagnostics_button.html" with module="letsencrypt" %}
   {% else %}
-    No domains have been configured....
+    {% blocktrans trimmed %}
+      No domains have been configured. Configure domains to be able to
+      obtain certificates for them.
+    {% endblocktrans %}
   {% endif %}
 {% endblock %}