Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 2 commits into from
Jun 26, 2023
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
209ae60
Clarify the reason why the user can't add a new email if there is a p…
wxiaoguang Jun 26, 2023
e31fb28
Merge branch 'release/v1.20' into backport-25509-v1.20
GiteaBot Jun 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions options/locale/locale_en-US.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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?
Expand Down
4 changes: 4 additions & 0 deletions templates/user/settings/account.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down