diff options
| author | derSuessmann <derSuessmann@users.noreply.github.com> | 2017-01-08 04:12:03 +0100 |
|---|---|---|
| committer | Lunny Xiao <xiaolunwen@gmail.com> | 2017-01-08 11:12:03 +0800 |
| commit | 51d578ff3321e173b0dae4c80d3031fb0492656d (patch) | |
| tree | 8297ce73af221f98bff148c1d7cfa7c82a0580a6 /options/locale | |
| parent | 6072b032918006824f260e79f96372dd94fbb17f (diff) | |
| download | gitea-51d578ff3321e173b0dae4c80d3031fb0492656d.tar.gz gitea-51d578ff3321e173b0dae4c80d3031fb0492656d.zip | |
Add Keep email private (see issue #571). (#571)
- Add site-wide option DEFAULT_KEEP_EMAIL_PRIVATE.
- Add the new option to the install and admin/config pages.
- Add the new option to app.ini in the service section.
- Add the new option to the settings struct.
- Add English text strings to i18n.
- Add field KeepEmailPrivate to user struct.
- Add field KeepEmailPrivate to user form.
- Add option to UI.
- Add using noreply email address if user has "Keep Email Private".
An email address <LowerName>@<NO_REPLY_ADDRESS> is now used in commit
messages (and hopefully all other git log relevant places). The
change relies on the fact that git commands should use
user.NetGitSig().
- Add hiding of email address in UI, if user has set "Keep Email Private".
- Add condition to show email address only on explore/users and user
pages, if user has not set "Keep Email Private".
- Add noreply email in API if set "Keep Email Private".
- Add a new service setting NO_REPLY_ADDRESS. The value of this
setting is used as the domain part for the user's email address in
git log, iff he decides to keep his email address private.
If the user decides to keep his email address private and this
option is not set 'noreply.example.org' is used, which no MTA
should send email to.
Add NO_REPLY_ADDRESS to conf/app.ini.
Diffstat (limited to 'options/locale')
| -rw-r--r-- | options/locale/locale_en-US.ini | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index bcb9df8717..21bc1d5c77 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -124,6 +124,10 @@ save_config_failed = Fail to save configuration: %v invalid_admin_setting = Admin account setting is invalid: %v install_success = Welcome! We're glad that you chose Gitea, have fun and take care. invalid_log_root_path = Log root path is invalid: %v +default_keep_email_private = Default Value for Keep Email Private +default_keep_email_private_popup = This is the default value for the visibility of the user's email address. If set to true the email address of all new users will be hidden until the user changes his setting. +no_reply_address = No-reply Address +no_reply_address_helper = Domain for the user's email address in git logs if he keeps his email address private. E.g. user 'joe' and 'noreply.example.org' will be 'joe@noreply.example.org' [home] uname_holder = Username or email @@ -307,6 +311,8 @@ add_new_email = Add new email address add_email = Add email add_email_confirmation_sent = A new confirmation email has been sent to '%s', please check your inbox within the next %d hours to complete the confirmation process. add_email_success = Your new email address was successfully added. +keep_email_private = Keep Email Address Private +keep_email_private_popup = Your email address will be hidden from other users if this option is set. manage_ssh_keys = Manage SSH Keys add_key = Add Key @@ -1112,6 +1118,8 @@ config.disable_key_size_check = Disable Minimum Key Size Check config.enable_captcha = Enable Captcha config.active_code_lives = Active Code Lives config.reset_password_code_lives = Reset Password Code Lives +config.default_keep_email_private = Default Value for Keep Email Private +config.no_reply_address = No-reply Address config.webhook_config = Webhook Configuration config.queue_length = Queue Length |