loading up the forgejo repo on tangled to test page performance
Clarify the reason why the user can't add a new email if there is a pending activation (#25509)
authored by
wxiaoguang
and committed by
GitHub
d5f00753
457946d5
+5
+1
options/locale/locale_en-US.ini
+1
options/locale/locale_en-US.ini
···
696
696
primary_email = Make Primary
697
697
activate_email = Send Activation
698
698
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.
699
700
delete_email = Remove
700
701
email_deletion = Remove Email Address
701
702
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?
+4
templates/user/settings/account.tmpl
+4
templates/user/settings/account.tmpl
···
128
128
{{.locale.Tr "settings.add_email"}}
129
129
</button>
130
130
</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}}
131
135
</div>
132
136
133
137
<h4 class="ui top attached error header">