From bed0257326e0f5f9721970231fc678cef77131b6 Mon Sep 17 00:00:00 2001 From: Daniel Grams Date: Sun, 14 Feb 2021 13:56:36 +0100 Subject: [PATCH] OAuth settings #115 --- project/templates/oauth2_token/list.html | 2 +- project/templates/profile.html | 22 ++++-- .../translations/de/LC_MESSAGES/messages.mo | Bin 26713 -> 26749 bytes .../translations/de/LC_MESSAGES/messages.po | 73 ++++++++++-------- 4 files changed, 57 insertions(+), 40 deletions(-) diff --git a/project/templates/oauth2_token/list.html b/project/templates/oauth2_token/list.html index 9f669c2..81146f0 100644 --- a/project/templates/oauth2_token/list.html +++ b/project/templates/oauth2_token/list.html @@ -16,7 +16,7 @@ - + diff --git a/project/templates/profile.html b/project/templates/profile.html index a9af017..ff79617 100644 --- a/project/templates/profile.html +++ b/project/templates/profile.html @@ -14,17 +14,27 @@ {{ _fsdomain('Change password') }} - {% if current_user.has_permission('oauth2_client:read') %} + + +

{{ _('Settings') }}

+ +
+ + {{ _('Applications') }} + + +
+ +{% if current_user.has_permission('oauth2_client:read') %} +

{{ _('Developer') }}

+ +
{{ _('OAuth2 clients') }} - {% endif %} - - {{ _('OAuth2 tokens') }} - -
+{% endif %} {% if invitations %}

{{ _('Invitations') }}

diff --git a/project/translations/de/LC_MESSAGES/messages.mo b/project/translations/de/LC_MESSAGES/messages.mo index 1c75ca9d11481fe1efb6c71bd18190bd913472a3..2372969702492e206dfea6e1298894767bb0bfb2 100644 GIT binary patch delta 6377 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 VRNYWkxFTfb>OgiwhvLGn{|BMv!KwfN delta 6328 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 diff --git a/project/translations/de/LC_MESSAGES/messages.po b/project/translations/de/LC_MESSAGES/messages.po index 752b7a7..320b836 100644 --- a/project/translations/de/LC_MESSAGES/messages.po +++ b/project/translations/de/LC_MESSAGES/messages.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2021-02-14 10:49+0100\n" +"POT-Creation-Date: 2021-02-14 13:55+0100\n" "PO-Revision-Date: 2020-06-07 18:51+0200\n" "Last-Translator: FULL NAME \n" "Language: de\n" @@ -196,7 +196,7 @@ msgstr "Nutzungsbedingungen" msgid "Legal notice" msgstr "Impressum" -#: project/forms/admin.py:12 project/templates/_macros.html:1012 +#: project/forms/admin.py:12 project/templates/_macros.html:1011 #: project/templates/layout.html:175 #: project/templates/widget/event_suggestion/create.html:155 #: project/views/root.py:44 @@ -213,7 +213,7 @@ msgid "Save" msgstr "Speichern" #: project/forms/admin.py:19 project/forms/admin_unit_member.py:12 -#: project/forms/admin_unit_member.py:32 project/templates/profile.html:56 +#: project/forms/admin_unit_member.py:32 project/templates/profile.html:66 msgid "Roles" msgstr "Rollen" @@ -279,7 +279,7 @@ msgstr "Längengrad" #: project/templates/admin/admin_units.html:19 #: project/templates/event_place/list.html:19 #: project/templates/oauth2_client/list.html:25 -#: project/templates/profile.html:35 project/templates/profile.html:55 +#: project/templates/profile.html:45 project/templates/profile.html:65 msgid "Name" msgstr "Name" @@ -785,7 +785,7 @@ msgstr "Wähle den Status der Veranstaltung." msgid "Update event" msgstr "Veranstaltung aktualisieren" -#: project/forms/event.py:358 project/templates/_macros.html:961 +#: project/forms/event.py:358 project/templates/_macros.html:960 #: project/templates/event/actions.html:41 #: project/templates/event/delete.html:6 msgid "Delete event" @@ -1008,7 +1008,7 @@ msgstr "Anfrage speichern" msgid "Delete request" msgstr "Anfrage löschen" -#: project/forms/reference_request.py:27 project/templates/_macros.html:1024 +#: project/forms/reference_request.py:27 project/templates/_macros.html:1023 #: project/templates/event_suggestion/review_status.html:18 #: project/templates/reference_request/review_status.html:12 msgid "Review status" @@ -1063,7 +1063,7 @@ msgid "This field is optional." msgstr "Dieses Feld ist optional." #: project/templates/_macros.html:116 project/templates/_macros.html:388 -#: project/templates/_macros.html:395 project/templates/_macros.html:643 +#: project/templates/_macros.html:395 project/templates/_macros.html:642 msgid "Date" msgstr "Datum" @@ -1117,7 +1117,7 @@ msgid "Search location on Google" msgstr "Ort bei Google suchen" #: project/templates/_macros.html:592 project/templates/_macros.html:594 -#: project/templates/event_date/list.html:272 +#: project/templates/event_date/list.html:279 #: project/templates/widget/event_suggestion/create.html:144 #: project/templates/widget/event_suggestion/create.html:169 #: project/templates/widget/event_suggestion/create.html:191 @@ -1132,8 +1132,8 @@ msgstr "Zurück" msgid "Page %(page)d of %(pages)d (%(total)d total)" msgstr "Seite %(page)d von %(pages)d (%(total)d insgesamt)" -#: project/templates/_macros.html:599 project/templates/_macros.html:601 -#: project/templates/event_date/list.html:273 +#: project/templates/_macros.html:598 project/templates/_macros.html:600 +#: project/templates/event_date/list.html:281 #: project/templates/widget/event_suggestion/create.html:145 #: project/templates/widget/event_suggestion/create.html:170 #: project/templates/widget/event_suggestion/create.html:192 @@ -1142,39 +1142,39 @@ msgstr "Seite %(page)d von %(pages)d (%(total)d insgesamt)" msgid "Next" msgstr "Weiter" -#: project/templates/_macros.html:666 +#: project/templates/_macros.html:665 msgid "Radius" msgstr "Umkreis" -#: project/templates/_macros.html:871 +#: project/templates/_macros.html:870 msgid "Edit image" msgstr "Bild bearbeiten" -#: project/templates/_macros.html:892 +#: project/templates/_macros.html:891 msgid "Close" msgstr "Schließen" -#: project/templates/_macros.html:893 +#: project/templates/_macros.html:892 msgid "Okay" msgstr "OK" -#: project/templates/_macros.html:902 project/templates/_macros.html:904 +#: project/templates/_macros.html:901 project/templates/_macros.html:903 msgid "Choose image file" msgstr "Bild-Datei auswählen" -#: project/templates/_macros.html:956 project/templates/reference/read.html:13 +#: project/templates/_macros.html:955 project/templates/reference/read.html:13 msgid "Actions" msgstr "Aktionen" -#: project/templates/_macros.html:960 project/templates/event/actions.html:40 +#: project/templates/_macros.html:959 project/templates/event/actions.html:40 msgid "Edit event" msgstr "Veranstaltung bearbeiten" -#: project/templates/_macros.html:963 project/templates/manage/events.html:30 +#: project/templates/_macros.html:962 project/templates/manage/events.html:30 msgid "More" msgstr "Mehr" -#: project/templates/_macros.html:984 +#: project/templates/_macros.html:983 msgid "Event suggestion" msgstr "Veranstaltungsvorschlag" @@ -1207,6 +1207,7 @@ msgid "Example" msgstr "Beispiel" #: project/templates/developer/read.html:4 project/templates/layout.html:118 +#: project/templates/profile.html:29 msgid "Developer" msgstr "Entwickler" @@ -1292,25 +1293,23 @@ msgstr "Widgets" #: project/templates/admin/settings.html:8 #: project/templates/admin_unit/update.html:12 #: project/templates/layout_manage.html:48 -#: project/templates/manage/widgets.html:12 +#: project/templates/manage/widgets.html:12 project/templates/profile.html:19 msgid "Settings" msgstr "Einstellungen" +#: project/templates/profile.html:23 +msgid "Applications" +msgstr "Apps" + #: project/templates/oauth2_client/list.html:4 #: project/templates/oauth2_client/list.html:11 #: project/templates/oauth2_client/read.html:16 -#: project/templates/profile.html:19 +#: project/templates/profile.html:33 msgid "OAuth2 clients" msgstr "OAuth2 Clients" -#: project/templates/oauth2_token/list.html:4 -#: project/templates/oauth2_token/list.html:11 -#: project/templates/profile.html:24 -msgid "OAuth2 tokens" -msgstr "OAuth2 Token" - #: project/templates/manage/admin_units.html:8 -#: project/templates/manage/members.html:9 project/templates/profile.html:30 +#: project/templates/manage/members.html:9 project/templates/profile.html:40 msgid "Invitations" msgstr "Einladungen" @@ -1319,7 +1318,7 @@ msgstr "Einladungen" #: project/templates/admin/admin_units.html:11 #: project/templates/manage/admin_units.html:3 #: project/templates/manage/admin_units.html:16 -#: project/templates/profile.html:50 +#: project/templates/profile.html:60 msgid "Admin Units" msgstr "Organisationen" @@ -1466,7 +1465,7 @@ msgstr "Zielgruppe" #: project/templates/event/read.html:17 #: project/templates/event_date/list.html:4 -#: project/templates/event_date/list.html:251 +#: project/templates/event_date/list.html:258 #: project/templates/reference_request/review.html:30 msgid "Event Dates" msgstr "Termine" @@ -1588,9 +1587,14 @@ msgstr "OAuth2 Client" msgid "Update OAuth2 client" msgstr "OAuth2 Client aktualisieren" +#: project/templates/oauth2_token/list.html:4 +#: project/templates/oauth2_token/list.html:11 +msgid "OAuth2 tokens" +msgstr "OAuth2 Token" + #: project/templates/oauth2_token/list.html:19 -msgid "Client" -msgstr "Client" +msgid "Application" +msgstr "App" #: project/templates/oauth2_token/list.html:30 msgid "Revoked" @@ -1666,7 +1670,7 @@ msgstr "Vorschau" msgid "Admin unit successfully updated" msgstr "Organisation erfolgreich aktualisiert" -#: project/views/admin.py:68 project/views/manage.py:241 +#: project/views/admin.py:68 project/views/manage.py:240 msgid "Settings successfully updated" msgstr "Einstellungen erfolgreich aktualisiert" @@ -2030,3 +2034,6 @@ msgstr "Neue Veranstaltung zu prüfen" #~ msgid "Delete image" #~ msgstr "Bild löschen" +#~ msgid "Client" +#~ msgstr "Client" +
{{ _('Client') }}{{ _('Application') }} {{ _('Scopes') }} {{ _('Status') }}