diff --git a/README.rst b/README.rst index 286351fc..0e160704 100644 --- a/README.rst +++ b/README.rst @@ -195,6 +195,11 @@ DB Models Changelog ========= +v. 1.4.0 +-------- + +* Clarify copy + v. 1.3.0 -------- diff --git a/messages.pot b/messages.pot index 6d0753d8..314c0472 100644 --- a/messages.pot +++ b/messages.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: xl_auth 1.3.0\n" +"Project-Id-Version: xl_auth 1.4.0\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2018-08-29 13:49+0200\n" +"POT-Creation-Date: 2018-12-18 15:20+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -738,20 +738,22 @@ msgid "Delete Permission" msgstr "" #: xl_auth/templates/oauth/authorize.html:5 -msgid "Authorization Request" +msgid "Share account details" msgstr "" #: xl_auth/templates/oauth/authorize.html:6 #, python-format -msgid "OAuth2 client \"%(name)s (%(description)s)\" is requesting access to your account details." +msgid "%(name)s %(description)s needs access to your account details." msgstr "" #: xl_auth/templates/oauth/authorize.html:8 -msgid "Press \"Authorize\" to approve and get redirected back to the service." +msgid "" +"This is necessary for the service to be able to, among other things, display your email and your " +"permissions." msgstr "" #: xl_auth/templates/oauth/authorize.html:16 -msgid "Authorize" +msgid "Accept" msgstr "" #: xl_auth/templates/oauth/errors.html:7 diff --git a/package-lock.json b/package-lock.json index d3c1d9de..fb8ba773 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "xl_auth", - "version": "1.3.0", + "version": "1.4.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 4f60ea7d..accd0ece 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "xl_auth", - "version": "1.3.0", + "version": "1.4.0", "author": "National Library of Sweden", "license": "Apache-2.0", "description": "Authorization and OAuth2 provider for LibrisXL", diff --git a/xl_auth/templates/oauth/authorize.html b/xl_auth/templates/oauth/authorize.html index 873b5d2d..97cdd3fc 100644 --- a/xl_auth/templates/oauth/authorize.html +++ b/xl_auth/templates/oauth/authorize.html @@ -2,10 +2,10 @@ {% extends "layout.html" %} {% block content %}
-

{{ _('Authorization Request') }}

-

{{ _('OAuth2 client "%(name)s (%(description)s)" is \ -requesting access to your account details.', name=client.name, description=client.description) }}

-

{{ _('Press "Authorize" to approve and get redirected back to the service.') }}

+

{{ _('Share account details') }}

+

{{ _('%(name)s %(description)s needs access to your account details.', + name=client.name, description=client.description) }} + {{ _('This is necessary for the service to be able to, among other things, display your email and your permissions.') }}


@@ -13,7 +13,7 @@

{{ _('Authorization Request') }}

{{ authorize_form.confirm() }} + value="{{ _('Accept') }}">
diff --git a/xl_auth/translations/sv/LC_MESSAGES/messages.po b/xl_auth/translations/sv/LC_MESSAGES/messages.po index 710d8f1d..307d19c1 100644 --- a/xl_auth/translations/sv/LC_MESSAGES/messages.po +++ b/xl_auth/translations/sv/LC_MESSAGES/messages.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.2.1\n" "Report-Msgid-Bugs-To: mats.blomdahl@gmail.com\n" -"POT-Creation-Date: 2018-08-29 13:49+0200\n" +"POT-Creation-Date: 2018-12-18 15:20+0100\n" "PO-Revision-Date: 2017-09-19 12:23+0200\n" "Last-Translator: Mats Blomdahl \n" "Language: sv\n" @@ -741,21 +741,23 @@ msgid "Delete Permission" msgstr "🙀 Ta bort behörighet" #: xl_auth/templates/oauth/authorize.html:5 -msgid "Authorization Request" -msgstr "Auktoriseringsbegäran" +msgid "Share account details" +msgstr "Dela uppgifter" #: xl_auth/templates/oauth/authorize.html:6 #, python-format -msgid "OAuth2 client \"%(name)s (%(description)s)\" is requesting access to your account details." -msgstr "\"%(name)s\" (%(description)s) begär tillgång till dina användaruppgifter." +msgid "%(name)s %(description)s needs access to your account details." +msgstr "Om du vill fortsätta behöver %(name)s %(description)s tillgång till dina uppgifter." #: xl_auth/templates/oauth/authorize.html:8 -msgid "Press \"Authorize\" to approve and get redirected back to the service." -msgstr "Klicka på \"Auktorisera\" för att godkänna och återvända till tjänsten." +msgid "" +"This is necessary for the service to be able to, among other things, display your email and your " +"permissions." +msgstr "Detta för att bland annat kunna visa din e-postadress och dina sigel." #: xl_auth/templates/oauth/authorize.html:16 -msgid "Authorize" -msgstr "Auktorisera" +msgid "Accept" +msgstr "Godkänn" #: xl_auth/templates/oauth/errors.html:7 msgid "OAuth Error"