Skip to content

Commit d5f0075

Browse files
authored
Clarify the reason why the user can't add a new email if there is a pending activation (#25509)
![image](https://github.com/go-gitea/gitea/assets/2114189/cff20df0-ad0c-4140-b8e2-5782cad8a53a)
1 parent 457946d commit d5f0075

File tree

2 files changed

+5
-0
lines changed

2 files changed

+5
-0
lines changed

options/locale/locale_en-US.ini

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -696,6 +696,7 @@ requires_activation = Requires activation
696696
primary_email = Make Primary
697697
activate_email = Send Activation
698698
activations_pending = Activations Pending
699+
can_not_add_email_activations_pending = There is a pending activation, try again in a few minutes if you want to add a new email.
699700
delete_email = Remove
700701
email_deletion = Remove Email Address
701702
email_deletion_desc = The email address and related information will be removed from your account. Git commits by this email address will remain unchanged. Continue?

templates/user/settings/account.tmpl

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,10 @@
128128
{{.locale.Tr "settings.add_email"}}
129129
</button>
130130
</form>
131+
{{/* if ActivationsPending is false, then CanAddEmails must be true, so if CanAddEmails is false, ActivationsPending must be true */}}
132+
{{if not .CanAddEmails}}
133+
<div class="ui warning message">{{.locale.Tr "settings.can_not_add_email_activations_pending"}}</div>
134+
{{end}}
131135
</div>
132136

133137
<h4 class="ui top attached error header">

0 commit comments

Comments
 (0)