Skip to content

Commit e3a1f56

Browse files
committed
Updated text if login denied for existing email
1 parent b0e5d00 commit e3a1f56

File tree

3 files changed

+19
-12
lines changed

3 files changed

+19
-12
lines changed

resources/lang/de.mo

-171 Bytes
Binary file not shown.

resources/lang/de.po

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
msgid ""
22
msgstr ""
33
"Project-Id-Version: OAuth2Client\n"
4-
"POT-Creation-Date: 2025-01-27 18:21+0100\n"
5-
"PO-Revision-Date: 2025-01-27 18:28+0100\n"
4+
"POT-Creation-Date: 2025-01-27 19:04+0100\n"
5+
"PO-Revision-Date: 2025-01-27 19:05+0100\n"
66
"Last-Translator: \n"
77
"Language-Team: \n"
88
"Language: de\n"
@@ -73,7 +73,7 @@ msgstr ""
7373
"Fehler beim Empfang des Zugriffs-Tokens oder der Benutzer-Daten vom "
7474
"Autorisierungsanbieter"
7575

76-
#: src/LoginWithAuthorizationProviderAction.php:271
76+
#: src/LoginWithAuthorizationProviderAction.php:274
7777
msgid ""
7878
"The identity received by the authorization provider cannot be connected to "
7979
"the requested user, because it is already used to sign in by another "
@@ -83,7 +83,7 @@ msgstr ""
8383
"angeforderten Benutzer verknüpft werden, da sie bereits von einem anderen "
8484
"webtrees-Benutzer für die Anmeldung verwendet wird."
8585

86-
#: src/LoginWithAuthorizationProviderAction.php:282
86+
#: src/LoginWithAuthorizationProviderAction.php:285
8787
#, php-format
8888
msgid "Sucessfully connected existing user %s with provider: %s"
8989
msgstr ""
@@ -106,6 +106,7 @@ msgstr "Es ist nicht möglich, ein webtrees-Konto mit %s anzufordern."
106106
#: src/LoginWithAuthorizationProviderAction.php:304
107107
#: src/LoginWithAuthorizationProviderAction.php:311
108108
#: src/LoginWithAuthorizationProviderAction.php:323
109+
#: src/LoginWithAuthorizationProviderAction.php:424
109110
#, php-format
110111
msgid ""
111112
"To connect an existing user with %s, sign in and select: My pages / My "
@@ -120,7 +121,7 @@ msgid "Invalid user data received from %s. Email or username missing."
120121
msgstr ""
121122
"Ungültige Benutzerdaten von %s empfangen. E-Mail oder Benutzername fehlt."
122123

123-
#: src/LoginWithAuthorizationProviderAction.php:317
124+
#: src/LoginWithAuthorizationProviderAction.php:318
124125
msgid "Requesting a new webtrees user account is currently not allowed."
125126
msgstr ""
126127
"Das Anfordern eines neuen webtrees-Benutzerkontos ist derzeit nicht erlaubt."
@@ -143,13 +144,10 @@ msgid "The email address for user %s was updated to: %s"
143144
msgstr "Die Email-Adresse für Benutzer %s wurde aktualisiert zu: %s"
144145

145146
#: src/LoginWithAuthorizationProviderAction.php:423
146-
msgid ""
147-
"Login denied. The email address or username already exists. To connect an "
148-
"existing user, select: My pages / My account / Connect with"
147+
msgid "Login denied. The email address or username already exists."
149148
msgstr ""
150-
"Anmeldung verweigert. Die E-Mail-Adresse oder der Benutzername existiert "
151-
"bereits. Um einen bestehenden Benutzer zu verbinden, wählen Sie: Meine "
152-
"Seiten / Mein Konto / Verknüpfen mit"
149+
"Anmeldung verweigert. Die E-Mail-Adresse oder der Benutzername ist bereits "
150+
"vorhanden."
153151

154152
#: src/OAuth2Client.php:223
155153
msgid "OAuth2 Client"
@@ -538,6 +536,14 @@ msgstr ""
538536
"den Protokollfluss zwischen webtrees und dem Autorisierungsanbieter in den "
539537
"Website-Logs von webtrees protokolliert."
540538

539+
#~ msgid ""
540+
#~ "Login denied. The email address or username already exists. To connect an "
541+
#~ "existing user, select: My pages / My account / Connect with"
542+
#~ msgstr ""
543+
#~ "Anmeldung verweigert. Die E-Mail-Adresse oder der Benutzername existiert "
544+
#~ "bereits. Um einen bestehenden Benutzer zu verbinden, wählen Sie: Meine "
545+
#~ "Seiten / Mein Konto / Verknüpfen mit"
546+
541547
#~ msgid ""
542548
#~ "If you already have a webtrees user account, you might want to \"quit\" "
543549
#~ "and choose to connect the existing webtrees account with the "

src/LoginWithAuthorizationProviderAction.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -420,7 +420,8 @@ private function doLogin(string $email, string $provider_name, string $authoriza
420420
//If time stamp is different from 0 (i.e. user already logged in at least once before)
421421
if ($user->getPreference(UserInterface::PREF_TIMESTAMP_ACTIVE) !== '0') {
422422
Log::addAuthenticationLog($oauth_log_prefix . ': ' . 'Login denied. The email address or username already exists: ' . $provider_name . ' ' . $authorization_provider_id);
423-
throw new Exception(I18N::translate('Login denied. The email address or username already exists. To connect an existing user, select: My pages / My account / Connect with'));
423+
throw new Exception(I18N::translate('Login denied. The email address or username already exists.') . ' ' .
424+
I18N::translate('To connect an existing user with %s, sign in and select: My pages / My account / Connect with', $provider_name));
424425
}
425426
}
426427

0 commit comments

Comments
 (0)