From 76a0e43e88c4c43e81d8ef883c8a3483df3109a4 Mon Sep 17 00:00:00 2001 From: Sandro Santilli Date: Sun, 26 Jun 2016 19:51:09 +0200 Subject: [PATCH] Do not assume avatar needs be changed from gravatar.com (#3209) Always send user to settings screen to change avatar. Drops "change_custom_avatar" localized message, keeps "change_avatar" for the generic one. NOTE: only changes the en-US locale, as per https://github.com/gogits/gogs/wiki/Contributing-Code#those-we-do-not-accept NOTE: requires rebuild of bindata.go to fully see effects --- conf/locale/locale_en-US.ini | 3 +-- templates/user/profile.tmpl | 8 ++------ 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/conf/locale/locale_en-US.ini b/conf/locale/locale_en-US.ini index 6bbf1e1839..636a1b28fd 100644 --- a/conf/locale/locale_en-US.ini +++ b/conf/locale/locale_en-US.ini @@ -220,8 +220,7 @@ org_still_own_repo = This organization still has ownership of repositories, you target_branch_not_exist = Target branch does not exist. [user] -change_avatar = Change your avatar at gravatar.com -change_custom_avatar = Change your avatar in settings +change_avatar = Change your avatar join_on = Joined on repositories = Repositories activity = Public Activity diff --git a/templates/user/profile.tmpl b/templates/user/profile.tmpl index c037b0ad13..b2e6814047 100644 --- a/templates/user/profile.tmpl +++ b/templates/user/profile.tmpl @@ -4,12 +4,8 @@
- {{if and (or .Owner.UseCustomAvatar DisableGravatar) (eq .SignedUserName .Owner.Name)}} - - - - {{else if eq .SignedUserName .Owner.Name}} - + {{if eq .SignedUserName .Owner.Name}} + {{else}}