Merge remote-tracking branch 'weblate/develop' into develop

[github/Chocobozzz/PeerTube.git] / client / src / app / +my-account / my-account-settings / my-account-change-email / my-account-change-email.component.html

diff --git a/client/src/app/+my-account/my-account-settings/my-account-change-email/my-account-change-email.component.html b/client/src/app/+my-account/my-account-settings/my-account-change-email/my-account-change-email.component.html
index f39f66696c96e7caf274178554613c0dd42b34fa..6d2d7d46e4fab817bd084d2ab8ba29e9c573761e 100644 (file)
--- a/client/src/app/+my-account/my-account-settings/my-account-change-email/my-account-change-email.component.html
+++ b/client/src/app/+my-account/my-account-settings/my-account-change-email/my-account-change-email.component.html
@@ -2,19 +2,19 @@
 <div *ngIf="success" class="alert alert-success">{{ success }}</div>
 
 <div i18n class="current-email">
-  Your current email is <span class="email">{{ user.email }}</span>
+  Your current email is <span class="email">{{ user.email }}</span>.
+  It is never shown to the public.
 </div>
 
 <div i18n class="pending-email" *ngIf="user.pendingEmail">
   <span class="email">{{ user.pendingEmail }}</span> is awaiting email verification
 </div>
 
-<form role="form" class="change-email" (ngSubmit)="changeEmail()" [formGroup]="form">
+<form role="form" class="change-email" (ngSubmit)="changeEmail()" [formGroup]="form" *ngIf="user.pluginAuth === null">
 
   <div class="form-group">
-    <label i18n for="new-email">New email</label>
     <input
-      type="email" id="new-email" i18n-placeholder placeholder="Your new email" class="form-control"
+      type="email" id="new-email" i18n-placeholder placeholder="New email" class="form-control"
       formControlName="new-email" [ngClass]="{ 'input-error': formErrors['new-email'] }"
     >
     <div *ngIf="formErrors['new-email']" class="form-error">
@@ -23,10 +23,11 @@
   </div>
 
   <div class="form-group">
-    <input
-      type="password" id="password" i18n-placeholder placeholder="Your password" autocomplete="off"
-      formControlName="password" [ngClass]="{ 'input-error': formErrors['password'] }" class="form-control"
-    >
+    <my-input-toggle-hidden formControlName="password"
+                            id="password"
+                            i18n-placeholder placeholder="Current password"
+                            [ngClass]="{ 'input-error': formErrors['password'] }"
+                            autocomplete="current-password"></my-input-toggle-hidden>
     <div *ngIf="formErrors['password']" class="form-error">
       {{ formErrors['password'] }}
     </div>