Merge pull request #5972 from emanuelschuetze/translations20210319

Updated translations

client/src/app/core/translate/marked-translations.ts

@@ -431,8 +431,10 @@ _(
 
 // users misc
 _('Username or password is not correct.');
-_('Please login via your identity provider');
+_('Please login via your identity provider.');
+_('Your account is not active.');
 _('You are not authenticated.');
+_('Cookies have to be enabled to use OpenSlides.');
 _('Guest');
 _('Participant');
 _('No users with email {0} found.');

client/src/assets/i18n/de.po

@@ -785,6 +785,9 @@ msgstr "Alle Nutzer automatisch mit der Livekonferenz verbinden"
 msgid "Content"
 msgstr "Inhalt"
 
+msgid "Cookies have to be enabled to use OpenSlides."
+msgstr "Cookies müssen aktiviert sein, um OpenSlides verwenden zu können."
+
 msgid "Copy and paste your participant names in this textbox."
 msgstr "Kopieren Sie die Name Ihrer Teilnehmer*innen in diese Textbox."
 
@@ -1651,6 +1654,9 @@ msgstr "Teilnehmendenliste (PDF)"
 msgid "List of speakers"
 msgstr "Redeliste"
 
+msgid "List of speakers is initially closed"
+msgstr "Redelisten sind zunächst geschlossen"
+
 msgid "List of speakers overlay"
 msgstr "Redelisten-Einblendung"
 
@@ -2267,8 +2273,8 @@ msgstr "Bitte geben Sie eine gültige E-Mail-Adresse ein!"
 msgid "Please enter your new password"
 msgstr "Bitte geben Sie Ihr neues Passwort ein"
 
-msgid "Please login via your identity provider"
+msgid "Please login via your identity provider."
-msgstr "Bitte melden Sie sich über Ihren Identity Provider an"
+msgstr "Bitte melden Sie sich über Ihren Identity Provider an."
 
 msgid "Please select the directory:"
 msgstr "Bitte wählen Sie das Verzeichnis aus:"
@@ -3484,6 +3490,9 @@ msgstr ""
 "Sie haben die maximale Anzahl von Stimmen erreicht. Deselektieren Sie zuerst"
 " eine Auswahl."
 
+msgid "Your account is not active."
+msgstr "Ihr Nutzerkonto ist nicht aktiv."
+
 msgid "Your browser"
 msgstr "Ihr Browser"
 

client/src/assets/i18n/template-en.pot

@@ -738,6 +738,9 @@ msgstr ""
 msgid "Content"
 msgstr ""
 
+msgid "Cookies have to be enabled to use OpenSlides."
+msgstr ""
+
 msgid "Copy and paste your participant names in this textbox."
 msgstr ""
 
@@ -1562,6 +1565,9 @@ msgstr ""
 msgid "List of speakers"
 msgstr ""
 
+msgid "List of speakers is initially closed"
+msgstr ""
+
 msgid "List of speakers overlay"
 msgstr ""
 
@@ -2163,7 +2169,7 @@ msgstr ""
 msgid "Please enter your new password"
 msgstr ""
 
-msgid "Please login via your identity provider"
+msgid "Please login via your identity provider."
 msgstr ""
 
 msgid "Please select the directory:"
@@ -3294,6 +3300,9 @@ msgstr ""
 msgid "You reached the maximum amount of votes. Deselect somebody first."
 msgstr ""
 
+msgid "Your account is not active."
+msgstr ""
+
 msgid "Your browser"
 msgstr ""
 

server/openslides/users/views.py

@@ -895,7 +895,7 @@ class UserLoginView(WhoAmIDataView):
         if user is None:
             raise ValidationError({"detail": "Username or password is not correct."})
         elif not user.is_active:
-            raise ValidationError({"detail": "You are not active."})
+            raise ValidationError({"detail": "Your account is not active."})
         elif user.auth_type != "default":
             raise ValidationError(
                 {"detail": "Please login via your identity provider."}

server/tests/integration/users/test_views.py

@@ -137,7 +137,7 @@ class TestUserLoginView(TestCase):
         )
         self.assertEqual(response.status_code, 400)
         content = json.loads(response.content.decode())
-        self.assertEqual(content.get("detail"), "You are not active.")
+        self.assertEqual(content.get("detail"), "Your account is not active.")
 
     def test_user_wrong_auth_type(self):
         admin = User.objects.get()