aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerd Katzenbeisser <hakito@users.noreply.github.com>2023-10-25 13:12:36 +0200
committerGitHub <noreply@github.com>2023-10-25 11:12:36 +0000
commit31f8880bc252a25075f8752e2722b316c6e46ec7 (patch)
treed0b0ce02f353c1ad825a0e26c1e921498608716d
parentf39256f035a561fbd10955ac40ef5ad4b794f47d (diff)
downloadgitea-31f8880bc252a25075f8752e2722b316c6e46ec7.tar.gz
gitea-31f8880bc252a25075f8752e2722b316c6e46ec7.zip
Show placeholder email in privacy popup (#27770)
This PR will show the _noreply_ address in the privacy popup _keep_email_private_popup_. I had to look into the source code to figure out which E-Mail Adress I had to use on gitea.com to hide it from public access. According to the contribution guidelines I only updated the en-US translation file. Co-authored-by: Hakito <hakito@git.example.com>
-rw-r--r--options/locale/locale_en-US.ini2
-rw-r--r--templates/user/settings/profile.tmpl2
2 files changed, 2 insertions, 2 deletions
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index b0c21816ae..e3f2fcdd83 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -729,7 +729,7 @@ add_email_success = The new email address has been added.
email_preference_set_success = Email preference has been set successfully.
add_openid_success = The new OpenID address has been added.
keep_email_private = Hide Email Address
-keep_email_private_popup = This will hide your email address from your profile, as well as when you make a pull request or edit a file using the web interface. Pushed commits will not be modified.
+keep_email_private_popup = This will hide your email address from your profile, as well as when you make a pull request or edit a file using the web interface. Pushed commits will not be modified. Use %s in commits to associate them with your account.
openid_desc = OpenID lets you delegate authentication to an external provider.
manage_ssh_keys = Manage SSH Keys
diff --git a/templates/user/settings/profile.tmpl b/templates/user/settings/profile.tmpl
index a508a5e835..1f32aed0e8 100644
--- a/templates/user/settings/profile.tmpl
+++ b/templates/user/settings/profile.tmpl
@@ -73,7 +73,7 @@
<div class="field">
<div class="ui checkbox">
- <label data-tooltip-content="{{ctx.Locale.Tr "settings.keep_email_private_popup"}}"><strong>{{ctx.Locale.Tr "settings.keep_email_private"}}</strong></label>
+ <label data-tooltip-content="{{ctx.Locale.Tr "settings.keep_email_private_popup" .SignedUser.GetPlaceholderEmail}}"><strong>{{ctx.Locale.Tr "settings.keep_email_private"}}</strong></label>
<input name="keep_email_private" type="checkbox" {{if .SignedUser.KeepEmailPrivate}}checked{{end}}>
</div>
</div>