From 8d484676967006f03c47be25ccbee9021af78efe Mon Sep 17 00:00:00 2001 From: MAEDA Go Date: Tue, 20 Oct 2026 14:13:50 +0900 Subject: [PATCH 2/3] Distinguish built-in and Gravatar initials in the default Gravatar image options The blank option of the "Default Gravatar image" setting shows the initials avatar generated by Redmine for users without a registered Gravatar, but its label "none" does not tell what is displayed. Label it "Initials (built-in)" and rename the existing Gravatar initials option to "Initials (Gravatar)" so that the two can be told apart. Co-Authored-By: Claude Opus 5.5 --- app/helpers/settings_helper.rb | 3 ++- app/views/settings/_display.html.erb | 2 +- test/functional/settings_controller_test.rb | 10 ++++++++++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/app/helpers/settings_helper.rb b/app/helpers/settings_helper.rb index 89cbc6289..2478c1490 100644 --- a/app/helpers/settings_helper.rb +++ b/app/helpers/settings_helper.rb @@ -249,7 +249,8 @@ module SettingsHelper end def gravatar_default_setting_options - [['Initials', 'initials'], + [['Initials (built-in)', ''], + ['Initials (Gravatar)', 'initials'], ['Color', 'color'], ['Mystery man', 'mm'], ['Identicons', 'identicon'], diff --git a/app/views/settings/_display.html.erb b/app/views/settings/_display.html.erb index c4b325c09..610c18028 100644 --- a/app/views/settings/_display.html.erb +++ b/app/views/settings/_display.html.erb @@ -40,7 +40,7 @@ <%= t(:text_avatar_server_config_html, :url => Redmine::Configuration['avatar_server_url']) %>

- <%= setting_select :gravatar_default, gravatar_default_setting_options, :blank => :label_none %> + <%= setting_select :gravatar_default, gravatar_default_setting_options %> "> <%= t(:text_setting_gravatar_default_initials_html, :url => Redmine::Configuration['avatar_server_url']) %> diff --git a/test/functional/settings_controller_test.rb b/test/functional/settings_controller_test.rb index 7d9ee0f8d..217c4c3b6 100644 --- a/test/functional/settings_controller_test.rb +++ b/test/functional/settings_controller_test.rb @@ -79,6 +79,16 @@ class SettingsControllerTest < Redmine::ControllerTest assert_select '#settings_gravatar_default ~ em.info a[href=?]', url, :text => url end + def test_get_edit_should_distinguish_built_in_and_gravatar_initials_options + get :edit + assert_response :success + + assert_select '#settings_gravatar_default' do + assert_select 'option[value=""]', :text => 'Initials (built-in)' + assert_select 'option[value="initials"]', :text => 'Initials (Gravatar)' + end + end + def test_post_edit_notifications post :edit, :params => { :settings => { -- 2.55.0