jro_apps/redmine Commit - r2962:ec4ba2324883

0

app/helpers/application_helper.rb +1 -1

               # +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

0

app/views/settings/_display.rhtml +4 0

             <%= 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) %>

0

config/locales/bg.yml +1 0

               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

0

config/locales/bs.yml +1 0

               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

0

config/locales/ca.yml +1 0

               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

0

config/locales/cs.yml +1 0

               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

0

config/locales/da.yml +1 0

               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

0

config/locales/de.yml +1 0

               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

0

config/locales/el.yml +1 0

               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

0

config/locales/en.yml +1 0

               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

0

config/locales/es.yml +1 0

               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

0

config/locales/fi.yml +1 0

               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

0

config/locales/fr.yml +1 0

               text_journal_added: "{{label}} {{value}} ajouté"
               field_active: Actif
               enumeration_system_activity: Activité système
+              setting_gravatar_default: Default Gravatar image

0

config/locales/gl.yml +1 0

               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

0

config/locales/he.yml +1 0

               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

0

config/locales/hu.yml +1 0

               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

0

config/locales/it.yml +1 0

               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

0

config/locales/ja.yml +1 0

               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

0

config/locales/ko.yml +1 0

               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

0

config/locales/lt.yml +1 0

               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

0

config/locales/nl.yml +1 0

               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

0

config/locales/no.yml +1 0

               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

0

config/locales/pl.yml +1 0

               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

0

config/locales/pt-BR.yml +1 0

               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

0

config/locales/pt.yml +1 0

               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

0

config/locales/ro.yml +1 0

               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

0

config/locales/ru.yml +1 0

               label_user_anonymous: Аноним
               button_move_and_follow: Переместить и перейти
               setting_default_projects_modules: Включенные по умолчанию модули для новых проектов
+              setting_gravatar_default: Default Gravatar image

0

config/locales/sk.yml +1 0

               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

0

config/locales/sl.yml +1 0

               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

0

config/locales/sr.yml +1 0

               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

0

config/locales/sv.yml +1 0

               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

0

config/locales/th.yml +1 0

               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

0

config/locales/tr.yml +1 0

               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

0

config/locales/uk.yml +1 0

               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

0

config/locales/vi.yml +1 0

               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

0

config/locales/zh-TW.yml +1 0

               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

0

config/locales/zh.yml +1 0

               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

0

config/settings.yml +2 0

               default: 0
             openid:
               default: 0
+            gravatar_default:
+              default: ''

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages