diff options
| -rw-r--r-- | options/locale/locale_en-US.ini | 1 | ||||
| -rw-r--r-- | templates/user/settings/account.tmpl | 4 |
2 files changed, 5 insertions, 0 deletions
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"}} </button> </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> <h4 class="ui top attached error header"> |