Add a setting to pick alternative Gravatar images. #2734

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3076 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index e126a9633b7871af146f02b4c36947a17bb88217..f31bd2d230bd03b13d7ea17341c21e93ecd76907 100644 (file)
--- 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 984f762e4ce34bf46ac241f7b2cfdc8311cd733f..351760fa1a0f9e522997c2fa630476cbd1d28653 100644 (file)
--- 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 bd0243a54b14fdeb215bf31ff016ba27d4ed5eaf..e091f85755c5eb79d4cd77753ad1190b09280f6a 100644 (file)
--- 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 b2d29ddf0efdb50101aa3ca0344e090514aaca59..d6b15903eb9dc391a7ea85a442306f9ed39c7498 100644 (file)
--- 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 12a212001cd7e08296db40f7fd19b49d58fd493b..6aacce6d41ead4688a9469d5e03d85ce584cf4c9 100644 (file)
--- 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 af8b16eb280ce47b39553f545131c3da3e45459e..943fb6928c74a28641eb5496e7f605b5fbc261e1 100644 (file)
--- 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 4028ad2d5805928093f0d610e7be986f15ab0db5..33acc4582ec2720261d47b1b5ef74cc683a83bab 100644 (file)
--- 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 dfe22ae8875620bd13499980a9d3eafac8f56c0b..29273f32e73c7c9e179344175396160d821958c3 100644 (file)
--- 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 ed31de7ba239dc04a9d65044ad526c20cafbe94c..6907603f68be15ac2c969b51ac6320625450ef51 100644 (file)
--- 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 0000e427e7d8dab48d53635cb9f89cedebf9de93..85234cbeb9869b68602dd851c2513c14580cdb2b 100644 (file)
--- 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 2f8a764f1f4a078df681928019d82dd41f3725e4..07bb8800d9bc4d82600f362d81a5a12eb8ecaa6f 100644 (file)
--- 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 3745f6cfd19f10e7d287d31aa277c9f0af5641b3..4501e63ec5614e09ca81ce954f566602e040a1d1 100644 (file)
--- 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 4a32fc373ba00dda69c443487463728efcbdb23a..2e2a69be696645b328b9caf6d9b00ae19ff247d7 100644 (file)
--- 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 99154d3975bb2e870fef4f1bc6f032de3250c8c1..f2af3ed03281caded82dbb69fd0c5c083be8319c 100644 (file)
--- 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 d9096865e9a1dada0f4e40f91f322a60c76c3aec..cae31b360bc79cd713e382051943e60edc515d26 100644 (file)
--- 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 c683956161359d2db4e3dce927602c807c9154d2..ef37ef29c263f838140293aecae2f853f815b219 100644 (file)
--- 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 781ad30e353a6b14eebe77b9f6731c3887b4393b..9460211b3465e1fe1d26721e30912785a6d8717b 100644 (file)
--- 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 4f9ab13dd6d584abfc4dd4fe5349298beceb31e3..450cff989b6c8ee5c604f05cbfdd655d39e8f741 100644 (file)
--- 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 ec2330e42b8e7752636ca709d9ce5598a8439fe6..260d35316469727926f51363d08b3c4d03660bf8 100644 (file)
--- 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 269f7338174b7b7281f9fd2b7707043652df7c3a..5d4ff191bc9b485eb7e470e1d197ddf9ceff83fd 100644 (file)
--- 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 9ef2162be69d5c657285a93276980888fd443791..f41e42bc84e6802b676b1fb3fbf18184c0345541 100644 (file)
--- 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 4c1f326ffced50bf13d3c542e82896bb3dd22ae9..d9f81cfb893a39d03ae1ed40f6f128cd281e66e8 100644 (file)
--- 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 12649ac39aef9cb9d17674db9aeff3b9dbd7af97..622789256c7f72800979dc145dd114d87fc8cdb5 100644 (file)
--- 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 8338afe3eb05aff51c05395f7f63f2c46dcf6a72..a70bebfeca2104fe19a3c4ab2946f54e3eb01062 100644 (file)
--- 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 3e5bd81a38068d01032e6cc5661f157cdb6e37da..3b3f104bce4be1047c29db581f7b15c64425304e 100644 (file)
--- 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 c3d1e116b05c176afc46def628ee213faa1002f3..19e5a5c490505fa81ad41a3d3aaa6b383403f433 100644 (file)
--- 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 787af1f380e8844b81a8e2dee57ad54d8a9eb986..942f5da098f18709598a8d838ef2eeec524bcb7b 100644 (file)
--- 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 cd19e91b08a3ddb0a18837ccfec81deab2cc14a0..af8eab18487781fc9d1c12eff0886662f1647624 100644 (file)
--- 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 5f3db50c66d0852396f744ac6392c9d1ea501464..56cd421fb13499900684f9c4d867d7a7de3a80a4 100644 (file)
--- 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 38d501e4c2f6cb2d07771370b31b889af46879a6..3227463a5c93f46f408c44455e1e58575446a1f1 100644 (file)
--- 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 d82d220994339b29055d86433e2a47da47096de6..a4698fc46c04ed701b6f8c4d4e527037af521cbe 100644 (file)
--- 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 c4474ccced3e5fbaa2a8c61b6e8505343f9d5330..7b4141290c7d3668c191b6815eb5dd2ef5302569 100644 (file)
--- 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 0ae8c544f69f67f1383d07c89d0d81805cdcd462..a0a1c26f4e45d8d6d583e869998bb79443adf2ed 100644 (file)
--- 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 93b3722667fc1e26d54f7fea28fe09b4de65fcc6..7d8d1a9079008cf35a84b7415eaa963ef803bbe0 100644 (file)
--- 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 28c7ab6903af6d8635b6cac34d146b3c6eba46ef..fef14e4c3068dc85d411b626fd1f8ee1255ec6db 100644 (file)
--- 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 c63674fd10773afb5cf3562fe36cffa2164e9127..e45735883bddf9d5d33a4113c9938c5364f66c0c 100644 (file)
--- 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 ecd1408df8b8be675543c24077c036b0b2141425..a40851b1718c636a24678c82f973b2acf0c0626c 100644 (file)
--- 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 f529d02013937b4fe68432c9005efae07e2e51b7..ca0cc3d7b339eb1574a1730da413b128e78ed517 100644 (file)
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -168,3 +168,5 @@ gravatar_enabled:
   default: 0
 openid:
   default: 0
+gravatar_default:
+  default: ''