Nulo/forgejo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Clarify the reason why the user can't add a new email if there is a pending activation (#25509) (#25514)

Browse source 
Backport #25509 by @wxiaoguang


![image](https://github.com/go-gitea/gitea/assets/2114189/cff20df0-ad0c-4140-b8e2-5782cad8a53a)

Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
This commit is contained in:
Giteabot 2023-06-26 05:28:48 -04:00 committed by GitHub
parent 00ba826360
commit 53747a58a0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
options/locale/locale_en-US.ini
View file

@ -691,6 +691,7 @@ requires_activation = Requires activation
primary_email = Make Primary primary_email = Make Primary
activate_email = Send Activation activate_email = Send Activation
activations_pending = Activations Pending activations_pending = Activations Pending
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.
delete_email = Remove delete_email = Remove
email_deletion = Remove Email Address email_deletion = Remove Email Address
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? 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
View file

@ -128,6 +128,10 @@
{{.locale.Tr "settings.add_email"}} {{.locale.Tr "settings.add_email"}}
</button> </button>
</form> </form>
{{/* if ActivationsPending is false, then CanAddEmails must be true, so if CanAddEmails is false, ActivationsPending must be true */}}
{{if not .CanAddEmails}}
<div class="ui warning message">{{.locale.Tr "settings.can_not_add_email_activations_pending"}}</div>
{{end}}
</div> </div>
<h4 class="ui top attached error header"> <h4 class="ui top attached error header">