Merge remote-tracking branch 'upstream/master' into version-1.13

unusualpepe · Oct 30, 2020 · 0448999 · 0448999
2 parents 718056c + fde91a5
commit 0448999
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## Unreleased
+
+### Changed
+- Change "Back to Profile" to "Back to Account Security"
+
 ## 1.13.0
 
 ### Added

diff --git a/two_factor/templates/two_factor/core/setup_complete.html b/two_factor/templates/two_factor/core/setup_complete.html
@@ -9,14 +9,14 @@ <h1>{% block title %}{% trans "Enable Two-Factor Authentication" %}{% endblock %
 
   {% if not phone_methods %}
     <p><a href="{% url 'two_factor:profile' %}"
-        class="btn btn-block btn-secondary">{% trans "Back to Profile" %}</a></p>
+        class="btn btn-block btn-secondary">{% trans "Back to Account Security" %}</a></p>
   {% else %}
     <p>{% blocktrans trimmed %}However, it might happen that you don't have access to
-      your primary token device. To enable account recovery, add a phone 
+      your primary token device. To enable account recovery, add a phone
       number.{% endblocktrans %}</p>
 
     <a href="{% url 'two_factor:profile' %}"
-        class="float-right btn btn-link">{% trans "Back to Profile" %}</a>
+        class="float-right btn btn-link">{% trans "Back to Account Security" %}</a>
     <p><a href="{% url 'two_factor:phone_create' %}"
         class="btn btn-success">{% trans "Add Phone Number" %}</a></p>
   {% endif %}