From 99385db0c418fb49838eb1a23f391cf826d99202 Mon Sep 17 00:00:00 2001 From: Unknwon Date: Sun, 7 Aug 2016 11:01:47 -0700 Subject: #3320 code cleanup --- conf/app.ini | 2 ++ conf/locale/locale_en-US.ini | 1 + 2 files changed, 3 insertions(+) (limited to 'conf') diff --git a/conf/app.ini b/conf/app.ini index e46436e65d..ba7c22ec17 100644 --- a/conf/app.ini +++ b/conf/app.ini @@ -229,9 +229,11 @@ AVATAR_UPLOAD_PATH = data/avatars ; Chinese users can choose "duoshuo" ; or a custom avatar source, like: http://cn.gravatar.com/avatar/ GRAVATAR_SOURCE = gravatar +; This value will be forced to be true in offline mode. DISABLE_GRAVATAR = false ; Federated avatar lookup uses DNS to discover avatar associated ; with emails, see http://www.libravatar.org +; This value will be forced to be false in offline mode or Gravatar is disbaled. ENABLE_FEDERATED_AVATAR = false [attachment] diff --git a/conf/locale/locale_en-US.ini b/conf/locale/locale_en-US.ini index 99b5d17363..31d75549a5 100644 --- a/conf/locale/locale_en-US.ini +++ b/conf/locale/locale_en-US.ini @@ -97,6 +97,7 @@ offline_mode_popup = Disable CDN even in production mode, all resource files wil disable_gravatar = Disable Gravatar Service disable_gravatar_popup = Disable Gravatar and custom sources, all avatars are uploaded by users or default. federated_avatar_lookup = Enable Federated Avatars Lookup +federated_avatar_lookup_popup = Enable federated avatars lookup to use federated open source service based on libravatar. disable_registration = Disable Self-registration disable_registration_popup = Disable user self-registration, only admin can create accounts. enable_captcha = Enable Captcha -- cgit v1.2.3