From 53747a58a0998974bf21d5115a0cdc2f321e18b4 Mon Sep 17 00:00:00 2001 From: Giteabot Date: Mon, 26 Jun 2023 05:28:48 -0400 Subject: [PATCH] Clarify the reason why the user can't add a new email if there is a pending activation (#25509) (#25514) Backport #25509 by @wxiaoguang ![image](https://github.com/go-gitea/gitea/assets/2114189/cff20df0-ad0c-4140-b8e2-5782cad8a53a) Co-authored-by: wxiaoguang --- options/locale/locale_en-US.ini | 1 + templates/user/settings/account.tmpl | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index b1603d8cb6..f0f2161559 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -691,6 +691,7 @@ requires_activation = Requires activation primary_email = Make Primary activate_email = Send Activation 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 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? diff --git a/templates/user/settings/account.tmpl b/templates/user/settings/account.tmpl index 97c35fc7dc..01f70e4cc2 100644 --- a/templates/user/settings/account.tmpl +++ b/templates/user/settings/account.tmpl @@ -128,6 +128,10 @@ {{.locale.Tr "settings.add_email"}} + {{/* if ActivationsPending is false, then CanAddEmails must be true, so if CanAddEmails is false, ActivationsPending must be true */}} + {{if not .CanAddEmails}} +
{{.locale.Tr "settings.can_not_add_email_activations_pending"}}
+ {{end}}