Merge branch 'application-instead-of-token' into 'master'

Use term "application" for all authorized OAuth2 applications/tokens

See merge request !646

CHANGELOG.rst

@@ -14,6 +14,7 @@ Changed
 
 * Rename every occurance of "social account" by "third-party account".
 * Use own templates and views for PWA meta and manifest.
+* Use term "application" for all authorized OAuth2 applications/tokens.
 * Use importlib instead of pkg_resources (no functional changes)
 
 Fixed

aleksis/core/menus.py

@@ -103,7 +103,7 @@ MENUS = {
                     ],
                 },
                 {
-                    "name": _("Authorized tokens"),
+                    "name": _("Authorized applications"),
                     "url": "oauth2_provider:authorized-token-list",
                     "icon": "touch_app",
                     "validators": [

aleksis/core/templates/oauth2_provider/authorized-token-delete.html

@@ -2,14 +2,14 @@
 
 {% load i18n %}
 
-{% block browser_title %}{% trans "Revoke token" %}{% endblock %}
-{% block page_title %}{% trans "Revoke token" %}{% endblock %}
+{% block browser_title %}{% trans "Revoke access" %}{% endblock %}
+{% block page_title %}{% trans "Revoke access" %}{% endblock %}
 
 {% block content %}
   <div class="alert info">
     <p>
       <i class="material-icons left">warning</i>
-      {% trans "Are you sure to revoke this token?" %}
+      {% trans "Are you sure to revoke the access for this application?" %}
     </p>
   </div>
 

aleksis/core/templates/oauth2_provider/authorized-tokens.html

@@ -20,7 +20,7 @@
               {% endfor %}
             </div>
             <div class="card-action">
-              <a href="{% url 'oauth2_provider:authorized-token-delete' authorized_token.pk %}">{% trans "Revoke" %}</a>
+              <a href="{% url 'oauth2_provider:authorized-token-delete' authorized_token.pk %}">{% trans "Revoke access" %}</a>
             </div>
           </div>
         </div>
@@ -30,7 +30,7 @@
     <div class="alert info">
       <p>
         <i class="material-icons left">info</i>
-        {% trans "No authorized tokens defined." %}
+        {% trans "No authorized applications." %}
       </p>
     </div>
   {% endif %}