diff --git a/resources/lang/de.mo b/resources/lang/de.mo index 93f675a..d0f740f 100644 Binary files a/resources/lang/de.mo and b/resources/lang/de.mo differ diff --git a/resources/lang/de.po b/resources/lang/de.po index 32c2e59..74ffb50 100644 --- a/resources/lang/de.po +++ b/resources/lang/de.po @@ -1,8 +1,8 @@ msgid "" msgstr "" "Project-Id-Version: OAuth2Client\n" -"POT-Creation-Date: 2024-12-31 06:03+0100\n" -"PO-Revision-Date: 2024-12-31 06:05+0100\n" +"POT-Creation-Date: 2024-12-31 09:41+0100\n" +"PO-Revision-Date: 2024-12-31 09:41+0100\n" "Last-Translator: \n" "Language-Team: \n" "Language: de\n" @@ -87,27 +87,26 @@ msgstr "" "Die Länge der/des \"%s\" überschreitet die maximale Länge von %s und wurde " "daher auf %s Zeichen gekürzt." -#: src/OAuth2Client.php:193 +#: src/OAuth2Client.php:194 msgid "OAuth2 Client" msgstr "OAuth2 Client" -#: src/OAuth2Client.php:206 +#: src/OAuth2Client.php:207 msgid "A custom module to implement a OAuth2 client for webtrees." msgstr "" "Ein benutzerspezifisches Modul, welches einen OAuth2 Client für webtrees zur " "Verfügung stellt." -#: src/OAuth2Client.php:388 resources/views/login-with-provider.phtml:26 -#: resources/views/password-request-page.phtml:51 +#: src/OAuth2Client.php:389 resources/views/login-with-provider.phtml:26 msgid "Sign in with" msgstr "Anmelden mit" -#: src/OAuth2Client.php:523 +#: src/OAuth2Client.php:527 #, php-format msgid "The preferences for the module \"%s\" were updated." msgstr "Die Einstellungen für das Modul \"%s\" wurden aktualisiert." -#: src/OAuth2Client.php:550 +#: src/OAuth2Client.php:554 #, php-format msgid "" "The preferences for the custom module \"%s\" were sucessfully updated to the " @@ -116,7 +115,7 @@ msgstr "" "Die Einstellungen für das benutzerdefinierte Modul \"%s\" wurden für die " "neue Modul-Version %s aktualisiert." -#: src/OAuth2Client.php:582 +#: src/OAuth2Client.php:586 #, php-format msgid "" "The custom module \"%s\" is activated in parallel to the %s custom module. " @@ -130,7 +129,7 @@ msgstr "" "deaktivieren, weil die identische Funktion ebenfalls im Modul %s integriert " "ist." -#: src/OAuth2Client.php:587 +#: src/OAuth2Client.php:591 #, php-format msgid "" "The custom module \"%s\" is activated in parallel to the %s custom module. " @@ -143,7 +142,7 @@ msgstr "" "beide Module die gleiche Custom View \"%s\" registriert haben. Es wird " "dringend empfohlen eines der beiden Module zu deaktivieren." -#: src/OAuth2Client.php:611 +#: src/OAuth2Client.php:615 #, php-format msgid "" "The custom module view \"%s\" is not registered as replacement for the " @@ -221,20 +220,7 @@ msgstr "" msgid "Custom module" msgstr "Benutzerdefiniertes Modul" -#: resources/views/edit-account-page.phtml:42 -#: resources/views/password-reset-page.phtml:31 -msgid "" -"An inconsistency regarding the user credentials was detected: The requested " -"user usually logs in with an authorization provider, but no provider name is " -"available. Please sign out and sign in with valid user credentials." -msgstr "" -"Es wurde eine Inkonsistenz bei den Benutzeranmeldeinformationen " -"festgestellt: Der angeforderte Benutzer meldet sich normalerweise mit einem " -"Autorisierungsanbieter an; es ist jedoch kein Anbietername verfügbar. Bitte " -"melden Sie sich ab und mit gültigen Benutzeranmeldeinformationen erneut an." - -#: resources/views/edit-account-page.phtml:46 -#: resources/views/password-reset-page.phtml:35 +#: resources/views/edit-account-page.phtml:49 #, php-format msgid "" "The authorization provider \"%s\" is not available. Please check the " @@ -243,57 +229,77 @@ msgstr "" "Der Authorisierungsanbieter \"%s\" ist nicht verfügbar. Bitte prüfen Sie " "die Konfiguration in der folgenden Datei: data/config.ini.php" -#: resources/views/edit-account-page.phtml:67 -msgid "Signed in with" -msgstr "Angemeldet mit" +#: resources/views/edit-account-page.phtml:70 +#, php-format +msgid "Signed in with %s" +msgstr "Angemeldet mit %s" -#: resources/views/edit-account-page.phtml:67 +#: resources/views/edit-account-page.phtml:70 +#: resources/views/edit-account-page.phtml:74 msgid "" "Mandatory user account data from the authorization provider cannot be changed" msgstr "" "Obligatorische Benutzer-Daten vom Autorisierungsanbieter können nicht " "geändert werden" +#: resources/views/edit-account-page.phtml:74 +#, php-format +msgid "This user can sign in with %s" +msgstr "Dieser Benutzer kann sich mit %s anmelden" + +#: resources/views/password-request-page.phtml:51 +msgid "Sign in with an authorization provider" +msgstr "Anmelden mit einem Autorisierungsanbieter" + #: resources/views/password-request-page.phtml:54 msgid "" -"If you sign in with an authorization provider, your password cannot be " -"changed within webtrees. If you request a new password from webtrees, you " -"will receive an email. However, the included link to create a new passwort " -"will not work." +"In this view, you can only request a webtrees password. The authorization " +"provider password is managed by the authorization provider and cannot be " +"changed within webtrees." msgstr "" -"Wenn Sie sich mit einem Autorisierungsanbieter anmelden, kann Ihr Passwort " -"nicht innerhalb von webtrees geändert werden. Wenn Sie ein neues Passwort " -"von webtrees anfordern, erhalten Sie zwar ein Email. Allerdings wird der " -"enthaltene Link zur Erzeugung eines neuen Passworts nicht funktionieren." +"In dieser Ansicht können Sie nur ein webtrees-Passwort anfordern. Das " +"Autorisierungsanbieter-Passwort wird vom Autorisierungsanbieter verwaltet " +"und kann innerhalb von webtrees nicht geändert werden." -#: resources/views/password-reset-page.phtml:50 -#, php-format +#: resources/views/password-reset-page.phtml:37 msgid "" -"The request to reset the passwort belongs to a user, who signs in with %s. " -"The password is managed by the authorization provider (%s) and cannot be " -"changed within webtrees." +"The request to reset the passwort belongs to a user, who can sign in with an " +"authorization provider. In this view, you can only change the webtrees " +"password. The authorization provider password is managed by the " +"authorization provider and cannot be changed within webtrees." +msgstr "" +"Die Anfrage zum Zurücksetzen des Passworts gehört zu einem Benutzer, der " +"sich mit einem Autorisierungsanbieter anmelden kann. In dieser Ansicht " +"können Sie nur das webtrees-Passwort ändern. Das Autorisierungsanbieter-" +"Passwort wird vom Autorisierungsanbieter verwaltet und kann nicht innerhalb " +"von webtrees geändert werden." + +#: resources/views/password-reset-page.phtml:79 +msgid "" +"Currently, the webtrees password cannot be reset for users, who sign in with " +"an authorization provider. Please contact the webtrees administrator." msgstr "" -"Die Anfrage zum Rücksetzen des Passworts betrifft einen Benutzer, welcher " -"sich mit %s anmeldet. Das Passwort wird vom Autorisierungsanbieter (%s) " -"verwaltet und kann nicht innerhalb von webtrees geändert werden." +"Derzeit kann das webtrees-Passwort für Benutzer, die sich mit einem " +"Autorisierungsanbieter anmelden, nicht zurückgesetzt werden. Bitte wenden " +"Sie sich an den webtrees-Administrator." -#: resources/views/register-page.phtml:64 +#: resources/views/register-page.phtml:70 msgid "Register with" msgstr "Registrierung mit" -#: resources/views/register-page.phtml:64 +#: resources/views/register-page.phtml:70 msgid "User account data from authorization provider cannot be changed" msgstr "Benutzer-Daten vom Autorisierungsanbieter können nicht geändert werden" -#: resources/views/register-page.phtml:133 +#: resources/views/register-page.phtml:145 msgid "Further registration data - Please complete and continue" msgstr "Weitere Registrierungsdaten - Bitte vervollständigen und fortsetzen" -#: resources/views/settings.phtml:28 +#: resources/views/settings.phtml:29 msgid "Control panel" msgstr "Verwaltung" -#: resources/views/settings.phtml:36 +#: resources/views/settings.phtml:37 msgid "" "Currently, webtrees does not use the HTTPS protocol. If signing in with " "authorization providers, it is urgently recommended to use HTTPS in order to " @@ -309,11 +315,11 @@ msgstr "" "in der webtrees-Datei \"config.ini.php\" aktiviert werden. Aktuell startet " "\"base_url\" nicht mit \"https://\"." -#: resources/views/settings.phtml:53 +#: resources/views/settings.phtml:54 msgid "Settings for Sign In Menus" msgstr "Einstellungen für Anmelde-Menüs" -#: resources/views/settings.phtml:58 +#: resources/views/settings.phtml:59 msgid "" "Currently, all sign in menus are deactivated/hidden. Please activate one of " "the sign in menus with the settings below. Hint: You can still access the " @@ -325,7 +331,7 @@ msgstr "" "können weiterhin auf die ursprüngliche Anmeldeseite von webtrees zugreifen, " "indem Sie den folgenden Anmeld-Pfad in die Browserzeile eingeben, z. B.:" -#: resources/views/settings.phtml:62 +#: resources/views/settings.phtml:63 msgid "" "Currently, all menus to directly sign in with webtrees are deactivated. " "Therefore, only sign in with authorization providers is possible. Please be " @@ -342,7 +348,7 @@ msgstr "" "original webtrees Anmeldeseite durch Eingabe der Route in der Browserzeile " "aufzurufen, z.B.:" -#: resources/views/settings.phtml:66 +#: resources/views/settings.phtml:67 #, php-format msgid "" "Currently, the webtrees sign in menu is deactivated and the custom module " @@ -355,11 +361,11 @@ msgstr "" "Anwender werden sich nicht anmelden können. Bitte erwägen Sie, eines der " "Anmelde-Menüs mit den untenstehenden Einstellungen zu aktivieren." -#: resources/views/settings.phtml:73 +#: resources/views/settings.phtml:74 msgid "Show a custom module specific sign in menu" msgstr "Ein modulspezifisches Anmelde-Menü anzeigen" -#: resources/views/settings.phtml:78 +#: resources/views/settings.phtml:79 msgid "" "By selecting/unselecting this option, it is possible to show/hide a custom " "module specific sign in menu in the webtrees main menu." @@ -367,11 +373,11 @@ msgstr "" "Durch Auswählen/Abwählen dieser Option ist es möglich, ein modulspezifisches " "Anmelde-Menü im Hauptmenü von webtrees anzuzeigen/auszublenden." -#: resources/views/settings.phtml:87 +#: resources/views/settings.phtml:88 msgid "Show original webtrees sign in as menu item" msgstr "Menü-Eintrag für das ursprüngliche webtrees Anmelde-Menü anzeigen" -#: resources/views/settings.phtml:92 +#: resources/views/settings.phtml:93 msgid "" "By selecting/unselecting this option, it is possible to activate/deactivate " "the sign in menu entry for webtrees. If deactivated, only sign in menu " @@ -382,15 +388,15 @@ msgstr "" "deaktiviert, werden ggfs. nur Menüeinträge für Autorisierungsanbieter " "angezeigt." -#: resources/views/settings.phtml:101 +#: resources/views/settings.phtml:102 msgid "Hide the webtrees sign in menu" msgstr "Das webtrees Anmelde-Menü verbergen" -#: resources/views/settings.phtml:104 +#: resources/views/settings.phtml:105 msgid "Hide" msgstr "Verbergen" -#: resources/views/settings.phtml:106 +#: resources/views/settings.phtml:107 msgid "" "By selecting this option, it is possible to hide the original webtrees sign " "in menu. This might be helpful if the custom module specific top menu for " @@ -400,19 +406,42 @@ msgstr "" "von webtrees auszublenden. Dies kann hilfreich sein, wenn stattdessen das " "modulspezifische Menü für die Anmeldung verwendet wird." -#: resources/views/settings.phtml:113 +#: resources/views/settings.phtml:114 +msgid "Settings for Password Management" +msgstr "Einstellungen für die Passwortverwaltung" + +#: resources/views/settings.phtml:120 +msgid "Use webtrees password in parallel" +msgstr "webtrees-Passwort parallel nutzen" + +#: resources/views/settings.phtml:125 +msgid "" +"If selecting this option, a user who signs in with an authorization provider " +"will be allowed to use a webtrees password in parallel. This might allow the " +"user to sign into webtrees if the authorization provider is not available. " +"However, there is a risk that the user might get confused about the parallel " +"password management at the provider and in webtrees." +msgstr "" +"Wenn Sie diese Option auswählen, kann ein Benutzer, der sich mit einem " +"Autorisierungsanbieter anmeldet, parallel ein webtrees-Passwort verwenden. " +"Dies könnte dem Benutzer ermöglichen, sich bei webtrees anzumelden, wenn der " +"Autorisierungsanbieter nicht verfügbar ist. Es besteht jedoch das Risiko, " +"dass der Benutzer durch die parallele Passwortverwaltung beim " +"Autorisierungsanbieter und in webtrees verwirrt wird." + +#: resources/views/settings.phtml:132 msgid "Settings for Debugging" msgstr "Einstellungen für das Debuggen" -#: resources/views/settings.phtml:119 +#: resources/views/settings.phtml:138 msgid "Debugging" msgstr "Debugging" -#: resources/views/settings.phtml:122 +#: resources/views/settings.phtml:141 msgid "Activate debug logs" msgstr "Debug-Log-Einträge aktivieren" -#: resources/views/settings.phtml:124 +#: resources/views/settings.phtml:143 msgid "" "By selecting this option, additional debug information about the protocol " "flow between webtrees and the authorization provider will be logged in the " @@ -422,6 +451,30 @@ msgstr "" "den Protokollfluss zwischen webtrees und dem Autorisierungsanbieter in den " "Website-Logs von webtrees protokolliert." +#~ msgid "" +#~ "An inconsistency regarding the user credentials was detected: The " +#~ "requested user usually logs in with an authorization provider, but no " +#~ "provider name is available. Please sign out and sign in with valid user " +#~ "credentials." +#~ msgstr "" +#~ "Es wurde eine Inkonsistenz bei den Benutzeranmeldeinformationen " +#~ "festgestellt: Der angeforderte Benutzer meldet sich normalerweise mit " +#~ "einem Autorisierungsanbieter an; es ist jedoch kein Anbietername " +#~ "verfügbar. Bitte melden Sie sich ab und mit gültigen " +#~ "Benutzeranmeldeinformationen erneut an." + +#~ msgid "" +#~ "If you sign in with an authorization provider, your password cannot be " +#~ "changed within webtrees. If you request a new password from webtrees, you " +#~ "will receive an email. However, the included link to create a new " +#~ "passwort will not work." +#~ msgstr "" +#~ "Wenn Sie sich mit einem Autorisierungsanbieter anmelden, kann Ihr " +#~ "Passwort nicht innerhalb von webtrees geändert werden. Wenn Sie ein neues " +#~ "Passwort von webtrees anfordern, erhalten Sie zwar ein Email. Allerdings " +#~ "wird der enthaltene Link zur Erzeugung eines neuen Passworts nicht " +#~ "funktionieren." + #~ msgid "Sign in with:" #~ msgstr "Anmelden mit:" @@ -1309,9 +1362,6 @@ msgstr "" #~ msgid "GEDCOM Filter Data Fix" #~ msgstr "GEDCOM-Filter Datenkorrekturen" -#~ msgid "Settings for Tree and File Name" -#~ msgstr "Einstellungen für den Stammbaum und Dateinamen" - #~ msgid "" #~ "Select the default tree. This tree will be chosen if no specific tree is " #~ "provided as URL parameter." diff --git a/resources/lang/en-AU.mo b/resources/lang/en-AU.mo index 4c467fe..ff0c56a 100644 Binary files a/resources/lang/en-AU.mo and b/resources/lang/en-AU.mo differ diff --git a/resources/lang/en-AU.po b/resources/lang/en-AU.po index 77301fd..3fc2f1f 100644 --- a/resources/lang/en-AU.po +++ b/resources/lang/en-AU.po @@ -1,8 +1,8 @@ msgid "" msgstr "" "Project-Id-Version: OAuth2Client\n" -"POT-Creation-Date: 2024-12-31 06:05+0100\n" -"PO-Revision-Date: 2024-12-31 06:06+0100\n" +"POT-Creation-Date: 2024-12-31 09:41+0100\n" +"PO-Revision-Date: 2024-12-31 09:41+0100\n" "Last-Translator: Rick Malkin \n" "Language-Team: \n" "Language: en_AU\n" @@ -82,32 +82,31 @@ msgid "" "to %s characters." msgstr "" -#: src/OAuth2Client.php:193 +#: src/OAuth2Client.php:194 msgid "OAuth2 Client" msgstr "" -#: src/OAuth2Client.php:206 +#: src/OAuth2Client.php:207 msgid "A custom module to implement a OAuth2 client for webtrees." msgstr "A custom module to implement a OAuth2 client for WebTrees." -#: src/OAuth2Client.php:388 resources/views/login-with-provider.phtml:26 -#: resources/views/password-request-page.phtml:51 +#: src/OAuth2Client.php:389 resources/views/login-with-provider.phtml:26 msgid "Sign in with" msgstr "" -#: src/OAuth2Client.php:523 +#: src/OAuth2Client.php:527 #, php-format msgid "The preferences for the module \"%s\" were updated." msgstr "" -#: src/OAuth2Client.php:550 +#: src/OAuth2Client.php:554 #, php-format msgid "" "The preferences for the custom module \"%s\" were sucessfully updated to the " "new module version %s." msgstr "" -#: src/OAuth2Client.php:582 +#: src/OAuth2Client.php:586 #, php-format msgid "" "The custom module \"%s\" is activated in parallel to the %s custom module. " @@ -116,7 +115,7 @@ msgid "" "functionality is also integrated in the %s module." msgstr "" -#: src/OAuth2Client.php:587 +#: src/OAuth2Client.php:591 #, php-format msgid "" "The custom module \"%s\" is activated in parallel to the %s custom module. " @@ -125,7 +124,7 @@ msgid "" "deactivate one of the modules." msgstr "" -#: src/OAuth2Client.php:611 +#: src/OAuth2Client.php:615 #, php-format msgid "" "The custom module view \"%s\" is not registered as replacement for the " @@ -199,16 +198,7 @@ msgstr "" msgid "Custom module" msgstr "" -#: resources/views/edit-account-page.phtml:42 -#: resources/views/password-reset-page.phtml:31 -msgid "" -"An inconsistency regarding the user credentials was detected: The requested " -"user usually logs in with an authorization provider, but no provider name is " -"available. Please sign out and sign in with valid user credentials." -msgstr "" - -#: resources/views/edit-account-page.phtml:46 -#: resources/views/password-reset-page.phtml:35 +#: resources/views/edit-account-page.phtml:49 #, php-format msgid "" "The authorization provider \"%s\" is not available. Please check the " @@ -217,56 +207,73 @@ msgstr "" "The authorisation provider \"%s\" is not available. Please check the " "configuration in the following file: data/config.ini.php" -#: resources/views/edit-account-page.phtml:67 -msgid "Signed in with" -msgstr "" +#: resources/views/edit-account-page.phtml:70 +#, fuzzy, php-format +#| msgid "Signed in in with" +msgid "Signed in with %s" +msgstr "Signed in with" -#: resources/views/edit-account-page.phtml:67 +#: resources/views/edit-account-page.phtml:70 +#: resources/views/edit-account-page.phtml:74 msgid "" "Mandatory user account data from the authorization provider cannot be changed" msgstr "" "Mandatory user account data from the authorisation provider cannot be changed" +#: resources/views/edit-account-page.phtml:74 +#, php-format +msgid "This user can sign in with %s" +msgstr "" + +#: resources/views/password-request-page.phtml:51 +msgid "Sign in with an authorization provider" +msgstr "Sign in with an authorisation provider" + #: resources/views/password-request-page.phtml:54 msgid "" -"If you sign in with an authorization provider, your password cannot be " -"changed within webtrees. If you request a new password from webtrees, you " -"will receive an email. However, the included link to create a new passwort " -"will not work." +"In this view, you can only request a webtrees password. The authorization " +"provider password is managed by the authorization provider and cannot be " +"changed within webtrees." msgstr "" -"If you sign in with an authorisation provider, your password cannot be " -"changed within WebTrees. If you request a new password from WebTrees, you " -"will receive an email. However, the included link to create a new passwort " -"will not work." +"In this view, you can only request a webtrees password. The authorisation " +"provider password is managed by the authorisation provider and cannot be " +"changed within webtrees." -#: resources/views/password-reset-page.phtml:50 -#, php-format +#: resources/views/password-reset-page.phtml:37 msgid "" -"The request to reset the passwort belongs to a user, who signs in with %s. " -"The password is managed by the authorization provider (%s) and cannot be " -"changed within webtrees." +"The request to reset the passwort belongs to a user, who can sign in with an " +"authorization provider. In this view, you can only change the webtrees " +"password. The authorization provider password is managed by the " +"authorization provider and cannot be changed within webtrees." msgstr "" -"The request to reset the passwort belongs to a user, who signs in with %s. " -"The password is managed by the authorisation provider (%s) and cannot be " -"changed within WebTrees." +"The request to reset the passwort belongs to a user, who can sign in with an " +"authorisation provider. In this view, you can only change the webtrees " +"password. The authorisation provider password is managed by the " +"authorisation provider and cannot be changed within webtrees." -#: resources/views/register-page.phtml:64 +#: resources/views/password-reset-page.phtml:79 +msgid "" +"Currently, the webtrees password cannot be reset for users, who sign in with " +"an authorization provider. Please contact the webtrees administrator." +msgstr "" + +#: resources/views/register-page.phtml:70 msgid "Register with" msgstr "" -#: resources/views/register-page.phtml:64 +#: resources/views/register-page.phtml:70 msgid "User account data from authorization provider cannot be changed" msgstr "User account data from authorisation provider cannot be changed" -#: resources/views/register-page.phtml:133 +#: resources/views/register-page.phtml:145 msgid "Further registration data - Please complete and continue" msgstr "" -#: resources/views/settings.phtml:28 +#: resources/views/settings.phtml:29 msgid "Control panel" msgstr "" -#: resources/views/settings.phtml:36 +#: resources/views/settings.phtml:37 msgid "" "Currently, webtrees does not use the HTTPS protocol. If signing in with " "authorization providers, it is urgently recommended to use HTTPS in order to " @@ -282,11 +289,11 @@ msgstr "" "the WebTrees \"config.ini.php\" file. Currently, \"base_url\" does not start " "with \"https://\"." -#: resources/views/settings.phtml:53 +#: resources/views/settings.phtml:54 msgid "Settings for Sign In Menus" msgstr "" -#: resources/views/settings.phtml:58 +#: resources/views/settings.phtml:59 msgid "" "Currently, all sign in menus are deactivated/hidden. Please activate one of " "the sign in menus with the settings below. Hint: You can still access the " @@ -294,7 +301,7 @@ msgid "" "line, e.g.:" msgstr "" -#: resources/views/settings.phtml:62 +#: resources/views/settings.phtml:63 msgid "" "Currently, all menus to directly sign in with webtrees are deactivated. " "Therefore, only sign in with authorization providers is possible. Please be " @@ -310,7 +317,7 @@ msgstr "" "more. Hint: You can still access the original WebTrees login page by typing " "the login route into the browser line, e.g.:" -#: resources/views/settings.phtml:66 +#: resources/views/settings.phtml:67 #, php-format msgid "" "Currently, the webtrees sign in menu is deactivated and the custom module " @@ -319,21 +326,21 @@ msgid "" "with the settings below." msgstr "" -#: resources/views/settings.phtml:73 +#: resources/views/settings.phtml:74 msgid "Show a custom module specific sign in menu" msgstr "" -#: resources/views/settings.phtml:78 +#: resources/views/settings.phtml:79 msgid "" "By selecting/unselecting this option, it is possible to show/hide a custom " "module specific sign in menu in the webtrees main menu." msgstr "" -#: resources/views/settings.phtml:87 +#: resources/views/settings.phtml:88 msgid "Show original webtrees sign in as menu item" msgstr "Show a custom module specific sign in menu" -#: resources/views/settings.phtml:92 +#: resources/views/settings.phtml:93 msgid "" "By selecting/unselecting this option, it is possible to activate/deactivate " "the sign in menu entry for webtrees. If deactivated, only sign in menu " @@ -343,15 +350,15 @@ msgstr "" "the sign in menu entry for WebTrees. If deactivated, only sign in menu " "entries for authorisation providers might be shown." -#: resources/views/settings.phtml:101 +#: resources/views/settings.phtml:102 msgid "Hide the webtrees sign in menu" msgstr "Hide the WebTrees sign in menu" -#: resources/views/settings.phtml:104 +#: resources/views/settings.phtml:105 msgid "Hide" msgstr "" -#: resources/views/settings.phtml:106 +#: resources/views/settings.phtml:107 msgid "" "By selecting this option, it is possible to hide the original webtrees sign " "in menu. This might be helpful if the custom module specific top menu for " @@ -361,19 +368,36 @@ msgstr "" "in menu. This might be helpful if the custom module specific top menu for " "sign in is used instead." -#: resources/views/settings.phtml:113 +#: resources/views/settings.phtml:114 +msgid "Settings for Password Management" +msgstr "" + +#: resources/views/settings.phtml:120 +msgid "Use webtrees password in parallel" +msgstr "" + +#: resources/views/settings.phtml:125 +msgid "" +"If selecting this option, a user who signs in with an authorization provider " +"will be allowed to use a webtrees password in parallel. This might allow the " +"user to sign into webtrees if the authorization provider is not available. " +"However, there is a risk that the user might get confused about the parallel " +"password management at the provider and in webtrees." +msgstr "" + +#: resources/views/settings.phtml:132 msgid "Settings for Debugging" msgstr "" -#: resources/views/settings.phtml:119 +#: resources/views/settings.phtml:138 msgid "Debugging" msgstr "" -#: resources/views/settings.phtml:122 +#: resources/views/settings.phtml:141 msgid "Activate debug logs" msgstr "" -#: resources/views/settings.phtml:124 +#: resources/views/settings.phtml:143 msgid "" "By selecting this option, additional debug information about the protocol " "flow between webtrees and the authorization provider will be logged in the " @@ -383,10 +407,16 @@ msgstr "" "flow between webtrees and the authorisation provider will be logged in the " "webtrees website logs." -#, fuzzy -#~| msgid "Signed in in with" -#~ msgid "Sign in with:" -#~ msgstr "Signed in with" +#~ msgid "" +#~ "If you sign in with an authorization provider, your password cannot be " +#~ "changed within webtrees. If you request a new password from webtrees, you " +#~ "will receive an email. However, the included link to create a new " +#~ "passwort will not work." +#~ msgstr "" +#~ "If you sign in with an authorisation provider, your password cannot be " +#~ "changed within WebTrees. If you request a new password from WebTrees, you " +#~ "will receive an email. However, the included link to create a new " +#~ "passwort will not work." #~ msgid "Sign out" #~ msgstr "Sign out" @@ -1222,9 +1252,6 @@ msgstr "" #~ msgid "GEDCOM Filter Data Fix" #~ msgstr "GEDCOM Filter Data Fix" -#~ msgid "Settings for Tree and File Name" -#~ msgstr "Settings for Tree and File Name" - #~ msgid "" #~ "Select the default tree. This tree will be chosen if no specific tree is " #~ "provided as URL parameter." diff --git a/resources/lang/en-GB.mo b/resources/lang/en-GB.mo index 9449079..d48bda1 100644 Binary files a/resources/lang/en-GB.mo and b/resources/lang/en-GB.mo differ diff --git a/resources/lang/en-GB.po b/resources/lang/en-GB.po index f493913..cd2f586 100644 --- a/resources/lang/en-GB.po +++ b/resources/lang/en-GB.po @@ -1,8 +1,8 @@ msgid "" msgstr "" "Project-Id-Version: OAuth2Client\n" -"POT-Creation-Date: 2024-12-31 06:06+0100\n" -"PO-Revision-Date: 2024-12-31 06:07+0100\n" +"POT-Creation-Date: 2024-12-31 09:41+0100\n" +"PO-Revision-Date: 2024-12-31 09:42+0100\n" "Last-Translator: Rick Malkin \n" "Language-Team: \n" "Language: en_GB\n" @@ -82,32 +82,31 @@ msgid "" "to %s characters." msgstr "" -#: src/OAuth2Client.php:193 +#: src/OAuth2Client.php:194 msgid "OAuth2 Client" msgstr "" -#: src/OAuth2Client.php:206 +#: src/OAuth2Client.php:207 msgid "A custom module to implement a OAuth2 client for webtrees." msgstr "A custom module to implement a OAuth2 client for WebTrees." -#: src/OAuth2Client.php:388 resources/views/login-with-provider.phtml:26 -#: resources/views/password-request-page.phtml:51 +#: src/OAuth2Client.php:389 resources/views/login-with-provider.phtml:26 msgid "Sign in with" msgstr "" -#: src/OAuth2Client.php:523 +#: src/OAuth2Client.php:527 #, php-format msgid "The preferences for the module \"%s\" were updated." msgstr "" -#: src/OAuth2Client.php:550 +#: src/OAuth2Client.php:554 #, php-format msgid "" "The preferences for the custom module \"%s\" were sucessfully updated to the " "new module version %s." msgstr "" -#: src/OAuth2Client.php:582 +#: src/OAuth2Client.php:586 #, php-format msgid "" "The custom module \"%s\" is activated in parallel to the %s custom module. " @@ -116,7 +115,7 @@ msgid "" "functionality is also integrated in the %s module." msgstr "" -#: src/OAuth2Client.php:587 +#: src/OAuth2Client.php:591 #, php-format msgid "" "The custom module \"%s\" is activated in parallel to the %s custom module. " @@ -125,7 +124,7 @@ msgid "" "deactivate one of the modules." msgstr "" -#: src/OAuth2Client.php:611 +#: src/OAuth2Client.php:615 #, php-format msgid "" "The custom module view \"%s\" is not registered as replacement for the " @@ -199,16 +198,7 @@ msgstr "" msgid "Custom module" msgstr "" -#: resources/views/edit-account-page.phtml:42 -#: resources/views/password-reset-page.phtml:31 -msgid "" -"An inconsistency regarding the user credentials was detected: The requested " -"user usually logs in with an authorization provider, but no provider name is " -"available. Please sign out and sign in with valid user credentials." -msgstr "" - -#: resources/views/edit-account-page.phtml:46 -#: resources/views/password-reset-page.phtml:35 +#: resources/views/edit-account-page.phtml:49 #, php-format msgid "" "The authorization provider \"%s\" is not available. Please check the " @@ -217,56 +207,73 @@ msgstr "" "The authorisation provider \"%s\" is not available. Please check the " "configuration in the following file: data/config.ini.php" -#: resources/views/edit-account-page.phtml:67 -msgid "Signed in with" -msgstr "" +#: resources/views/edit-account-page.phtml:70 +#, fuzzy, php-format +#| msgid "Signed in in with" +msgid "Signed in with %s" +msgstr "Signed in with" -#: resources/views/edit-account-page.phtml:67 +#: resources/views/edit-account-page.phtml:70 +#: resources/views/edit-account-page.phtml:74 msgid "" "Mandatory user account data from the authorization provider cannot be changed" msgstr "" "Mandatory user account data from the authorisation provider cannot be changed" +#: resources/views/edit-account-page.phtml:74 +#, php-format +msgid "This user can sign in with %s" +msgstr "" + +#: resources/views/password-request-page.phtml:51 +msgid "Sign in with an authorization provider" +msgstr "Sign in with an authorisation provider" + #: resources/views/password-request-page.phtml:54 msgid "" -"If you sign in with an authorization provider, your password cannot be " -"changed within webtrees. If you request a new password from webtrees, you " -"will receive an email. However, the included link to create a new passwort " -"will not work." +"In this view, you can only request a webtrees password. The authorization " +"provider password is managed by the authorization provider and cannot be " +"changed within webtrees." msgstr "" -"If you sign in with an authorisation provider, your password cannot be " -"changed within WebTrees. If you request a new password from WebTrees, you " -"will receive an email. However, the included link to create a new passwort " -"will not work." +"In this view, you can only request a webtrees password. The authorisation " +"provider password is managed by the authorisation provider and cannot be " +"changed within webtrees." -#: resources/views/password-reset-page.phtml:50 -#, php-format +#: resources/views/password-reset-page.phtml:37 msgid "" -"The request to reset the passwort belongs to a user, who signs in with %s. " -"The password is managed by the authorization provider (%s) and cannot be " -"changed within webtrees." +"The request to reset the passwort belongs to a user, who can sign in with an " +"authorization provider. In this view, you can only change the webtrees " +"password. The authorization provider password is managed by the " +"authorization provider and cannot be changed within webtrees." msgstr "" -"The request to reset the passwort belongs to a user, who signs in with %s. " -"The password is managed by the authorisation provider (%s) and cannot be " -"changed within WebTrees." +"The request to reset the passwort belongs to a user, who can sign in with an " +"authorisation provider. In this view, you can only change the webtrees " +"password. The authorisation provider password is managed by the " +"authorisation provider and cannot be changed within webtrees." -#: resources/views/register-page.phtml:64 +#: resources/views/password-reset-page.phtml:79 +msgid "" +"Currently, the webtrees password cannot be reset for users, who sign in with " +"an authorization provider. Please contact the webtrees administrator." +msgstr "" + +#: resources/views/register-page.phtml:70 msgid "Register with" msgstr "" -#: resources/views/register-page.phtml:64 +#: resources/views/register-page.phtml:70 msgid "User account data from authorization provider cannot be changed" msgstr "User account data from authorisation provider cannot be changed" -#: resources/views/register-page.phtml:133 +#: resources/views/register-page.phtml:145 msgid "Further registration data - Please complete and continue" msgstr "" -#: resources/views/settings.phtml:28 +#: resources/views/settings.phtml:29 msgid "Control panel" msgstr "" -#: resources/views/settings.phtml:36 +#: resources/views/settings.phtml:37 msgid "" "Currently, webtrees does not use the HTTPS protocol. If signing in with " "authorization providers, it is urgently recommended to use HTTPS in order to " @@ -282,11 +289,11 @@ msgstr "" "the WebTrees \"config.ini.php\" file. Currently, \"base_url\" does not start " "with \"https://\"." -#: resources/views/settings.phtml:53 +#: resources/views/settings.phtml:54 msgid "Settings for Sign In Menus" msgstr "" -#: resources/views/settings.phtml:58 +#: resources/views/settings.phtml:59 msgid "" "Currently, all sign in menus are deactivated/hidden. Please activate one of " "the sign in menus with the settings below. Hint: You can still access the " @@ -294,7 +301,7 @@ msgid "" "line, e.g.:" msgstr "" -#: resources/views/settings.phtml:62 +#: resources/views/settings.phtml:63 msgid "" "Currently, all menus to directly sign in with webtrees are deactivated. " "Therefore, only sign in with authorization providers is possible. Please be " @@ -310,7 +317,7 @@ msgstr "" "more. Hint: You can still access the original WebTrees login page by typing " "the login route into the browser line, e.g.:" -#: resources/views/settings.phtml:66 +#: resources/views/settings.phtml:67 #, php-format msgid "" "Currently, the webtrees sign in menu is deactivated and the custom module " @@ -319,21 +326,21 @@ msgid "" "with the settings below." msgstr "" -#: resources/views/settings.phtml:73 +#: resources/views/settings.phtml:74 msgid "Show a custom module specific sign in menu" msgstr "" -#: resources/views/settings.phtml:78 +#: resources/views/settings.phtml:79 msgid "" "By selecting/unselecting this option, it is possible to show/hide a custom " "module specific sign in menu in the webtrees main menu." msgstr "" -#: resources/views/settings.phtml:87 +#: resources/views/settings.phtml:88 msgid "Show original webtrees sign in as menu item" msgstr "" -#: resources/views/settings.phtml:92 +#: resources/views/settings.phtml:93 msgid "" "By selecting/unselecting this option, it is possible to activate/deactivate " "the sign in menu entry for webtrees. If deactivated, only sign in menu " @@ -343,15 +350,15 @@ msgstr "" "the sign in menu entry for WebTrees. If deactivated, only sign in menu " "entries for authorisation providers might be shown." -#: resources/views/settings.phtml:101 +#: resources/views/settings.phtml:102 msgid "Hide the webtrees sign in menu" msgstr "Hide the WebTrees sign in menu" -#: resources/views/settings.phtml:104 +#: resources/views/settings.phtml:105 msgid "Hide" msgstr "" -#: resources/views/settings.phtml:106 +#: resources/views/settings.phtml:107 msgid "" "By selecting this option, it is possible to hide the original webtrees sign " "in menu. This might be helpful if the custom module specific top menu for " @@ -361,19 +368,36 @@ msgstr "" "in menu. This might be helpful if the custom module specific top menu for " "sign in is used instead." -#: resources/views/settings.phtml:113 +#: resources/views/settings.phtml:114 +msgid "Settings for Password Management" +msgstr "" + +#: resources/views/settings.phtml:120 +msgid "Use webtrees password in parallel" +msgstr "" + +#: resources/views/settings.phtml:125 +msgid "" +"If selecting this option, a user who signs in with an authorization provider " +"will be allowed to use a webtrees password in parallel. This might allow the " +"user to sign into webtrees if the authorization provider is not available. " +"However, there is a risk that the user might get confused about the parallel " +"password management at the provider and in webtrees." +msgstr "" + +#: resources/views/settings.phtml:132 msgid "Settings for Debugging" msgstr "" -#: resources/views/settings.phtml:119 +#: resources/views/settings.phtml:138 msgid "Debugging" msgstr "" -#: resources/views/settings.phtml:122 +#: resources/views/settings.phtml:141 msgid "Activate debug logs" msgstr "" -#: resources/views/settings.phtml:124 +#: resources/views/settings.phtml:143 msgid "" "By selecting this option, additional debug information about the protocol " "flow between webtrees and the authorization provider will be logged in the " @@ -383,12 +407,20 @@ msgstr "" "flow between webtrees and the authorisation provider will be logged in the " "webtrees website logs." +#~ msgid "" +#~ "If you sign in with an authorization provider, your password cannot be " +#~ "changed within webtrees. If you request a new password from webtrees, you " +#~ "will receive an email. However, the included link to create a new " +#~ "passwort will not work." +#~ msgstr "" +#~ "If you sign in with an authorisation provider, your password cannot be " +#~ "changed within WebTrees. If you request a new password from WebTrees, you " +#~ "will receive an email. However, the included link to create a new " +#~ "passwort will not work." + #~ msgid "Sign out" #~ msgstr "Sign out" -#~ msgid "Signed in in with" -#~ msgstr "Signed in with" - #~ msgid "sign in" #~ msgstr "Sign In" @@ -1220,9 +1252,6 @@ msgstr "" #~ msgid "GEDCOM Filter Data Fix" #~ msgstr "GEDCOM Filter Data Fix" -#~ msgid "Settings for Tree and File Name" -#~ msgstr "Settings for Tree and File Name" - #~ msgid "" #~ "Select the default tree. This tree will be chosen if no specific tree is " #~ "provided as URL parameter." diff --git a/resources/views/edit-account-page.phtml b/resources/views/edit-account-page.phtml index ee15b00..84baa95 100644 --- a/resources/views/edit-account-page.phtml +++ b/resources/views/edit-account-page.phtml @@ -9,6 +9,7 @@ use Fisharebest\Webtrees\FlashMessages; use Fisharebest\Webtrees\Http\RequestHandlers\AccountDelete; use Fisharebest\Webtrees\I18N; use Fisharebest\Webtrees\Individual; +use Fisharebest\Webtrees\Services\ModuleService; use Fisharebest\Webtrees\Session; use Fisharebest\Webtrees\Tree; use Jefferson49\Webtrees\Internationalization\MoreI18N; @@ -30,19 +31,21 @@ use Jefferson49\Webtrees\Module\OAuth2Client\Provider\AbstractAuthorizationProvi $edit_user_name = true; $edit_real_name = true; - $edit_email = true; + $edit_email = true; + +//Check whether webtress password is used in parallel and can be edited +$module_service = new ModuleService(); +$oauth2_client = $module_service->findByName(OAuth2Client::activeModuleName()); +$edit_password = boolval($oauth2_client->getPreference(OAuth2Client::PREF_USE_WEBTREES_PASSWORD, '0')); //Check whether the user is logged in with an OAuth2 provider -$is_oauth2_user = $user->getPreference(OAuth2Client::USER_PREF_PROVIDER_NAME, '') !== ''; +$provider_name = $user->getPreference(OAuth2Client::USER_PREF_PROVIDER_NAME, ''); +$is_oauth2_user = $provider_name !== ''; +$signed_in_with_provider = $provider_name === Session::get(OAuth2Client::activeModuleName() . 'provider_name', ''); if ($is_oauth2_user) { - $provider_name = Session::get(OAuth2Client::activeModuleName() . 'provider_name', ''); - if ($provider_name === '') { - FlashMessages::addMessage(I18N::translate('An inconsistency regarding the user credentials was detected: The requested user usually logs in with an authorization provider, but no provider name is available. Please sign out and sign in with valid user credentials.'), 'danger'); - return; - } - elseif (!AuthorizationProviderFactory::isValidProvider($provider_name)) { + if (!AuthorizationProviderFactory::isValidProvider($provider_name)) { FlashMessages::addMessage(I18N::translate('The authorization provider "%s" is not available. Please check the configuration in the following file: data/config.ini.php', $provider_name), 'danger'); return; } @@ -62,9 +65,13 @@ if ($is_oauth2_user) { - +
- getSignInButtonLabel() . ' - ' . I18N::translate('Mandatory user account data from the authorization provider cannot be changed') ?> + getSignInButtonLabel()) . ' - ' . I18N::translate('Mandatory user account data from the authorization provider cannot be changed') ?> +
+ +
+ getSignInButtonLabel()) . ' - ' . I18N::translate('Mandatory user account data from the authorization provider cannot be changed') ?>
@@ -81,7 +88,9 @@ if ($is_oauth2_user) { - + + +
@@ -142,10 +151,14 @@ if ($is_oauth2_user) {
- > + >

diff --git a/resources/views/password-request-page.phtml b/resources/views/password-request-page.phtml index 743c2f4..4c82b64 100644 --- a/resources/views/password-request-page.phtml +++ b/resources/views/password-request-page.phtml @@ -48,10 +48,10 @@ $provider_names = AuthorizationProviderFactory::getAuthorizatonProviderNames(); 0) : ?>
- +
diff --git a/resources/views/password-reset-page.phtml b/resources/views/password-reset-page.phtml index 2225ff4..c3566ce 100644 --- a/resources/views/password-reset-page.phtml +++ b/resources/views/password-reset-page.phtml @@ -5,13 +5,11 @@ declare(strict_types=1); namespace Jefferson49\Webtrees\Module\OAuth2Client; use Fisharebest\Webtrees\Http\RequestHandlers\PasswordResetAction; -use Fisharebest\Webtrees\FlashMessages; use Fisharebest\Webtrees\I18N; -use Fisharebest\Webtrees\Session; +use Fisharebest\Webtrees\Services\ModuleService; use Fisharebest\Webtrees\Tree; use Fisharebest\Webtrees\User; use Jefferson49\Webtrees\Internationalization\MoreI18N; -use Jefferson49\Webtrees\Module\OAuth2Client\Factories\AuthorizationProviderFactory; use Jefferson49\Webtrees\Module\OAuth2Client\OAuth2Client; /** @@ -21,24 +19,13 @@ use Jefferson49\Webtrees\Module\OAuth2Client\OAuth2Client; * @var User $user */ -//Check whether the user is logged in with an OAuth2 provider +//Check whether the user can sign in with an OAuth2 provider $is_oauth2_user = $user->getPreference(OAuth2Client::USER_PREF_PROVIDER_NAME, '') !== ''; -if ($is_oauth2_user) { - $provider_name = Session::get(OAuth2Client::activeModuleName() . 'provider_name', ''); - - if ($provider_name === '') { - FlashMessages::addMessage(I18N::translate('An inconsistency regarding the user credentials was detected: The requested user usually logs in with an authorization provider, but no provider name is available. Please sign out and sign in with valid user credentials.'), 'danger'); - return; - } - elseif (!AuthorizationProviderFactory::isValidProvider($provider_name)) { - FlashMessages::addMessage(I18N::translate('The authorization provider "%s" is not available. Please check the configuration in the following file: data/config.ini.php', $provider_name), 'danger'); - return; - } - - $provider_label = (new AuthorizationProviderFactory())::make($provider_name, '')->getSignInButtonLabel(); -} - +//Check whether webtress password is used in parallel and can be edited +$module_service = new ModuleService(); +$oauth2_client = $module_service->findByName(OAuth2Client::activeModuleName()); +$edit_password = !$is_oauth2_user OR boolval($oauth2_client->getPreference(OAuth2Client::PREF_USE_WEBTREES_PASSWORD, '0')); ?>

@@ -47,9 +34,11 @@ if ($is_oauth2_user) {
- +
- + + + - +
@@ -160,7 +172,7 @@ if ($provider_authorization) { - + $tree]) ?> diff --git a/resources/views/settings.phtml b/resources/views/settings.phtml index 93c6461..255c21b 100644 --- a/resources/views/settings.phtml +++ b/resources/views/settings.phtml @@ -18,6 +18,7 @@ use Jefferson49\Webtrees\Module\OAuth2Client\OAuth2Client; * @var bool $show_webtrees_in_login_menu * @var bool $dont_show_webtrees_login_menu * @var bool $debugging_activated + * @var bool $use_webtrees_password */ $uses_https = strpos(Strtoupper($base_url), 'HTTPS://') === false ? false : true; @@ -109,6 +110,24 @@ $redirect_url = OAuth2Client::getRedirectUrl();
+
+ +
+ +
+
+ + + +
+ MoreI18N::xlate('Allow'), 'name' => OAuth2Client::PREF_USE_WEBTREES_PASSWORD, 'checked' => $use_webtrees_password]) ?> +
+ +
+
+
+
+
diff --git a/src/OAuth2Client.php b/src/OAuth2Client.php index 3f21b2f..fb2c460 100644 --- a/src/OAuth2Client.php +++ b/src/OAuth2Client.php @@ -124,6 +124,7 @@ class OAuth2Client extends AbstractModule implements public const PREF_SHOW_WEBTREES_IN_LOGIN_MENU = 'show_webtrees_in_login_menu'; public const PREF_DONT_SHOW_WEBTREES_LOGIN_MENU = 'dont_show_webtrees_login_menu'; public const PREF_DEBUGGING_ACTIVATED = 'debugging_activated'; + public const PREF_USE_WEBTREES_PASSWORD = 'use_webtrees_password'; //User preferences public const USER_PREF_PROVIDER_NAME = 'provider_name'; @@ -492,6 +493,7 @@ public function getAdminAction(ServerRequestInterface $request): ResponseInterfa self::PREF_SHOW_WEBTREES_IN_LOGIN_MENU => boolval($this->getPreference(self::PREF_SHOW_WEBTREES_IN_LOGIN_MENU, '1')), self::PREF_DONT_SHOW_WEBTREES_LOGIN_MENU => boolval($this->getPreference(self::PREF_DONT_SHOW_WEBTREES_LOGIN_MENU, '0')), self::PREF_DEBUGGING_ACTIVATED => boolval($this->getPreference(self::PREF_DEBUGGING_ACTIVATED, '0')), + self::PREF_USE_WEBTREES_PASSWORD => boolval($this->getPreference(self::PREF_USE_WEBTREES_PASSWORD, '0')), ] ); } @@ -510,6 +512,7 @@ public function postAdminAction(ServerRequestInterface $request): ResponseInterf $show_webtrees_in_login_menu = Validator::parsedBody($request)->boolean(self::PREF_SHOW_WEBTREES_IN_LOGIN_MENU, false); $dont_show_webtrees_login_menu = Validator::parsedBody($request)->boolean(self::PREF_DONT_SHOW_WEBTREES_LOGIN_MENU, false); $debugging_activated = Validator::parsedBody($request)->boolean(self::PREF_DEBUGGING_ACTIVATED, false); + $use_webtrees_password = Validator::parsedBody($request)->boolean(self::PREF_USE_WEBTREES_PASSWORD, false); //Save the received settings to the user preferences if ($save === '1') { @@ -517,6 +520,7 @@ public function postAdminAction(ServerRequestInterface $request): ResponseInterf $this->setPreference(self::PREF_SHOW_WEBTREES_IN_LOGIN_MENU, $show_webtrees_in_login_menu ? '1' : '0'); $this->setPreference(self::PREF_DONT_SHOW_WEBTREES_LOGIN_MENU, $dont_show_webtrees_login_menu ? '1' : '0'); $this->setPreference(self::PREF_DEBUGGING_ACTIVATED, $debugging_activated ? '1' : '0'); + $this->setPreference(self::PREF_USE_WEBTREES_PASSWORD, $use_webtrees_password ? '1' : '0'); } //Finally, show a success message