Skip to content
Snippets Groups Projects
Commit cfc9bf8d authored by Nik | Klampfradler's avatar Nik | Klampfradler
Browse files

Merge branch '459-replace-term-social-account-with-third-party-account' into 'master'

Resolve "Replace term "social account" with "third-party account""

Closes #459

See merge request !644
parents 2280f3b7 cfcb8eb6
No related branches found
No related tags found
1 merge request!644Resolve "Replace term "social account" with "third-party account""
Pipeline #14623 passed
Pipeline: AlekSIS

#14625

    ......@@ -94,7 +94,7 @@ MENUS = {
    ],
    },
    {
    "name": _("Social accounts"),
    "name": _("Third-party accounts"),
    "url": "socialaccount_connections",
    "icon": "public",
    "validators": [
    ......
    ......@@ -2,18 +2,18 @@
    {% load i18n material_form %}
    {% block browser_title %}{% trans "Social Network Login Failure" %}{% endblock %}
    {% block page_title %}{% trans "Social Network Login Failure" %}{% endblock %}
    {% block browser_title %}{% trans "Third-party Account Login Failure" %}{% endblock %}
    {% block page_title %}{% trans "Third-party Account Login Failure" %}{% endblock %}
    {% block content %}
    <div class="container">
    <div class="card red">
    <div class="card-content white-text">
    <div class="material-icons small left">error_outline</div>
    <span class="card-title">{% blocktrans %}Social Network Login Failure.{% endblocktrans %}</span>
    <span class="card-title">{% blocktrans %}Third-party Account Login Failure.{% endblocktrans %}</span>
    <p>
    {% blocktrans %}
    An error occurred while attempting to login via your social network account.
    An error occurred while attempting to login via your third-party account.
    Please contact one of your site administrators.
    {% endblocktrans %}
    </p>
    ......
    ......@@ -31,10 +31,10 @@
    </div>
    {% else %}
    <p>{% trans 'You currently have no social network accounts connected to this account.' %}</p>
    <p>{% trans 'You currently have no third-party accounts connected to this account.' %}</p>
    {% endif %}
    <h5>{% trans 'Add a 3rd Party Account' %}</h5>
    <h5>{% trans 'Add a Third-party Account' %}</h5>
    {% include "socialaccount/snippets/provider_list.html" with process="connect" %}
    ......
    ......@@ -28,9 +28,9 @@
    <div>
    <i class="material-icons left">info</i>
    {% blocktrans %}
    No 3rd party account providers available.
    No third-party account providers available.
    {% endblocktrans %}
    </div>
    </div>
    {% endif %}
    </p>
    \ No newline at end of file
    </p>
    ......@@ -1134,13 +1134,13 @@ class SocialAccountDeleteView(DeleteView):
    messages.error(
    self.request,
    _(
    "The social account could not be disconnected "
    "The third-party account could not be disconnected "
    "because it is the only login method available."
    ),
    )
    else:
    self.object.delete()
    messages.success(
    self.request, _("The social account has been successfully disconnected.")
    self.request, _("The third-party account has been successfully disconnected.")
    )
    return HttpResponseRedirect(success_url)
    0% Loading or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment