From 73e55f06b4391c2be001995221a4c6e0f861f8f7 Mon Sep 17 00:00:00 2001
From: Sunil Mohan Adapa <sunil@medhas.org>
Date: Mon, 13 Jul 2020 14:49:18 -0700
Subject: [PATCH] upgrades: security: Don't with the technical term 'backports'
 in UI

- Call backports as 'Frequent Feature Updates'. This is make it easy for a
non-technical user to understand better what they are.

- Clearly recommend enabling backports as this is our current consensus.

- Explain that if backports are disabled, feature updates will come every 2
years or so.

- Show the status of backports on upgrades app even after it is enabled.
Disappearing options in the UI are generally confusing for users (hiding of
expand partition feature should be seen as exception rather than as example).

- Tone down the alarm on backports:

  - Rename 'Security Notice' to 'Frequent Feature Updates' in security page.

  - Remove 'on a best-effort basis' phrase, as everything in Debian is similar.

  - Set the activate button to primary priority rather than warning to make the
  user comfortable with it.

- Share translation strings across the two apps so that effort for translators
is reduced.

Signed-off-by: Sunil Mohan Adapa <sunil@medhas.org>
Reviewed-by: James Valleroy <jvalleroy@mailbox.org>
---
 .../modules/security/templates/security.html  | 16 +++++--
 .../templates/upgrades_configure.html         | 47 +++++++++++--------
 2 files changed, 38 insertions(+), 25 deletions(-)

diff --git a/plinth/modules/security/templates/security.html b/plinth/modules/security/templates/security.html
index 86f57b8b5..2d8ed7001 100644
--- a/plinth/modules/security/templates/security.html
+++ b/plinth/modules/security/templates/security.html
@@ -14,13 +14,19 @@
   </a>
 
   {% if is_backports_enabled %}
-    <h3>{% trans "Security Notice" %}</h3>
+    <h3>{% trans "Frequent Feature Updates" %}</h3>
     <p>
       {% blocktrans trimmed %}
-        Backports are enabled. Please note that packages from the backports
-        repository do not have security support from Debian. However, they are
-        maintained on a best-effort basis by contributors in Debian and
-        FreedomBox community.
+        Frequent feature updates are enabled.
+      {% endblocktrans %}
+    </p>
+    <p>
+      {% blocktrans trimmed %}
+        This will allow a very limited set of software, including FreedomBox
+        service, to be updated to receive newer features regularly instead of
+        once every 2 years or so. Note that packages with frequent feature
+        updates do not have support from Debian Security Team. They are instead
+        maintained by contributors to Debian and the FreedomBox community.
       {% endblocktrans %}
     </p>
   {% endif %}
diff --git a/plinth/modules/upgrades/templates/upgrades_configure.html b/plinth/modules/upgrades/templates/upgrades_configure.html
index 11f0b5a0f..2c0bc92fb 100644
--- a/plinth/modules/upgrades/templates/upgrades_configure.html
+++ b/plinth/modules/upgrades/templates/upgrades_configure.html
@@ -8,27 +8,34 @@
 {% load static %}
 
 {% block extra_content %}
+  <h3>{% trans "Frequent Feature Updates" %}</h3>
+  <p>
+    {% if can_activate_backports %}
+      {% blocktrans trimmed %}
+        Frequent feature updates can be activated. Activating them is
+        recommended.
+      {% endblocktrans %}
+    {% else %}
+      {% blocktrans trimmed %}
+        Frequent feature updates are enabled.
+      {% endblocktrans %}
+    {% endif %}
+  </p>
+  <p>
+    {% blocktrans trimmed %}
+      This will allow a very limited set of software, including FreedomBox
+      service, to be updated to receive newer features regularly instead of once
+      every 2 years or so. Note that packages with frequent feature updates do
+      not have support from Debian Security Team. They are instead maintained by
+      contributors to Debian and the FreedomBox community.
+    {% endblocktrans %}
+  </p>
   {% if can_activate_backports %}
-    <h3>{% trans "Backports" %}</h3>
-    <p>
-      {% blocktrans trimmed %}
-        Backports can be activated. This will allow a limited set of software,
-        including FreedomBox service, to be upgraded to newer versions from
-        Debian {{ dist }}-backports repository.
-      {% endblocktrans %}
-    </p>
-    <p>
-      {% blocktrans trimmed %}
-        Please note that backports packages do not have security support from
-        Debian. However, they are maintained on a best-effort basis by
-        contributors in Debian and FreedomBox community.
-      {% endblocktrans %}
-    </p>
     <div class="alert alert-warning" role="alert">
       {% url 'snapshot:index' as snapshot_url %}
       {% blocktrans trimmed %}
-        <strong>Warning!</strong> Once backports are activated, they cannot be
-        easily deactivated. You may wish to take a snapshot using
+        <strong>Warning!</strong> Once frequent feature updates are activated,
+        they cannot be deactivated. You may wish to take a snapshot using
         <a href="{{ snapshot_url }}">Storage Snapshots</a> before continuing.
       {% endblocktrans %}
     </div>
@@ -36,13 +43,13 @@
       <form class="form" method="post"
             action="{% url 'upgrades:activate-backports' %}">
         {% csrf_token %}
-        <input type="submit" class="btn btn-warning"
-               value="{% trans 'Activate backports' %}"/>
+        <input type="submit" class="btn btn-primary"
+               value="{% trans 'Activate frequent feature updates (recommended)' %}"/>
       </form>
     </p>
   {% endif %}
 
-  <h3>{% trans "Manual update" %}</h3>
+  <h3>{% trans "Manual Update" %}</h3>
   {% if is_busy %}
     <p>
       <button type="button" disabled="disabled"