diff options
38 files changed, 42 insertions, 1 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index e126a9633..f31bd2d23 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -670,7 +670,7 @@ module ApplicationHelper # +user+ can be a User or a string that will be scanned for an email address (eg. 'joe <joe@foo.bar>') def avatar(user, options = { }) if Setting.gravatar_enabled? - options.merge!({:ssl => Setting.protocol == 'https'}) + options.merge!({:ssl => Setting.protocol == 'https', :default => Setting.gravatar_default}) email = nil if user.respond_to?(:mail) email = user.mail diff --git a/app/views/settings/_display.rhtml b/app/views/settings/_display.rhtml index 984f762e4..351760fa1 100644 --- a/app/views/settings/_display.rhtml +++ b/app/views/settings/_display.rhtml @@ -20,6 +20,10 @@ <%= hidden_field_tag 'settings[gravatar_enabled]', 0 %> <%= check_box_tag 'settings[gravatar_enabled]', 1, Setting.gravatar_enabled? %> </p> + +<p><label><%= l(:setting_gravatar_default) %></label> +<%= select_tag 'settings[gravatar_default]', options_for_select([[l(:label_none), ''], ["Wavatars", 'wavatar'], ["Identicons", 'identicon'], ["Monster ids", 'monsterid']], Setting.gravatar_default) %></p> +</p> </div> <%= submit_tag l(:button_save) %> diff --git a/config/locales/bg.yml b/config/locales/bg.yml index bd0243a54..e091f8575 100644 --- a/config/locales/bg.yml +++ b/config/locales/bg.yml @@ -834,3 +834,4 @@ bg: label_user_anonymous: Anonymous button_move_and_follow: Move and follow setting_default_projects_modules: Default enabled modules for new projects + setting_gravatar_default: Default Gravatar image diff --git a/config/locales/bs.yml b/config/locales/bs.yml index b2d29ddf0..d6b15903e 100644 --- a/config/locales/bs.yml +++ b/config/locales/bs.yml @@ -858,3 +858,4 @@ bs: label_user_anonymous: Anonymous button_move_and_follow: Move and follow setting_default_projects_modules: Default enabled modules for new projects + setting_gravatar_default: Default Gravatar image diff --git a/config/locales/ca.yml b/config/locales/ca.yml index 12a212001..6aacce6d4 100644 --- a/config/locales/ca.yml +++ b/config/locales/ca.yml @@ -837,3 +837,4 @@ ca: label_user_anonymous: Anonymous button_move_and_follow: Move and follow setting_default_projects_modules: Default enabled modules for new projects + setting_gravatar_default: Default Gravatar image diff --git a/config/locales/cs.yml b/config/locales/cs.yml index af8b16eb2..943fb6928 100644 --- a/config/locales/cs.yml +++ b/config/locales/cs.yml @@ -840,3 +840,4 @@ cs: label_user_anonymous: Anonymous button_move_and_follow: Move and follow setting_default_projects_modules: Default enabled modules for new projects + setting_gravatar_default: Default Gravatar image diff --git a/config/locales/da.yml b/config/locales/da.yml index 4028ad2d5..33acc4582 100644 --- a/config/locales/da.yml +++ b/config/locales/da.yml @@ -860,3 +860,4 @@ da: label_user_anonymous: Anonymous button_move_and_follow: Move and follow setting_default_projects_modules: Default enabled modules for new projects + setting_gravatar_default: Default Gravatar image diff --git a/config/locales/de.yml b/config/locales/de.yml index dfe22ae88..29273f32e 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -860,3 +860,4 @@ de: label_user_anonymous: Anonymous button_move_and_follow: Move and follow setting_default_projects_modules: Default enabled modules for new projects + setting_gravatar_default: Default Gravatar image diff --git a/config/locales/el.yml b/config/locales/el.yml index ed31de7ba..6907603f6 100644 --- a/config/locales/el.yml +++ b/config/locales/el.yml @@ -840,3 +840,4 @@ el: label_user_anonymous: Anonymous button_move_and_follow: Move and follow setting_default_projects_modules: Default enabled modules for new projects + setting_gravatar_default: Default Gravatar image diff --git a/config/locales/en.yml b/config/locales/en.yml index 0000e427e..85234cbeb 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -306,6 +306,7 @@ en: setting_mail_handler_api_key: API key setting_sequential_project_identifiers: Generate sequential project identifiers setting_gravatar_enabled: Use Gravatar user icons + setting_gravatar_default: Default Gravatar image setting_diff_max_lines_displayed: Max number of diff lines displayed setting_file_max_size_displayed: Max size of text files displayed inline setting_repository_log_display_limit: Maximum number of revisions displayed on file log diff --git a/config/locales/es.yml b/config/locales/es.yml index 2f8a764f1..07bb8800d 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -881,3 +881,4 @@ es: label_user_anonymous: Anonymous button_move_and_follow: Move and follow setting_default_projects_modules: Default enabled modules for new projects + setting_gravatar_default: Default Gravatar image diff --git a/config/locales/fi.yml b/config/locales/fi.yml index 3745f6cfd..4501e63ec 100644 --- a/config/locales/fi.yml +++ b/config/locales/fi.yml @@ -870,3 +870,4 @@ fi: label_user_anonymous: Anonymous button_move_and_follow: Move and follow setting_default_projects_modules: Default enabled modules for new projects + setting_gravatar_default: Default Gravatar image diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 4a32fc373..2e2a69be6 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -863,3 +863,4 @@ fr: text_journal_added: "{{label}} {{value}} ajouté" field_active: Actif enumeration_system_activity: Activité système + setting_gravatar_default: Default Gravatar image diff --git a/config/locales/gl.yml b/config/locales/gl.yml index 99154d397..f2af3ed03 100644 --- a/config/locales/gl.yml +++ b/config/locales/gl.yml @@ -860,3 +860,4 @@ gl: label_user_anonymous: Anonymous button_move_and_follow: Move and follow setting_default_projects_modules: Default enabled modules for new projects + setting_gravatar_default: Default Gravatar image diff --git a/config/locales/he.yml b/config/locales/he.yml index d9096865e..cae31b360 100644 --- a/config/locales/he.yml +++ b/config/locales/he.yml @@ -844,3 +844,4 @@ he: label_user_anonymous: Anonymous button_move_and_follow: Move and follow setting_default_projects_modules: Default enabled modules for new projects + setting_gravatar_default: Default Gravatar image diff --git a/config/locales/hu.yml b/config/locales/hu.yml index c68395616..ef37ef29c 100644 --- a/config/locales/hu.yml +++ b/config/locales/hu.yml @@ -865,3 +865,4 @@ label_user_anonymous: Anonymous button_move_and_follow: Move and follow setting_default_projects_modules: Default enabled modules for new projects + setting_gravatar_default: Default Gravatar image diff --git a/config/locales/it.yml b/config/locales/it.yml index 781ad30e3..9460211b3 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -847,3 +847,4 @@ it: label_user_anonymous: Anonymous button_move_and_follow: Move and follow setting_default_projects_modules: Default enabled modules for new projects + setting_gravatar_default: Default Gravatar image diff --git a/config/locales/ja.yml b/config/locales/ja.yml index 4f9ab13dd..450cff989 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -869,3 +869,4 @@ ja: label_user_anonymous: Anonymous button_move_and_follow: Move and follow setting_default_projects_modules: Default enabled modules for new projects + setting_gravatar_default: Default Gravatar image diff --git a/config/locales/ko.yml b/config/locales/ko.yml index ec2330e42..260d35316 100644 --- a/config/locales/ko.yml +++ b/config/locales/ko.yml @@ -900,3 +900,4 @@ ko: label_user_anonymous: Anonymous button_move_and_follow: Move and follow setting_default_projects_modules: Default enabled modules for new projects + setting_gravatar_default: Default Gravatar image diff --git a/config/locales/lt.yml b/config/locales/lt.yml index 269f73381..5d4ff191b 100644 --- a/config/locales/lt.yml +++ b/config/locales/lt.yml @@ -870,3 +870,4 @@ lt: label_user_anonymous: Anonymous button_move_and_follow: Move and follow setting_default_projects_modules: Default enabled modules for new projects + setting_gravatar_default: Default Gravatar image diff --git a/config/locales/nl.yml b/config/locales/nl.yml index 9ef2162be..f41e42bc8 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -822,3 +822,4 @@ nl: label_user_anonymous: Anonymous button_move_and_follow: Move and follow setting_default_projects_modules: Default enabled modules for new projects + setting_gravatar_default: Default Gravatar image diff --git a/config/locales/no.yml b/config/locales/no.yml index 4c1f326ff..d9f81cfb8 100644 --- a/config/locales/no.yml +++ b/config/locales/no.yml @@ -835,3 +835,4 @@ label_user_anonymous: Anonymous button_move_and_follow: Move and follow setting_default_projects_modules: Default enabled modules for new projects + setting_gravatar_default: Default Gravatar image diff --git a/config/locales/pl.yml b/config/locales/pl.yml index 12649ac39..622789256 100644 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -863,3 +863,4 @@ pl: label_user_anonymous: Anonymous button_move_and_follow: Move and follow setting_default_projects_modules: Default enabled modules for new projects + setting_gravatar_default: Default Gravatar image diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml index 8338afe3e..a70bebfec 100644 --- a/config/locales/pt-BR.yml +++ b/config/locales/pt-BR.yml @@ -866,3 +866,4 @@ pt-BR: label_user_anonymous: Anônimo button_move_and_follow: Mover e seguir setting_default_projects_modules: Módulos habilitados por padrão para novos projetos + setting_gravatar_default: Default Gravatar image diff --git a/config/locales/pt.yml b/config/locales/pt.yml index 3e5bd81a3..3b3f104bc 100644 --- a/config/locales/pt.yml +++ b/config/locales/pt.yml @@ -852,3 +852,4 @@ pt: label_user_anonymous: Anonymous button_move_and_follow: Move and follow setting_default_projects_modules: Default enabled modules for new projects + setting_gravatar_default: Default Gravatar image diff --git a/config/locales/ro.yml b/config/locales/ro.yml index c3d1e116b..19e5a5c49 100644 --- a/config/locales/ro.yml +++ b/config/locales/ro.yml @@ -837,3 +837,4 @@ ro: label_user_anonymous: Anonymous button_move_and_follow: Move and follow setting_default_projects_modules: Default enabled modules for new projects + setting_gravatar_default: Default Gravatar image diff --git a/config/locales/ru.yml b/config/locales/ru.yml index 787af1f38..942f5da09 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -948,3 +948,4 @@ ru: label_user_anonymous: Аноним button_move_and_follow: Переместить и перейти setting_default_projects_modules: Включенные по умолчанию модули для новых проектов + setting_gravatar_default: Default Gravatar image diff --git a/config/locales/sk.yml b/config/locales/sk.yml index cd19e91b0..af8eab184 100644 --- a/config/locales/sk.yml +++ b/config/locales/sk.yml @@ -839,3 +839,4 @@ sk: label_user_anonymous: Anonymous button_move_and_follow: Move and follow setting_default_projects_modules: Default enabled modules for new projects + setting_gravatar_default: Default Gravatar image diff --git a/config/locales/sl.yml b/config/locales/sl.yml index 5f3db50c6..56cd421fb 100644 --- a/config/locales/sl.yml +++ b/config/locales/sl.yml @@ -836,3 +836,4 @@ sl: label_user_anonymous: Anonymous button_move_and_follow: Move and follow setting_default_projects_modules: Default enabled modules for new projects + setting_gravatar_default: Default Gravatar image diff --git a/config/locales/sr.yml b/config/locales/sr.yml index 38d501e4c..3227463a5 100644 --- a/config/locales/sr.yml +++ b/config/locales/sr.yml @@ -855,3 +855,4 @@ label_user_anonymous: Anonymous button_move_and_follow: Move and follow setting_default_projects_modules: Default enabled modules for new projects + setting_gravatar_default: Default Gravatar image diff --git a/config/locales/sv.yml b/config/locales/sv.yml index d82d22099..a4698fc46 100644 --- a/config/locales/sv.yml +++ b/config/locales/sv.yml @@ -888,3 +888,4 @@ sv: label_user_anonymous: Anonymous button_move_and_follow: Move and follow setting_default_projects_modules: Default enabled modules for new projects + setting_gravatar_default: Default Gravatar image diff --git a/config/locales/th.yml b/config/locales/th.yml index c4474ccce..7b4141290 100644 --- a/config/locales/th.yml +++ b/config/locales/th.yml @@ -837,3 +837,4 @@ th: label_user_anonymous: Anonymous button_move_and_follow: Move and follow setting_default_projects_modules: Default enabled modules for new projects + setting_gravatar_default: Default Gravatar image diff --git a/config/locales/tr.yml b/config/locales/tr.yml index 0ae8c544f..a0a1c26f4 100644 --- a/config/locales/tr.yml +++ b/config/locales/tr.yml @@ -867,3 +867,4 @@ tr: label_user_anonymous: Anonymous button_move_and_follow: Move and follow setting_default_projects_modules: Default enabled modules for new projects + setting_gravatar_default: Default Gravatar image diff --git a/config/locales/uk.yml b/config/locales/uk.yml index 93b372266..7d8d1a907 100644 --- a/config/locales/uk.yml +++ b/config/locales/uk.yml @@ -836,3 +836,4 @@ uk: label_user_anonymous: Anonymous button_move_and_follow: Move and follow setting_default_projects_modules: Default enabled modules for new projects + setting_gravatar_default: Default Gravatar image diff --git a/config/locales/vi.yml b/config/locales/vi.yml index 28c7ab690..fef14e4c3 100644 --- a/config/locales/vi.yml +++ b/config/locales/vi.yml @@ -899,3 +899,4 @@ vi: label_user_anonymous: Anonymous button_move_and_follow: Move and follow setting_default_projects_modules: Default enabled modules for new projects + setting_gravatar_default: Default Gravatar image diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml index c63674fd1..e45735883 100644 --- a/config/locales/zh-TW.yml +++ b/config/locales/zh-TW.yml @@ -931,3 +931,4 @@ enumeration_system_activity: 系統活動 button_move_and_follow: Move and follow setting_default_projects_modules: Default enabled modules for new projects + setting_gravatar_default: Default Gravatar image diff --git a/config/locales/zh.yml b/config/locales/zh.yml index ecd1408df..a40851b17 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -864,3 +864,4 @@ zh: enumeration_system_activity: 系统活动 button_move_and_follow: Move and follow setting_default_projects_modules: Default enabled modules for new projects + setting_gravatar_default: Default Gravatar image diff --git a/config/settings.yml b/config/settings.yml index f529d0201..ca0cc3d7b 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -168,3 +168,5 @@ gravatar_enabled: default: 0 openid: default: 0 +gravatar_default: + default: '' |