Modified text in edit account page

Author: Jefferson49

resources/lang/de.mo

@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: OAuth2Client\n"
-"POT-Creation-Date: 2025-01-25 06:32+0100\n"
-"PO-Revision-Date: 2025-01-25 06:33+0100\n"
+"POT-Creation-Date: 2025-01-25 07:24+0100\n"
+"PO-Revision-Date: 2025-01-25 07:26+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: de\n"
@@ -271,30 +271,17 @@ msgid "Signed in with %s"
 msgstr "Angemeldet mit %s"
 
 #: resources/views/edit-account-page.phtml:75
-msgid ""
-"The email address provided from the authorization provider cannot be changed"
-msgstr ""
-"Die vom Autorisierungsanbieter bereitgestellte E-Mail-Adresse kann nicht "
-"geändert werden"
-
-#: resources/views/edit-account-page.phtml:80
 #, php-format
 msgid "This user can sign in with %s"
 msgstr "Dieser Benutzer kann sich mit %s anmelden"
 
-#: resources/views/edit-account-page.phtml:80
-#: resources/views/register-page.phtml:67
+#: resources/views/edit-account-page.phtml:78
 msgid ""
-"The administrator might have disabled to change some of the received user "
-"data"
+"The administrator might have disabled to change the email address or the "
+"password"
 msgstr ""
-"Der Administrator hat möglicherweise die Änderung einiger der empfangenen "
-"Benutzerdaten deaktiviert"
-
-#: resources/views/edit-account-page.phtml:161
-#: resources/views/register-page.phtml:124
-msgid "Password (within webtrees)"
-msgstr "Passwort (innerhalb von webtrees)"
+"Der Administrator hat möglicherweise die Änderung der E-Mail-Adresse oder "
+"des Passworts deaktiviert"
 
 #: resources/views/login-with-provider.phtml:32
 msgid "Request a new user account with"
@@ -348,6 +335,18 @@ msgstr ""
 msgid "Request account with"
 msgstr "Benutzerkonto anfragen mit"
 
+#: resources/views/register-page.phtml:67
+msgid ""
+"The administrator might have disabled to change some of the received user "
+"data"
+msgstr ""
+"Der Administrator hat möglicherweise die Änderung einiger der empfangenen "
+"Benutzerdaten deaktiviert"
+
+#: resources/views/register-page.phtml:124
+msgid "Password (within webtrees)"
+msgstr "Passwort (innerhalb von webtrees)"
+
 #: resources/views/register-page.phtml:141
 msgid "Further registration data - Please complete and continue"
 msgstr "Weitere Registrierungsdaten - Bitte vervollständigen und fortsetzen"
@@ -517,6 +516,13 @@ msgstr ""
 "den Protokollfluss zwischen webtrees und dem Autorisierungsanbieter in den "
 "Website-Logs von webtrees protokolliert."
 
+#~ msgid ""
+#~ "The email address provided from the authorization provider cannot be "
+#~ "changed"
+#~ msgstr ""
+#~ "Die vom Autorisierungsanbieter bereitgestellte E-Mail-Adresse kann nicht "
+#~ "geändert werden"
+
 #~ msgid ""
 #~ "Mandatory user account data from the authorization provider cannot be "
 #~ "changed"

resources/lang/de.po

@@ -68,18 +68,16 @@ $edit_password = (!$is_oauth2_user || boolval($oauth2_client->getPreference(OAut
     <?= $title ?>
 </h2>
 
-<?php if ($is_oauth2_user && $signed_in_with_provider) : ?>
-    <div class="h4">
+<div class="h4">
+    <?php if ($is_oauth2_user && $signed_in_with_provider) : ?>
         <?= I18N::translate('Signed in with %s', $provider->getSignInButtonLabel()) ?>
-        <?php if (!$edit_email) : ?>        
-            <?= ' - ' . I18N::translate('The email address provided from the authorization provider cannot be changed') ?>
-        <?php endif ?>
-    </div>
-<?php elseif ($is_oauth2_user && !$signed_in_with_provider) : ?>
-    <div class="h4">
-        <?= I18N::translate('This user can sign in with %s', $provider->getSignInButtonLabel()) .  ' - ' . I18N::translate('The administrator might have disabled to change some of the received user data') ?>	
-    </div>
-<?php endif ?>
+    <?php elseif ($is_oauth2_user && !$signed_in_with_provider) : ?>
+        <?= I18N::translate('This user can sign in with %s', $provider->getSignInButtonLabel()) ?>	
+    <?php endif ?>
+    <?php if ($is_oauth2_user && (!$edit_email OR !$edit_password)) : ?>
+        <?= ' - ' . I18N::translate('The administrator might have disabled to change the email address or the password') ?>
+    <?php endif ?>
+</div>
 
 <form method="post" class="wt-page-options wt-page-options-my-account">
 
@@ -158,7 +156,7 @@ $edit_password = (!$is_oauth2_user || boolval($oauth2_client->getPreference(OAut
     <div class="row">
         <label class="col-sm-3 col-form-label wt-page-options-label" for="password">
             <?php if ($is_oauth2_user) : ?>
-                <?= I18N::translate('Password (within webtrees)') ?>
+                <?= MoreI18N::xlate('Password') ?>
             <?php else : ?>
                 <?= MoreI18N::xlate('Password') ?>
             <?php endif ?>