From 5abc5aa425ad72ad5a6ffd68172b5c504a6d5e81 Mon Sep 17 00:00:00 2001 From: mb-wali Date: Wed, 25 May 2022 10:38:08 +0200 Subject: [PATCH 1/4] i18n: update pot file --- babel.ini | 1 - invenio_accounts/translations/messages.pot | 26 ++++++++++++++-------- invenio_accounts/views/security.py | 2 +- invenio_accounts/views/settings.py | 2 +- 4 files changed, 19 insertions(+), 12 deletions(-) diff --git a/babel.ini b/babel.ini index e021ca19..57923d9c 100644 --- a/babel.ini +++ b/babel.ini @@ -15,7 +15,6 @@ encoding = utf-8 [jinja2: **/templates/**.html] encoding = utf-8 -extensions = jinja2.ext.autoescape, jinja2.ext.with_ # Extraction from JavaScript files diff --git a/invenio_accounts/translations/messages.pot b/invenio_accounts/translations/messages.pot index 56b39ec6..aab39515 100644 --- a/invenio_accounts/translations/messages.pot +++ b/invenio_accounts/translations/messages.pot @@ -7,16 +7,16 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: invenio-accounts 2.0.0.dev0\n" +"Project-Id-Version: invenio-accounts 2.0.0\n" "Report-Msgid-Bugs-To: info@inveniosoftware.org\n" -"POT-Creation-Date: 2022-02-15 13:22+0100\n" +"POT-Creation-Date: 2022-05-25 11:29+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.9.1\n" +"Generated-By: Babel 2.10.1\n" #: invenio_accounts/admin.py:77 msgid "Inactivate" @@ -71,6 +71,14 @@ msgstr "" msgid "Please complete the reCAPTCHA." msgstr "" +#: invenio_accounts/utils.py:209 +msgid "ACCOUNTS_USERNAME_RULES_TEXT" +msgstr "" + +#: invenio_accounts/profiles/schemas.py:20 +msgid "Value must be either 'public' or 'restricted'." +msgstr "" + #: invenio_accounts/templates/invenio_accounts/change_password.html:13 #: invenio_accounts/templates/semantic-ui/invenio_accounts/change_password.html:13 #: invenio_accounts/views/settings.py:78 @@ -193,32 +201,32 @@ msgid "Sessions" msgstr "" #: invenio_accounts/templates/invenio_accounts/settings/security.html:16 -#: invenio_accounts/templates/semantic-ui/invenio_accounts/settings/security.html:53 +#: invenio_accounts/templates/semantic-ui/invenio_accounts/settings/security.html:54 msgid "Revoke" msgstr "" #: invenio_accounts/templates/invenio_accounts/settings/security.html:20 -#: invenio_accounts/templates/semantic-ui/invenio_accounts/settings/security.html:15 +#: invenio_accounts/templates/semantic-ui/invenio_accounts/settings/security.html:16 msgid "This is a list of devices that have logged into your account." msgstr "" #: invenio_accounts/templates/invenio_accounts/settings/security.html:36 -#: invenio_accounts/templates/semantic-ui/invenio_accounts/settings/security.html:33 +#: invenio_accounts/templates/semantic-ui/invenio_accounts/settings/security.html:34 msgid "Signed in" msgstr "" #: invenio_accounts/templates/invenio_accounts/settings/security.html:38 -#: invenio_accounts/templates/semantic-ui/invenio_accounts/settings/security.html:35 +#: invenio_accounts/templates/semantic-ui/invenio_accounts/settings/security.html:36 msgid "current session" msgstr "" #: invenio_accounts/templates/invenio_accounts/settings/security.html:46 -#: invenio_accounts/templates/semantic-ui/invenio_accounts/settings/security.html:41 +#: invenio_accounts/templates/semantic-ui/invenio_accounts/settings/security.html:42 msgid "Location" msgstr "" #: invenio_accounts/templates/invenio_accounts/settings/security.html:55 -#: invenio_accounts/templates/semantic-ui/invenio_accounts/settings/security.html:53 +#: invenio_accounts/templates/semantic-ui/invenio_accounts/settings/security.html:54 msgid "Logout" msgstr "" diff --git a/invenio_accounts/views/security.py b/invenio_accounts/views/security.py index 943ef663..675d6858 100644 --- a/invenio_accounts/views/security.py +++ b/invenio_accounts/views/security.py @@ -30,7 +30,7 @@ blueprint, 'settings.security', # NOTE: Menu item text (icon replaced by a user icon). _('%(icon)s Security', icon=make_lazy_string( - lambda: f'')), + lambda: '')), order=2) @register_breadcrumb(blueprint, 'breadcrumbs.settings.security', _('Security')) def security(): diff --git a/invenio_accounts/views/settings.py b/invenio_accounts/views/settings.py index 82d86def..ef5a1363 100644 --- a/invenio_accounts/views/settings.py +++ b/invenio_accounts/views/settings.py @@ -63,7 +63,7 @@ def init_menu(): view_name, # NOTE: Menu item text (icon replaced by a key icon). _('%(icon)s Change password', - icon=f''), + icon=''), order=1) # Breadcrumb for change password From 38962517903ef3724353dc435f4601be43f363a5 Mon Sep 17 00:00:00 2001 From: mb-wali Date: Fri, 27 May 2022 11:04:03 +0200 Subject: [PATCH 2/4] fix: pydocstyle --- invenio_accounts/views/security.py | 14 ++++++++++---- invenio_accounts/views/settings.py | 14 ++++++++++---- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/invenio_accounts/views/security.py b/invenio_accounts/views/security.py index 675d6858..23d8d4a0 100644 --- a/invenio_accounts/views/security.py +++ b/invenio_accounts/views/security.py @@ -27,11 +27,17 @@ @login_required @register_menu( - blueprint, 'settings.security', + blueprint, + 'settings.security', # NOTE: Menu item text (icon replaced by a user icon). - _('%(icon)s Security', icon=make_lazy_string( - lambda: '')), - order=2) + _( + '%(icon)s Security', + icon=make_lazy_string( + lambda: '' + ), + ), + order=2, +) @register_breadcrumb(blueprint, 'breadcrumbs.settings.security', _('Security')) def security(): """View for security page.""" diff --git a/invenio_accounts/views/settings.py b/invenio_accounts/views/settings.py index ef5a1363..4c32f8a4 100644 --- a/invenio_accounts/views/settings.py +++ b/invenio_accounts/views/settings.py @@ -56,15 +56,21 @@ def init_menu(): # - Change password if current_app.config.get('SECURITY_CHANGEABLE', True): view_name = '{}.change_password'.format( - current_app.config['SECURITY_BLUEPRINT_NAME']) + current_app.config['SECURITY_BLUEPRINT_NAME'] + ) item = current_menu.submenu('settings.change_password') item.register( view_name, # NOTE: Menu item text (icon replaced by a key icon). - _('%(icon)s Change password', - icon=''), - order=1) + _( + '%(icon)s Change password', + icon=( + '' + ), + ), + order=1, + ) # Breadcrumb for change password # From f24cfe069997f19028ac91db89e174942303c34a Mon Sep 17 00:00:00 2001 From: mojib Date: Fri, 3 Jun 2022 09:04:43 +0200 Subject: [PATCH 3/4] i18n: adds german translations --- .../translations/de/LC_MESSAGES/messages.po | 65 +++++++++++-------- 1 file changed, 37 insertions(+), 28 deletions(-) diff --git a/invenio_accounts/translations/de/LC_MESSAGES/messages.po b/invenio_accounts/translations/de/LC_MESSAGES/messages.po index ebc1661e..80dda669 100644 --- a/invenio_accounts/translations/de/LC_MESSAGES/messages.po +++ b/invenio_accounts/translations/de/LC_MESSAGES/messages.po @@ -6,47 +6,48 @@ # # Translators: # Lars Holm Nielsen , 2016 -# chriz_uniba , 2022 +# Tibor Simko , 2020 # Alizee Pace , 2022 -# Tibor Simko , 2022 # Mojib Wali , 2022 +# chriz_uniba , 2022 # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: invenio-accounts 2.0.0.dev0\n" +"Project-Id-Version: invenio-accounts 2.0.0\n" "Report-Msgid-Bugs-To: info@inveniosoftware.org\n" -"POT-Creation-Date: 2022-02-15 13:22+0100\n" +"POT-Creation-Date: 2022-05-25 10:35+0200\n" "PO-Revision-Date: 2016-08-18 08:29+0000\n" -"Last-Translator: Mojib Wali , 2022\n" +"Last-Translator: chriz_uniba , 2022\n" "Language-Team: German (https://www.transifex.com/inveniosoftware/teams/23537/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.9.1\n" +"Generated-By: Babel 2.10.1\n" "Language: de\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: invenio_accounts/admin.py:77 msgid "Inactivate" -msgstr "Deaktivieren" +msgstr "Inaktivieren" #: invenio_accounts/admin.py:78 msgid "Are you sure you want to inactivate selected users?" msgstr "" -"Sind Sie sicher, dass Sie die ausgewählten Benutzer deaktivieren möchten?" +"Sind Sie sicher, dass Sie die ausgewählten BenutzerInnen inaktivieren " +"möchten?" #: invenio_accounts/admin.py:87 invenio_accounts/admin.py:110 msgid "Cannot find user." -msgstr "Benutzer nicht gefunden." +msgstr "BenutzerIn nicht gefunden." #: invenio_accounts/admin.py:91 invenio_accounts/admin.py:114 msgid "User(s) were successfully inactivated." -msgstr "Ausgewählte Benutzer erfolgreich deaktiviert." +msgstr "Ausgewählte BenutzerInnen erfolgreich inaktiviert." #: invenio_accounts/admin.py:97 msgid "Failed to inactivate users." -msgstr "Deaktiverung von Benutzern fehlgeschlagen." +msgstr "Inaktiverung von BenutzerInnen fehlgeschlagen." #: invenio_accounts/admin.py:100 msgid "Activate" @@ -55,11 +56,11 @@ msgstr "Aktivieren" #: invenio_accounts/admin.py:101 msgid "Are you sure you want to activate selected users?" msgstr "" -"Sind Sie sicher, dass Sie die ausgewählten Benutzer aktivieren möchten?" +"Sind Sie sicher, dass Sie die ausgewählten BenutzerInnen aktivieren möchten?" #: invenio_accounts/admin.py:120 msgid "Failed to activate users." -msgstr "Aktivierung von Benutzern fehlgeschlagen." +msgstr "Aktivierung von BenutzerInnen fehlgeschlagen." #: invenio_accounts/admin.py:226 msgid "Email" @@ -67,12 +68,12 @@ msgstr "E-Mail" #: invenio_accounts/admin.py:227 msgid "User ID" -msgstr "Benutzer ID" +msgstr "BenutzerIn-ID" #: invenio_accounts/admin.py:234 invenio_accounts/admin.py:240 #: invenio_accounts/admin.py:246 invenio_accounts/admin.py:252 msgid "User Management" -msgstr "Benutzerverwaltung" +msgstr "BenutzerInverwaltung" #: invenio_accounts/admin.py:253 msgid "Linked account identities" @@ -82,6 +83,14 @@ msgstr "Verknüpfte Konto-Identitäten" msgid "Please complete the reCAPTCHA." msgstr "Bearbeiten Sie bitte das reCAPTCHA." +#: invenio_accounts/utils.py:209 +msgid "ACCOUNTS_USERNAME_RULES_TEXT" +msgstr "ACCOUNTS_USERNAME_RULES_TEXT" + +#: invenio_accounts/profiles/schemas.py:20 +msgid "Value must be either 'public' or 'restricted'." +msgstr "Wert muss entweder \"öffentlich\" oder \"eingeschränkt\" sein." + #: invenio_accounts/templates/invenio_accounts/change_password.html:13 #: invenio_accounts/templates/semantic-ui/invenio_accounts/change_password.html:13 #: invenio_accounts/views/settings.py:78 @@ -171,12 +180,12 @@ msgstr "Neu bei %(sitename)s?" #: invenio_accounts/templates/invenio_accounts/login_user.html:45 #: invenio_accounts/templates/semantic-ui/invenio_accounts/login_user.html:54 msgid "Forgot password?" -msgstr "Haben Sie Ihr Passwort vergessen?" +msgstr "Passwort vergessen?" #: invenio_accounts/templates/invenio_accounts/register_user.html:18 #, python-format msgid "Sign up for a %(sitename)s account!" -msgstr "Melden Sie sich für ein %(sitename)s Konto an!" +msgstr "Erstellen Sie sich ein %(sitename)s-Konto!" #: invenio_accounts/templates/invenio_accounts/register_user.html:37 #: invenio_accounts/templates/semantic-ui/invenio_accounts/register_user.html:49 @@ -195,7 +204,7 @@ msgid "" "link." msgstr "" "Geben Sie bitte unten Ihre E-Mail-Adresse ein und wir werden Ihnen einen " -"E-Mail-Bestätigungs-Link zusenden." +"E-Mail-Bestätigungslink zusenden." #: invenio_accounts/templates/invenio_accounts/send_confirmation.html:25 #: invenio_accounts/templates/semantic-ui/invenio_accounts/send_confirmation.html:51 @@ -205,36 +214,36 @@ msgstr "Bestätigung senden" #: invenio_accounts/templates/invenio_accounts/settings/security.html:11 #: invenio_accounts/templates/semantic-ui/invenio_accounts/settings/security.html:11 msgid "Sessions" -msgstr "Sessions" +msgstr "Sitzungen" #: invenio_accounts/templates/invenio_accounts/settings/security.html:16 -#: invenio_accounts/templates/semantic-ui/invenio_accounts/settings/security.html:53 +#: invenio_accounts/templates/semantic-ui/invenio_accounts/settings/security.html:54 msgid "Revoke" msgstr "Widerrufen" #: invenio_accounts/templates/invenio_accounts/settings/security.html:20 -#: invenio_accounts/templates/semantic-ui/invenio_accounts/settings/security.html:15 +#: invenio_accounts/templates/semantic-ui/invenio_accounts/settings/security.html:16 msgid "This is a list of devices that have logged into your account." msgstr "" "Dies ist eine Liste der Geräte, die sich mit Ihrem Konto angemeldet haben." #: invenio_accounts/templates/invenio_accounts/settings/security.html:36 -#: invenio_accounts/templates/semantic-ui/invenio_accounts/settings/security.html:33 +#: invenio_accounts/templates/semantic-ui/invenio_accounts/settings/security.html:34 msgid "Signed in" msgstr "Angemeldet" #: invenio_accounts/templates/invenio_accounts/settings/security.html:38 -#: invenio_accounts/templates/semantic-ui/invenio_accounts/settings/security.html:35 +#: invenio_accounts/templates/semantic-ui/invenio_accounts/settings/security.html:36 msgid "current session" -msgstr "Laufende Session" +msgstr "Laufende Sitzung" #: invenio_accounts/templates/invenio_accounts/settings/security.html:46 -#: invenio_accounts/templates/semantic-ui/invenio_accounts/settings/security.html:41 +#: invenio_accounts/templates/semantic-ui/invenio_accounts/settings/security.html:42 msgid "Location" msgstr "Ort" #: invenio_accounts/templates/invenio_accounts/settings/security.html:55 -#: invenio_accounts/templates/semantic-ui/invenio_accounts/settings/security.html:53 +#: invenio_accounts/templates/semantic-ui/invenio_accounts/settings/security.html:54 msgid "Logout" msgstr "Abmelden" @@ -253,7 +262,7 @@ msgstr "klicken Sie hier, um es zurückzusetzen" #: invenio_accounts/templates/semantic-ui/invenio_accounts/register_user.html:20 #, python-format msgid "Sign up for an %(sitename)s account!" -msgstr "Registrieren Sie sich für ein %(sitename)s Konto!" +msgstr "Erstellen Sie sich ein %(sitename)s-Konto!" #. NOTE: Menu item text (icon replaced by a user icon). #: invenio_accounts/views/security.py:32 @@ -261,7 +270,7 @@ msgstr "Registrieren Sie sich für ein %(sitename)s Konto!" msgid "%(icon)s Security" msgstr "%(icon)sSicherheit" -#: invenio_accounts/views/security.py:35 +#: invenio_accounts/views/security.py:36 msgid "Security" msgstr "Sicherheit" From d07656aca8ea4cc0bdcab3ac848fe46634d02726 Mon Sep 17 00:00:00 2001 From: mojib Date: Fri, 3 Jun 2022 10:34:40 +0200 Subject: [PATCH 4/4] pydocstyle: fix --- invenio_accounts/views/security.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/invenio_accounts/views/security.py b/invenio_accounts/views/security.py index 23d8d4a0..4787b3f2 100644 --- a/invenio_accounts/views/security.py +++ b/invenio_accounts/views/security.py @@ -33,7 +33,9 @@ _( '%(icon)s Security', icon=make_lazy_string( - lambda: '' + lambda: + '' ), ), order=2,