From 2ab117617b27f157fba7c02b780ed9447bce8f90 Mon Sep 17 00:00:00 2001 From: MAEDA Go Date: Fri, 25 Sep 2026 17:40:40 +0900 Subject: [PATCH] Fix info text for "Initials" fallback avatars ignoring the configured avatar server and showing Gravatar URL The info text shown when "Initials" is selected as the default Gravatar image always said that users' initials are sent to https://www.gravatar.com, even when avatar_server_url in config/configuration.yml points to another Gravatar-compatible server. Interpolate avatar_server_url into the text instead of hard-coding the Gravatar URL in all locales. The ru locale, which used "Gravatar" as the link text, now shows the URL like the other locales. Co-Authored-By: Claude Opus 5.5 --- app/views/settings/_display.html.erb | 2 +- config/locales/ar.yml | 2 +- config/locales/az.yml | 2 +- config/locales/bg.yml | 2 +- config/locales/bs.yml | 2 +- config/locales/ca.yml | 2 +- config/locales/cs.yml | 2 +- config/locales/da.yml | 2 +- config/locales/de.yml | 2 +- config/locales/el.yml | 2 +- config/locales/en-GB.yml | 2 +- config/locales/en.yml | 2 +- config/locales/es-PA.yml | 2 +- config/locales/es.yml | 2 +- config/locales/et.yml | 2 +- config/locales/eu.yml | 2 +- config/locales/fa.yml | 2 +- config/locales/fi.yml | 2 +- config/locales/fr.yml | 2 +- config/locales/gl.yml | 2 +- config/locales/he.yml | 2 +- config/locales/hr.yml | 2 +- config/locales/hu.yml | 2 +- config/locales/id.yml | 2 +- config/locales/it.yml | 2 +- config/locales/ja.yml | 2 +- config/locales/ko.yml | 2 +- config/locales/lt.yml | 2 +- config/locales/lv.yml | 2 +- config/locales/mk.yml | 2 +- config/locales/mn.yml | 2 +- config/locales/nl.yml | 2 +- config/locales/no.yml | 2 +- config/locales/pl.yml | 2 +- config/locales/pt-BR.yml | 2 +- config/locales/pt.yml | 2 +- config/locales/ro.yml | 2 +- config/locales/ru.yml | 2 +- config/locales/sk.yml | 2 +- config/locales/sl.yml | 2 +- config/locales/sq.yml | 2 +- config/locales/sr-YU.yml | 2 +- config/locales/sr.yml | 2 +- config/locales/sv.yml | 2 +- config/locales/ta-IN.yml | 2 +- config/locales/th.yml | 2 +- config/locales/tr.yml | 2 +- config/locales/uk.yml | 2 +- config/locales/vi.yml | 2 +- config/locales/zh-TW.yml | 2 +- config/locales/zh.yml | 2 +- test/functional/settings_controller_test.rb | 14 ++++++++++++++ 52 files changed, 65 insertions(+), 51 deletions(-) diff --git a/app/views/settings/_display.html.erb b/app/views/settings/_display.html.erb index 3b2f95798..9f7fbc881 100644 --- a/app/views/settings/_display.html.erb +++ b/app/views/settings/_display.html.erb @@ -25,7 +25,7 @@

<%= setting_select :gravatar_default, gravatar_default_setting_options, :blank => :label_none %> "> - <%= t(:text_setting_gravatar_default_initials_html) %> + <%= t(:text_setting_gravatar_default_initials_html, :url => Redmine::Configuration['avatar_server_url']) %>

diff --git a/config/locales/ar.yml b/config/locales/ar.yml index e02c3374d..63901f8ba 100644 --- a/config/locales/ar.yml +++ b/config/locales/ar.yml @@ -1495,7 +1495,7 @@ ar: reaction_text_x_other_users: one: 1 other other: "%{count} others" - text_setting_gravatar_default_initials_html: Users' initials are sent to https://www.gravatar.com + text_setting_gravatar_default_initials_html: Users' initials are sent to %{url} to generate their avatars. permission_view_project: View projects permission_search_project: Search projects diff --git a/config/locales/az.yml b/config/locales/az.yml index a978cb71b..acac78f2b 100644 --- a/config/locales/az.yml +++ b/config/locales/az.yml @@ -1578,7 +1578,7 @@ az: reaction_text_x_other_users: one: 1 other other: "%{count} others" - text_setting_gravatar_default_initials_html: Users' initials are sent to https://www.gravatar.com + text_setting_gravatar_default_initials_html: Users' initials are sent to %{url} to generate their avatars. permission_view_project: View projects permission_search_project: Search projects diff --git a/config/locales/bg.yml b/config/locales/bg.yml index ce607840f..f9d387122 100644 --- a/config/locales/bg.yml +++ b/config/locales/bg.yml @@ -1389,7 +1389,7 @@ bg: Можете да го конфигурирате в config/configuration.yml. text_allowed_queries_to_select: Само публичните (за всички потребители) заявки са достъпни за избор text_setting_config_change: Вие можете да конфигурирате поведението в config/configuration.yml. Моля, рестартирайте Redmine след редактиране на файла. - text_setting_gravatar_default_initials_html: Инициалите на потребителите са изпратени на https://www.gravatar.com за генериране на техните аватари. + text_setting_gravatar_default_initials_html: Инициалите на потребителите са изпратени на %{url} за генериране на техните аватари. text_oauth_admin_permission: Пълен административен достъп. След оторизиране от администратор, това приложение ще има възможност да чете и записва всички данни и да имитира други потребители. text_oauth_admin_permission_info: Това приложение иска пълен административен достъп. diff --git a/config/locales/bs.yml b/config/locales/bs.yml index dc9946388..68d29b0e0 100644 --- a/config/locales/bs.yml +++ b/config/locales/bs.yml @@ -1481,7 +1481,7 @@ bs: reaction_text_x_other_users: one: 1 other other: "%{count} others" - text_setting_gravatar_default_initials_html: Users' initials are sent to https://www.gravatar.com + text_setting_gravatar_default_initials_html: Users' initials are sent to %{url} to generate their avatars. permission_view_project: View projects permission_search_project: Search projects diff --git a/config/locales/ca.yml b/config/locales/ca.yml index 2ee68a71c..e267dd553 100644 --- a/config/locales/ca.yml +++ b/config/locales/ca.yml @@ -1482,7 +1482,7 @@ ca: reaction_text_x_other_users: one: 1 other other: "%{count} others" - text_setting_gravatar_default_initials_html: Users' initials are sent to https://www.gravatar.com + text_setting_gravatar_default_initials_html: Users' initials are sent to %{url} to generate their avatars. permission_view_project: View projects permission_search_project: Search projects diff --git a/config/locales/cs.yml b/config/locales/cs.yml index cd47d5627..69d90b7aa 100644 --- a/config/locales/cs.yml +++ b/config/locales/cs.yml @@ -1476,7 +1476,7 @@ cs: reaction_text_x_other_users: one: 1 jiný other: "%{count} jiných" - text_setting_gravatar_default_initials_html: Uživatelovy iniciály jsou poslány do https://www.gravatar.com + text_setting_gravatar_default_initials_html: Uživatelovy iniciály jsou poslány do %{url} k vygenerování avataru. permission_view_project: Zobrazení projektů permission_search_project: Vyhledání projektů diff --git a/config/locales/da.yml b/config/locales/da.yml index ede69d7f5..248857ffc 100644 --- a/config/locales/da.yml +++ b/config/locales/da.yml @@ -1512,7 +1512,7 @@ da: reaction_text_x_other_users: one: 1 other other: "%{count} others" - text_setting_gravatar_default_initials_html: Users' initials are sent to https://www.gravatar.com + text_setting_gravatar_default_initials_html: Users' initials are sent to %{url} to generate their avatars. permission_view_project: View projects permission_search_project: Search projects diff --git a/config/locales/de.yml b/config/locales/de.yml index 2ee4ce1d1..eab3133f6 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -1472,7 +1472,7 @@ de: reaction_text_x_other_users: one: 1 other other: "%{count} others" - text_setting_gravatar_default_initials_html: Users' initials are sent to https://www.gravatar.com + text_setting_gravatar_default_initials_html: Users' initials are sent to %{url} to generate their avatars. label_oauth_permission_admin: Administrator-Zugriff label_oauth_admin_access: Administration diff --git a/config/locales/el.yml b/config/locales/el.yml index 36f6aac51..d18af42d7 100644 --- a/config/locales/el.yml +++ b/config/locales/el.yml @@ -1495,7 +1495,7 @@ el: reaction_text_x_other_users: one: 1 other other: "%{count} others" - text_setting_gravatar_default_initials_html: Users' initials are sent to https://www.gravatar.com + text_setting_gravatar_default_initials_html: Users' initials are sent to %{url} to generate their avatars. permission_view_project: View projects permission_search_project: Search projects diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml index b89f89ede..725c0da67 100644 --- a/config/locales/en-GB.yml +++ b/config/locales/en-GB.yml @@ -1496,7 +1496,7 @@ en-GB: reaction_text_x_other_users: one: 1 other other: "%{count} others" - text_setting_gravatar_default_initials_html: Users' initials are sent to https://www.gravatar.com + text_setting_gravatar_default_initials_html: Users' initials are sent to %{url} to generate their avatars. permission_view_project: View projects permission_search_project: Search projects diff --git a/config/locales/en.yml b/config/locales/en.yml index 957e9bf50..d8feafd60 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1392,7 +1392,7 @@ en: text_no_subject: no subject text_allowed_queries_to_select: Public (to any users) queries only selectable text_setting_config_change: You can configure the behaviour in config/configuration.yml. Please restart the application after editing it. - text_setting_gravatar_default_initials_html: Users' initials are sent to https://www.gravatar.com to generate their avatars. + text_setting_gravatar_default_initials_html: Users' initials are sent to %{url} to generate their avatars. text_oauth_admin_permission: Full administrative access. When authorized by an Administrator, this application will be able to read and write all data and impersonate other users. text_oauth_admin_permission_info: This application requests full administrative access. If you are an Administrator (or become one in the future), it will be able to read and write all data and impersonate other users on your behalf. If you want to avoid this, authorize it as a user without Administrator privileges instead. text_oauth_copy_secret_now: Copy the secret to a safe place now, it will not be shown again. diff --git a/config/locales/es-PA.yml b/config/locales/es-PA.yml index b73402fa7..88e43a7e0 100644 --- a/config/locales/es-PA.yml +++ b/config/locales/es-PA.yml @@ -1526,7 +1526,7 @@ es-PA: reaction_text_x_other_users: one: 1 other other: "%{count} others" - text_setting_gravatar_default_initials_html: Users' initials are sent to https://www.gravatar.com + text_setting_gravatar_default_initials_html: Users' initials are sent to %{url} to generate their avatars. permission_view_project: View projects permission_search_project: Search projects diff --git a/config/locales/es.yml b/config/locales/es.yml index f1b744aba..8bc7f0bf5 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -1562,7 +1562,7 @@ es: reaction_text_x_other_users: one: 1 other other: "%{count} others" - text_setting_gravatar_default_initials_html: Users' initials are sent to https://www.gravatar.com + text_setting_gravatar_default_initials_html: Users' initials are sent to %{url} to generate their avatars. permission_view_project: View projects permission_search_project: Search projects diff --git a/config/locales/et.yml b/config/locales/et.yml index cf7c73fda..1030e5ae4 100644 --- a/config/locales/et.yml +++ b/config/locales/et.yml @@ -1500,7 +1500,7 @@ et: reaction_text_x_other_users: one: 1 other other: "%{count} others" - text_setting_gravatar_default_initials_html: Users' initials are sent to https://www.gravatar.com + text_setting_gravatar_default_initials_html: Users' initials are sent to %{url} to generate their avatars. permission_view_project: View projects permission_search_project: Search projects diff --git a/config/locales/eu.yml b/config/locales/eu.yml index 5bb2b3eee..67d1b79b4 100644 --- a/config/locales/eu.yml +++ b/config/locales/eu.yml @@ -1496,7 +1496,7 @@ eu: reaction_text_x_other_users: one: 1 other other: "%{count} others" - text_setting_gravatar_default_initials_html: Users' initials are sent to https://www.gravatar.com + text_setting_gravatar_default_initials_html: Users' initials are sent to %{url} to generate their avatars. permission_view_project: View projects permission_search_project: Search projects diff --git a/config/locales/fa.yml b/config/locales/fa.yml index 5ebb94f64..0cbe72b4b 100644 --- a/config/locales/fa.yml +++ b/config/locales/fa.yml @@ -1432,7 +1432,7 @@ fa: reaction_text_x_other_users: one: 1 کاربر دیگر other: "%{count} کاربر دیگر" - text_setting_gravatar_default_initials_html: حروف اول اسامی کاربران به https://www.gravatar.com ارسال می‌شود + text_setting_gravatar_default_initials_html: حروف اول اسامی کاربران به %{url} ارسال می‌شود تا تصاویر پروفایل آن‌ها تولید شود. permission_view_project: مشاهده پروژه‌ها permission_search_project: جستجوی پروژه‌ها diff --git a/config/locales/fi.yml b/config/locales/fi.yml index 5f6fdffd9..d4f98680a 100644 --- a/config/locales/fi.yml +++ b/config/locales/fi.yml @@ -1513,7 +1513,7 @@ fi: reaction_text_x_other_users: one: 1 other other: "%{count} others" - text_setting_gravatar_default_initials_html: Users' initials are sent to https://www.gravatar.com + text_setting_gravatar_default_initials_html: Users' initials are sent to %{url} to generate their avatars. permission_view_project: View projects permission_search_project: Search projects diff --git a/config/locales/fr.yml b/config/locales/fr.yml index ff84881f1..2fbd2cbd3 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -1473,7 +1473,7 @@ fr: reaction_text_x_other_users: one: 1 autre other: "%{count} autres" - text_setting_gravatar_default_initials_html: Les initiales des utilisateurs sont envoyées à https://www.gravatar.com pour générer leurs avatars. + text_setting_gravatar_default_initials_html: Les initiales des utilisateurs sont envoyées à %{url} pour générer leurs avatars. permission_view_project: Voir les projets permission_search_project: Rechercher des projets permission_view_members: Voir les membres du projet diff --git a/config/locales/gl.yml b/config/locales/gl.yml index 05f7e7d55..eebce6d50 100644 --- a/config/locales/gl.yml +++ b/config/locales/gl.yml @@ -1501,7 +1501,7 @@ gl: reaction_text_x_other_users: one: 1 outro other: "%{count} outros" - text_setting_gravatar_default_initials_html: As iniciais dos usuarios son enviadas a https://www.gravatar.com + text_setting_gravatar_default_initials_html: As iniciais dos usuarios son enviadas a %{url} para xerar os seus avatares. permission_view_project: Ver proxectos permission_search_project: Buscar proxectos diff --git a/config/locales/he.yml b/config/locales/he.yml index 09cacbe6d..922dedf6f 100644 --- a/config/locales/he.yml +++ b/config/locales/he.yml @@ -1500,7 +1500,7 @@ he: reaction_text_x_other_users: one: 1 other other: "%{count} others" - text_setting_gravatar_default_initials_html: Users' initials are sent to https://www.gravatar.com + text_setting_gravatar_default_initials_html: Users' initials are sent to %{url} to generate their avatars. permission_view_project: View projects permission_search_project: Search projects diff --git a/config/locales/hr.yml b/config/locales/hr.yml index f419b4b8e..d30f01e67 100644 --- a/config/locales/hr.yml +++ b/config/locales/hr.yml @@ -1492,7 +1492,7 @@ hr: reaction_text_x_other_users: one: 1 other other: "%{count} others" - text_setting_gravatar_default_initials_html: Users' initials are sent to https://www.gravatar.com + text_setting_gravatar_default_initials_html: Users' initials are sent to %{url} to generate their avatars. permission_view_project: View projects permission_search_project: Search projects diff --git a/config/locales/hu.yml b/config/locales/hu.yml index 5eab9f344..6d0bc9ed2 100644 --- a/config/locales/hu.yml +++ b/config/locales/hu.yml @@ -1440,7 +1440,7 @@ reaction_text_x_other_users: one: 1 másik other: "%{count} másik" - text_setting_gravatar_default_initials_html: A felhasználók monogramját https://www.gravatar.com részére küldjük el avatárjuk generálásához. + text_setting_gravatar_default_initials_html: A felhasználók monogramját %{url} részére küldjük el avatárjuk generálásához. permission_view_project: Projektek megtekintése permission_search_project: Projektek keresése permission_view_members: Projekt tagok megtekintése diff --git a/config/locales/id.yml b/config/locales/id.yml index 9edf5aa7b..52ac6f8d8 100644 --- a/config/locales/id.yml +++ b/config/locales/id.yml @@ -1497,7 +1497,7 @@ id: reaction_text_x_other_users: one: 1 other other: "%{count} others" - text_setting_gravatar_default_initials_html: Users' initials are sent to https://www.gravatar.com + text_setting_gravatar_default_initials_html: Users' initials are sent to %{url} to generate their avatars. permission_view_project: View projects permission_search_project: Search projects diff --git a/config/locales/it.yml b/config/locales/it.yml index 9f6280bc7..8acc915a7 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -1359,7 +1359,7 @@ it: text_no_subject: nessun soggetto text_allowed_queries_to_select: Solo query pubbliche (per tutti gli utenti) selezionabili text_setting_config_change: Puoi configurare il comportamento in config/configuration.yml. Riavvia l'applicazione dopo averla modificata. - text_setting_gravatar_default_initials_html: Le iniziali degli utenti vengono inviate a https://www.gravatar.com per generare i loro avatar. + text_setting_gravatar_default_initials_html: Le iniziali degli utenti vengono inviate a %{url} per generare i loro avatar. text_oauth_admin_permission: Accesso amministrativo completo. Se autorizzata da un Amministratore, questa applicazione potrà leggere e scrivere tutti i dati e impersonare altri utenti. text_oauth_admin_permission_info: "Questa applicazione richiede l'accesso amministrativo completo. Se sei un Amministratore (o lo diventerai in futuro), l'applicazione potrà leggere e scrivere tutti i dati e impersonare altri utenti per tuo conto. Se vuoi evitare questo problema, autorizzala come utente senza privilegi di Amministratore." text_oauth_copy_secret_now: "Salva subito il segreto in un luogo sicuro: non verrà mostrato di nuovo." diff --git a/config/locales/ja.yml b/config/locales/ja.yml index 7cb3cbd9a..95d3b52ef 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -1455,7 +1455,7 @@ ja: reaction_text_x_other_users: one: 他1人 other: "他%{count}人" - text_setting_gravatar_default_initials_html: ユーザーの姓と名それぞれの先頭文字がアイコン生成のために https://www.gravatar.com に送信されます。 + text_setting_gravatar_default_initials_html: ユーザーの姓と名それぞれの先頭文字がアイコン生成のために %{url} に送信されます。 permission_view_project: プロジェクトの閲覧 permission_search_project: プロジェクトの検索 permission_view_members: プロジェクトのメンバーの閲覧 diff --git a/config/locales/ko.yml b/config/locales/ko.yml index a705751ac..9742d780c 100644 --- a/config/locales/ko.yml +++ b/config/locales/ko.yml @@ -1512,7 +1512,7 @@ ko: reaction_text_x_other_users: one: 1 other other: "%{count} others" - text_setting_gravatar_default_initials_html: Users' initials are sent to https://www.gravatar.com + text_setting_gravatar_default_initials_html: Users' initials are sent to %{url} to generate their avatars. permission_view_project: View projects permission_search_project: Search projects diff --git a/config/locales/lt.yml b/config/locales/lt.yml index be073e7cb..3bb3ddf08 100644 --- a/config/locales/lt.yml +++ b/config/locales/lt.yml @@ -1456,7 +1456,7 @@ lt: reaction_text_x_other_users: one: 1 other other: "%{count} others" - text_setting_gravatar_default_initials_html: Users' initials are sent to https://www.gravatar.com + text_setting_gravatar_default_initials_html: Users' initials are sent to %{url} to generate their avatars. permission_view_project: View projects permission_search_project: Search projects diff --git a/config/locales/lv.yml b/config/locales/lv.yml index 4af02acab..32322c494 100644 --- a/config/locales/lv.yml +++ b/config/locales/lv.yml @@ -1489,7 +1489,7 @@ lv: reaction_text_x_other_users: one: 1 other other: "%{count} others" - text_setting_gravatar_default_initials_html: Users' initials are sent to https://www.gravatar.com + text_setting_gravatar_default_initials_html: Users' initials are sent to %{url} to generate their avatars. permission_view_project: View projects permission_search_project: Search projects diff --git a/config/locales/mk.yml b/config/locales/mk.yml index ae0eb1269..e5574a774 100644 --- a/config/locales/mk.yml +++ b/config/locales/mk.yml @@ -1495,7 +1495,7 @@ mk: reaction_text_x_other_users: one: 1 other other: "%{count} others" - text_setting_gravatar_default_initials_html: Users' initials are sent to https://www.gravatar.com + text_setting_gravatar_default_initials_html: Users' initials are sent to %{url} to generate their avatars. permission_view_project: View projects permission_search_project: Search projects diff --git a/config/locales/mn.yml b/config/locales/mn.yml index ff01deb7c..82eab71d7 100644 --- a/config/locales/mn.yml +++ b/config/locales/mn.yml @@ -1495,7 +1495,7 @@ mn: reaction_text_x_other_users: one: 1 other other: "%{count} others" - text_setting_gravatar_default_initials_html: Users' initials are sent to https://www.gravatar.com + text_setting_gravatar_default_initials_html: Users' initials are sent to %{url} to generate their avatars. permission_view_project: View projects permission_search_project: Search projects diff --git a/config/locales/nl.yml b/config/locales/nl.yml index 1032ba122..6cb3968af 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -1470,7 +1470,7 @@ nl: reaction_text_x_other_users: one: 1 other other: "%{count} others" - text_setting_gravatar_default_initials_html: Users' initials are sent to https://www.gravatar.com + text_setting_gravatar_default_initials_html: Users' initials are sent to %{url} to generate their avatars. permission_view_project: View projects permission_search_project: Search projects diff --git a/config/locales/no.yml b/config/locales/no.yml index ee72d3aa3..79e979980 100644 --- a/config/locales/no.yml +++ b/config/locales/no.yml @@ -1486,7 +1486,7 @@ reaction_text_x_other_users: one: 1 other other: "%{count} others" - text_setting_gravatar_default_initials_html: Users' initials are sent to https://www.gravatar.com + text_setting_gravatar_default_initials_html: Users' initials are sent to %{url} to generate their avatars. permission_view_project: View projects permission_search_project: Search projects diff --git a/config/locales/pl.yml b/config/locales/pl.yml index 88ed40265..7c88b2718 100644 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -1439,7 +1439,7 @@ pl: reaction_text_x_other_users: one: 1 other other: "%{count} others" - text_setting_gravatar_default_initials_html: Users' initials are sent to https://www.gravatar.com + text_setting_gravatar_default_initials_html: Users' initials are sent to %{url} to generate their avatars. permission_view_project: View projects permission_search_project: Search projects diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml index a668ad7d9..4ef01af64 100644 --- a/config/locales/pt-BR.yml +++ b/config/locales/pt-BR.yml @@ -1500,7 +1500,7 @@ pt-BR: reaction_text_x_other_users: one: 1 other other: "%{count} others" - text_setting_gravatar_default_initials_html: Users' initials are sent to https://www.gravatar.com + text_setting_gravatar_default_initials_html: Users' initials are sent to %{url} to generate their avatars. permission_view_project: View projects permission_search_project: Search projects diff --git a/config/locales/pt.yml b/config/locales/pt.yml index 8a01f58ca..aa8ad1480 100644 --- a/config/locales/pt.yml +++ b/config/locales/pt.yml @@ -1488,7 +1488,7 @@ pt: reaction_text_x_other_users: one: 1 other other: "%{count} others" - text_setting_gravatar_default_initials_html: Users' initials are sent to https://www.gravatar.com + text_setting_gravatar_default_initials_html: Users' initials are sent to %{url} to generate their avatars. permission_view_project: View projects permission_search_project: Search projects diff --git a/config/locales/ro.yml b/config/locales/ro.yml index a3e1db5eb..48f2f451d 100644 --- a/config/locales/ro.yml +++ b/config/locales/ro.yml @@ -1490,7 +1490,7 @@ ro: reaction_text_x_other_users: one: 1 other other: "%{count} others" - text_setting_gravatar_default_initials_html: Users' initials are sent to https://www.gravatar.com + text_setting_gravatar_default_initials_html: Users' initials are sent to %{url} to generate their avatars. permission_view_project: View projects permission_search_project: Search projects diff --git a/config/locales/ru.yml b/config/locales/ru.yml index c09be5a8f..06946b225 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -1555,7 +1555,7 @@ ru: reaction_text_x_other_users: one: еще один. other: "еще %{count}" - text_setting_gravatar_default_initials_html: Для генерации аватаров на сервис Gravatar + text_setting_gravatar_default_initials_html: Для генерации аватаров на сервис %{url} передаются инициалы пользователей. permission_view_project: Просмотр проектов permission_search_project: Поиск проектов diff --git a/config/locales/sk.yml b/config/locales/sk.yml index af16b865e..8bf4239d9 100644 --- a/config/locales/sk.yml +++ b/config/locales/sk.yml @@ -1484,7 +1484,7 @@ sk: reaction_text_x_other_users: one: 1 other other: "%{count} others" - text_setting_gravatar_default_initials_html: Users' initials are sent to https://www.gravatar.com + text_setting_gravatar_default_initials_html: Users' initials are sent to %{url} to generate their avatars. permission_view_project: View projects permission_search_project: Search projects diff --git a/config/locales/sl.yml b/config/locales/sl.yml index f64239c05..0369f4bce 100644 --- a/config/locales/sl.yml +++ b/config/locales/sl.yml @@ -1495,7 +1495,7 @@ sl: reaction_text_x_other_users: one: 1 other other: "%{count} others" - text_setting_gravatar_default_initials_html: Users' initials are sent to https://www.gravatar.com + text_setting_gravatar_default_initials_html: Users' initials are sent to %{url} to generate their avatars. permission_view_project: View projects permission_search_project: Search projects diff --git a/config/locales/sq.yml b/config/locales/sq.yml index 85b117395..7e3544d8c 100644 --- a/config/locales/sq.yml +++ b/config/locales/sq.yml @@ -1457,7 +1457,7 @@ sq: reaction_text_x_other_users: one: 1 other other: "%{count} others" - text_setting_gravatar_default_initials_html: Users' initials are sent to https://www.gravatar.com + text_setting_gravatar_default_initials_html: Users' initials are sent to %{url} to generate their avatars. permission_view_project: View projects permission_search_project: Search projects diff --git a/config/locales/sr-YU.yml b/config/locales/sr-YU.yml index bfee40c56..c94ac5403 100644 --- a/config/locales/sr-YU.yml +++ b/config/locales/sr-YU.yml @@ -1497,7 +1497,7 @@ sr-YU: reaction_text_x_other_users: one: 1 other other: "%{count} others" - text_setting_gravatar_default_initials_html: Users' initials are sent to https://www.gravatar.com + text_setting_gravatar_default_initials_html: Users' initials are sent to %{url} to generate their avatars. permission_view_project: View projects permission_search_project: Search projects diff --git a/config/locales/sr.yml b/config/locales/sr.yml index fc95ce05a..69c94ecd8 100644 --- a/config/locales/sr.yml +++ b/config/locales/sr.yml @@ -1496,7 +1496,7 @@ sr: reaction_text_x_other_users: one: 1 other other: "%{count} others" - text_setting_gravatar_default_initials_html: Users' initials are sent to https://www.gravatar.com + text_setting_gravatar_default_initials_html: Users' initials are sent to %{url} to generate their avatars. permission_view_project: View projects permission_search_project: Search projects diff --git a/config/locales/sv.yml b/config/locales/sv.yml index a18c25fe1..22bde7f9d 100644 --- a/config/locales/sv.yml +++ b/config/locales/sv.yml @@ -1459,7 +1459,7 @@ sv: reaction_text_x_other_users: one: 1 other other: "%{count} others" - text_setting_gravatar_default_initials_html: Users' initials are sent to https://www.gravatar.com + text_setting_gravatar_default_initials_html: Users' initials are sent to %{url} to generate their avatars. permission_view_project: View projects permission_search_project: Search projects diff --git a/config/locales/ta-IN.yml b/config/locales/ta-IN.yml index 3810905be..4e27d256b 100644 --- a/config/locales/ta-IN.yml +++ b/config/locales/ta-IN.yml @@ -1450,7 +1450,7 @@ ta-IN: reaction_text_x_other_users: one: 1 other other: "%{count} others" - text_setting_gravatar_default_initials_html: Users' initials are sent to https://www.gravatar.com + text_setting_gravatar_default_initials_html: Users' initials are sent to %{url} to generate their avatars. permission_view_project: View projects permission_search_project: Search projects diff --git a/config/locales/th.yml b/config/locales/th.yml index 7308778f0..b9a48cbdd 100644 --- a/config/locales/th.yml +++ b/config/locales/th.yml @@ -1491,7 +1491,7 @@ th: reaction_text_x_other_users: one: 1 other other: "%{count} others" - text_setting_gravatar_default_initials_html: Users' initials are sent to https://www.gravatar.com + text_setting_gravatar_default_initials_html: Users' initials are sent to %{url} to generate their avatars. permission_view_project: View projects permission_search_project: Search projects diff --git a/config/locales/tr.yml b/config/locales/tr.yml index e3ea60e75..418a2d1f1 100644 --- a/config/locales/tr.yml +++ b/config/locales/tr.yml @@ -1494,7 +1494,7 @@ tr: reaction_text_x_other_users: one: 1 other other: "%{count} others" - text_setting_gravatar_default_initials_html: Users' initials are sent to https://www.gravatar.com + text_setting_gravatar_default_initials_html: Users' initials are sent to %{url} to generate their avatars. permission_view_project: View projects permission_search_project: Search projects diff --git a/config/locales/uk.yml b/config/locales/uk.yml index 6efe88d57..0169ab776 100644 --- a/config/locales/uk.yml +++ b/config/locales/uk.yml @@ -1483,7 +1483,7 @@ uk: reaction_text_x_other_users: one: 1 other other: "%{count} others" - text_setting_gravatar_default_initials_html: Users' initials are sent to https://www.gravatar.com + text_setting_gravatar_default_initials_html: Users' initials are sent to %{url} to generate their avatars. permission_view_project: View projects permission_search_project: Search projects diff --git a/config/locales/vi.yml b/config/locales/vi.yml index d8508438b..2f46f1a0e 100644 --- a/config/locales/vi.yml +++ b/config/locales/vi.yml @@ -1499,7 +1499,7 @@ vi: reaction_text_x_other_users: one: 1 other other: "%{count} others" - text_setting_gravatar_default_initials_html: Users' initials are sent to https://www.gravatar.com + text_setting_gravatar_default_initials_html: Users' initials are sent to %{url} to generate their avatars. permission_view_project: View projects permission_search_project: Search projects diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml index 10e32af83..e9eab9160 100644 --- a/config/locales/zh-TW.yml +++ b/config/locales/zh-TW.yml @@ -1509,7 +1509,7 @@ reaction_text_x_other_users: one: 1 位其他用戶 other: "%{count} 位其他用戶" - text_setting_gravatar_default_initials_html: 用戶姓名的首字母縮寫將被送往 https://www.gravatar.com + text_setting_gravatar_default_initials_html: 用戶姓名的首字母縮寫將被送往 %{url} 用以產生其大頭貼. permission_view_project: 檢視專案 permission_search_project: 搜尋專案 diff --git a/config/locales/zh.yml b/config/locales/zh.yml index 7d3f0692c..4fdf86a19 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -1431,7 +1431,7 @@ zh: reaction_text_x_other_users: one: 1 other other: "%{count} others" - text_setting_gravatar_default_initials_html: Users' initials are sent to https://www.gravatar.com + text_setting_gravatar_default_initials_html: Users' initials are sent to %{url} to generate their avatars. permission_view_project: View projects permission_search_project: Search projects diff --git a/test/functional/settings_controller_test.rb b/test/functional/settings_controller_test.rb index a936ff0ab..2849901ce 100644 --- a/test/functional/settings_controller_test.rb +++ b/test/functional/settings_controller_test.rb @@ -66,6 +66,20 @@ class SettingsControllerTest < Redmine::ControllerTest assert_response :success end + def test_get_edit_should_show_avatar_server_url_in_initials_info + with_settings :gravatar_enabled => '1', :gravatar_default => 'initials' do + Redmine::Configuration.with 'avatar_server_url' => 'https://seccdn.libravatar.org' do + get :edit + assert_response :success + end + end + + assert_select 'select#settings_gravatar_default + em.info' do + assert_select 'a[href=?]', 'https://seccdn.libravatar.org', :text => 'https://seccdn.libravatar.org' + assert_select 'a[href=?]', 'https://www.gravatar.com', 0 + end + end + def test_post_edit_notifications post :edit, :params => { :settings => { -- 2.55.0