### Eclipse Workspace Patch 1.0 #P Redmine Index: config/locales/sv.yml =================================================================== --- config/locales/sv.yml (revision 2632) +++ config/locales/sv.yml (working copy) @@ -338,7 +338,7 @@ setting_mail_handler_api_enabled: Aktivera WS för inkommande mail setting_mail_handler_api_key: API-nyckel setting_sequential_project_identifiers: Generera projektidentifierare sekventiellt - setting_gravatar_enabled: Använd Gravatar-avatarer + setting_avatars_enabled: Använd Gravatar-avatarer setting_diff_max_lines_displayed: Maximalt antal synliga rader i diff setting_file_max_size_displayed: Maxstorlek på textfiler som visas inline setting_repository_log_display_limit: Maximalt antal revisioner i filloggen Index: config/locales/zh-TW.yml =================================================================== --- config/locales/zh-TW.yml (revision 2632) +++ config/locales/zh-TW.yml (working copy) @@ -387,7 +387,7 @@ setting_mail_handler_api_enabled: 啟用處理傳入電子郵件的服務 setting_mail_handler_api_key: API 金鑰 setting_sequential_project_identifiers: 循序產生專案識別碼 - setting_gravatar_enabled: 啟用 Gravatar 全球認證大頭像 + setting_avatars_enabled: 啟用 Gravatar 全球認證大頭像 setting_diff_max_lines_displayed: 差異顯示行數之最大值 setting_file_max_size_displayed: 檔案內容顯示大小之最大值 setting_repository_log_display_limit: 版次顯示數目之最大值 Index: public/stylesheets/application.css =================================================================== --- public/stylesheets/application.css (revision 2632) +++ public/stylesheets/application.css (working copy) @@ -666,19 +666,19 @@ .icon22-settings { background-image: url(../images/22x22/settings.png); } .icon22-plugin { background-image: url(../images/22x22/plugin.png); } -img.gravatar { +img.avatar { padding: 2px; border: solid 1px #d5d5d5; background: #fff; } -div.issue img.gravatar { +div.issue img.avatar { float: right; margin: 0 0 0 1em; padding: 5px; } -div.issue table img.gravatar { +div.issue table img.avatar { height: 14px; width: 14px; padding: 2px; @@ -686,18 +686,18 @@ margin: 0 0.5em 0 0; } -#history img.gravatar { +#history img.avatar { padding: 3px; margin: 0 1.5em 1em 0; float: left; } -td.username img.gravatar { +td.username img.avatar { float: left; margin: 0 1em 0 0; } -#activity dt img.gravatar { +#activity dt img.avatar { float: left; margin: 0 1em 1em 0; } Index: config/locales/gl.yml =================================================================== --- config/locales/gl.yml (revision 2632) +++ config/locales/gl.yml (working copy) @@ -728,7 +728,7 @@ setting_emails_footer: Pe de mensaxes setting_enabled_scm: Activar SCM setting_feeds_limit: Límite de contido para sindicación - setting_gravatar_enabled: Usar iconas de usuario (Gravatar) + setting_avatars_enabled: Usar iconas de usuario (Gravatar) setting_host_name: Nome e ruta do servidor setting_issue_list_default_columns: Columnas por defecto para a lista de peticións setting_issues_export_limit: Límite de exportación de peticións Index: config/locales/pt.yml =================================================================== --- config/locales/pt.yml (revision 2632) +++ config/locales/pt.yml (working copy) @@ -780,7 +780,7 @@ permission_rename_wiki_pages: Renomear páginas de wiki permission_edit_time_entries: Editar entradas de tempo permission_edit_own_issue_notes: Editar as prórpias notas - setting_gravatar_enabled: Utilizar icons Gravatar + setting_avatars_enabled: Utilizar icons Gravatar label_example: Exemplo text_repository_usernames_mapping: "Seleccionar ou actualizar o utilizador de Redmine mapeado a cada nome de utilizador encontrado no repositório.\nUtilizadores com o mesmo nome de utilizador ou email no Redmine e no repositório são mapeados automaticamente." permission_edit_own_messages: Editar as próprias mensagens Index: app/views/settings/_display.rhtml =================================================================== --- app/views/settings/_display.rhtml (revision 2632) +++ app/views/settings/_display.rhtml (working copy) @@ -16,8 +16,8 @@

<%= select_tag 'settings[user_format]', options_for_select( @options[:user_format], Setting.user_format.to_s ) %>

-

-<%= check_box_tag 'settings[gravatar_enabled]', 1, Setting.gravatar_enabled? %><%= hidden_field_tag 'settings[gravatar_enabled]', 0 %>

+

+<%= check_box_tag 'settings[avatars_enabled]', 1, Setting.avatars_enabled? %><%= hidden_field_tag 'settings[avatars_enabled]', 0 %>

<%= submit_tag l(:button_save) %> Index: test/fixtures/diffs/subversion.diff =================================================================== --- test/fixtures/diffs/subversion.diff (revision 2632) +++ test/fixtures/diffs/subversion.diff (working copy) @@ -9,8 +9,8 @@ +

+<%= text_field_tag 'settings[diff_max_lines_displayed]', Setting.diff_max_lines_displayed, :size => 6 %>

+ -

- <%= check_box_tag 'settings[gravatar_enabled]', 1, Setting.gravatar_enabled? %><%= hidden_field_tag 'settings[gravatar_enabled]', 0 %>

+

+ <%= check_box_tag 'settings[avatars_enabled]', 1, Setting.avatars_enabled? %><%= hidden_field_tag 'settings[avatars_enabled]', 0 %>

Index: app/views/common/_diff.rhtml =================================================================== Index: config/locales/ja.yml =================================================================== --- config/locales/ja.yml (revision 2632) +++ config/locales/ja.yml (working copy) @@ -787,7 +787,7 @@ permission_rename_wiki_pages: Rename wiki pages permission_edit_time_entries: Edit time logs permission_edit_own_issue_notes: Edit own notes - setting_gravatar_enabled: Gravatarユーザーアイコンを使用する + setting_avatars_enabled: Gravatarユーザーアイコンを使用する label_example: 例 text_repository_usernames_mapping: "リポジトリのログから検出されたユーザー名をどのRedmineユーザーに関連づけるのか選択してください。\nログ上のユーザー名またはメールアドレスがRedmineのユーザーと一致する場合は自動的に関連づけられます。" permission_edit_own_messages: Edit own messages Index: config/locales/fr.yml =================================================================== --- config/locales/fr.yml (revision 2632) +++ config/locales/fr.yml (working copy) @@ -312,7 +312,7 @@ setting_mail_handler_api_enabled: "Activer le WS pour la réception d'emails" setting_mail_handler_api_key: Clé de protection de l'API setting_sequential_project_identifiers: Générer des identifiants de projet séquentiels - setting_gravatar_enabled: Afficher les Gravatar des utilisateurs + setting_avatars_enabled: Afficher les Gravatar des utilisateurs setting_diff_max_lines_displayed: Nombre maximum de lignes de diff affichées setting_file_max_size_displayed: Taille maximum des fichiers texte affichés en ligne setting_repository_log_display_limit: "Nombre maximum de revisions affichées sur l'historique d'un fichier" Index: config/locales/bg.yml =================================================================== --- config/locales/bg.yml (revision 2632) +++ config/locales/bg.yml (working copy) @@ -756,7 +756,7 @@ permission_rename_wiki_pages: Rename wiki pages permission_edit_time_entries: Edit time logs permission_edit_own_issue_notes: Edit own notes - setting_gravatar_enabled: Use Gravatar user icons + setting_avatars_enabled: Use Gravatar user icons label_example: Example text_repository_usernames_mapping: "Select ou update the Redmine user mapped to each username found in the repository log.\nUsers with the same Redmine and repository username or email are automatically mapped." permission_edit_own_messages: Edit own messages Index: config/locales/it.yml =================================================================== --- config/locales/it.yml (revision 2632) +++ config/locales/it.yml (working copy) @@ -774,7 +774,7 @@ permission_rename_wiki_pages: Rinomina pagine wiki permission_edit_time_entries: Modifica time logs permission_edit_own_issue_notes: Modifica proprie note - setting_gravatar_enabled: Usa icone utente Gravatar + setting_avatars_enabled: Usa icone utente Gravatar label_example: Esempio text_repository_usernames_mapping: "Seleziona per aggiornare la corrispondenza tra gli utenti Redmine e quelli presenti nel log del repository.\nGli utenti Redmine e repository con lo stesso username o email sono mappati automaticamente." permission_edit_own_messages: Modifica propri messaggi Index: config/locales/ru.yml =================================================================== --- config/locales/ru.yml (revision 2632) +++ config/locales/ru.yml (working copy) @@ -823,7 +823,7 @@ setting_emails_footer: Подстрочные примечания Email setting_enabled_scm: Разрешенные SCM setting_feeds_limit: Ограничение количества заголовков для RSS потока - setting_gravatar_enabled: Использовать аватар пользователя из Gravatar + setting_avatars_enabled: Использовать аватар пользователя из Gravatar setting_host_name: Имя компьютера setting_issue_list_default_columns: Колонки, отображаемые в списке задач по умолчанию setting_issues_export_limit: Ограничение по экспортируемым задачам Index: config/locales/no.yml =================================================================== --- config/locales/no.yml (revision 2632) +++ config/locales/no.yml (working copy) @@ -761,7 +761,7 @@ permission_rename_wiki_pages: Rename wiki pages permission_edit_time_entries: Edit time logs permission_edit_own_issue_notes: Edit own notes - setting_gravatar_enabled: Use Gravatar user icons + setting_avatars_enabled: Use Gravatar user icons label_example: Example text_repository_usernames_mapping: "Select ou update the Redmine user mapped to each username found in the repository log.\nUsers with the same Redmine and repository username or email are automatically mapped." permission_edit_own_messages: Edit own messages Index: config/locales/bs.yml =================================================================== --- config/locales/bs.yml (revision 2632) +++ config/locales/bs.yml (working copy) @@ -308,7 +308,7 @@ setting_mail_handler_api_enabled: Omogući automatsku obradu ulaznih emailova setting_mail_handler_api_key: API ključ (obrada ulaznih mailova) setting_sequential_project_identifiers: Generiši identifikatore projekta sekvencijalno - setting_gravatar_enabled: 'Koristi "gravatar" korisničke ikone' + setting_avatars_enabled: 'Koristi "gravatar" korisničke ikone' setting_diff_max_lines_displayed: Maksimalan broj linija za prikaz razlika između dva fajla setting_file_max_size_displayed: Maksimalna veličina fajla kod prikaza razlika unutar fajla (inline) setting_repository_log_display_limit: Maksimalna veličina revizija prikazanih na log fajlu Index: config/locales/de.yml =================================================================== --- config/locales/de.yml (revision 2632) +++ config/locales/de.yml (working copy) @@ -305,7 +305,7 @@ setting_mail_handler_api_enabled: Abruf eingehender E-Mails aktivieren setting_mail_handler_api_key: API-Schlüssel setting_sequential_project_identifiers: Fortlaufende Projektkennungen generieren - setting_gravatar_enabled: Gravatar Benutzerbilder benutzen + setting_avatars_enabled: Gravatar Benutzerbilder benutzen setting_diff_max_lines_displayed: Maximale Anzahl anzuzeigender Diff-Zeilen permission_edit_project: Projekt bearbeiten Index: config/locales/nl.yml =================================================================== --- config/locales/nl.yml (revision 2632) +++ config/locales/nl.yml (working copy) @@ -684,7 +684,7 @@ setting_emails_footer: E-mails footer setting_enabled_scm: SCM ingeschakeld setting_feeds_limit: Feedinhoudlimiet - setting_gravatar_enabled: Gebruik Gravatar gebruikersiconen + setting_avatars_enabled: Gebruik Gravatar gebruikersiconen setting_host_name: Hostnaam setting_issue_list_default_columns: Standaardkolommen getoond op de lijst met issues setting_issues_export_limit: Limiet export issues Index: config/locales/cs.yml =================================================================== --- config/locales/cs.yml (revision 2632) +++ config/locales/cs.yml (working copy) @@ -761,7 +761,7 @@ permission_rename_wiki_pages: Rename wiki pages permission_edit_time_entries: Edit time logs permission_edit_own_issue_notes: Edit own notes - setting_gravatar_enabled: Use Gravatar user icons + setting_avatars_enabled: Use Gravatar user icons label_example: Example text_repository_usernames_mapping: "Select ou update the Redmine user mapped to each username found in the repository log.\nUsers with the same Redmine and repository username or email are automatically mapped." permission_edit_own_messages: Edit own messages Index: config/settings.yml =================================================================== --- config/settings.yml (revision 2632) +++ config/settings.yml (working copy) @@ -146,7 +146,7 @@ default: |- You have received this notification because you have either subscribed to it, or are involved in it. To change your notification preferences, please click here: http://hostname/my/account -gravatar_enabled: +avatars_enabled: default: 0 openid: default: 0 Index: config/locales/fi.yml =================================================================== --- config/locales/fi.yml (revision 2632) +++ config/locales/fi.yml (working copy) @@ -799,7 +799,7 @@ permission_rename_wiki_pages: Uudelleennimeä wiki sivuja permission_edit_time_entries: Muokkaa aika lokeja permission_edit_own_issue_notes: Muokkaa omia muistiinpanoja - setting_gravatar_enabled: Käytä Gravatar käyttäjä ikoneita + setting_avatars_enabled: Käytä Gravatar käyttäjä ikoneita label_example: Esimerkki text_repository_usernames_mapping: "Valitse päivittääksesi Redmine käyttäjä jokaiseen käyttäjään joka löytyy tietovaraston lokista.\nKäyttäjät joilla on sama Redmine ja tietovaraston käyttäjänimi tai sähköpostiosoite, yhdistetään automaattisesti." permission_edit_own_messages: Muokkaa omia viestejä Index: config/locales/hu.yml =================================================================== --- config/locales/hu.yml (revision 2632) +++ config/locales/hu.yml (working copy) @@ -794,7 +794,7 @@ permission_rename_wiki_pages: Wiki oldalak átnevezése permission_edit_time_entries: Időnaplók szerkesztése permission_edit_own_issue_notes: Saját jegyzetek szerkesztése - setting_gravatar_enabled: Felhasználói fényképek engedélyezése + setting_avatars_enabled: Felhasználói fényképek engedélyezése label_example: Példa text_repository_usernames_mapping: "Állítsd be a felhasználó összerendeléseket a Redmine, és a tároló logban található felhasználók között.\nAz azonos felhasználó nevek összerendelése automatikusan megtörténik." permission_edit_own_messages: Saját üzenetek szerkesztése Index: config/locales/sr.yml =================================================================== --- config/locales/sr.yml (revision 2632) +++ config/locales/sr.yml (working copy) @@ -783,7 +783,7 @@ permission_rename_wiki_pages: Rename wiki pages permission_edit_time_entries: Edit time logs permission_edit_own_issue_notes: Edit own notes - setting_gravatar_enabled: Use Gravatar user icons + setting_avatars_enabled: Use Gravatar user icons permission_edit_own_messages: Edit own messages permission_delete_own_messages: Delete own messages text_repository_usernames_mapping: "Select or update the Redmine user mapped to each username found in the repository log.\nUsers with the same Redmine and repository username or email are automatically mapped." Index: config/locales/he.yml =================================================================== --- config/locales/he.yml (revision 2632) +++ config/locales/he.yml (working copy) @@ -771,7 +771,7 @@ permission_rename_wiki_pages: שנה שם של דפי wiki permission_edit_time_entries: ערוך רישום זמנים permission_edit_own_issue_notes: Edit own notes - setting_gravatar_enabled: Use Gravatar user icons + setting_avatars_enabled: Use Gravatar user icons label_example: דוגמא text_repository_usernames_mapping: "Select ou update the Redmine user mapped to each username found in the repository log.\nUsers with the same Redmine and repository username or email are automatically mapped." permission_edit_own_messages: ערוך הודעות של עצמך Index: config/locales/es.yml =================================================================== --- config/locales/es.yml (revision 2632) +++ config/locales/es.yml (working copy) @@ -749,7 +749,7 @@ setting_emails_footer: Pie de mensajes setting_enabled_scm: Activar SCM setting_feeds_limit: Límite de contenido para sindicación - setting_gravatar_enabled: Usar iconos de usuario (Gravatar) + setting_avatars_enabled: Usar iconos de usuario (Gravatar) setting_host_name: Nombre y ruta del servidor setting_issue_list_default_columns: Columnas por defecto para la lista de peticiones setting_issues_export_limit: Límite de exportación de peticiones Index: config/locales/da.yml =================================================================== --- config/locales/da.yml (revision 2632) +++ config/locales/da.yml (working copy) @@ -774,7 +774,7 @@ label_and_its_subprojects: "{{value}} og dets underprojekter" permission_view_calendar: Se kalender button_create_and_continue: Opret og fortsæt - setting_gravatar_enabled: Anvend Gravatar bruger ikoner + setting_avatars_enabled: Anvend Gravatar bruger ikoner label_updated_time_by: "Opdateret af {{author}} for {{age}} siden" text_diff_truncated: '... Listen over forskelle er bleve afkortet fordi den overstiger den maksimale størrelse der kan vises.' text_user_wrote: "{{value}} skrev:" Index: config/locales/sk.yml =================================================================== --- config/locales/sk.yml (revision 2632) +++ config/locales/sk.yml (working copy) @@ -760,7 +760,7 @@ permission_rename_wiki_pages: Premenovanie Wiki strániek permission_edit_time_entries: Editácia časových záznamov permission_edit_own_issue_notes: Editácia vlastných poznámok úlohy - setting_gravatar_enabled: Použitie užívateľských Gravatar ikon + setting_avatars_enabled: Použitie užívateľských Gravatar ikon permission_edit_own_messages: Úprava vlastných správ permission_delete_own_messages: Mazanie vlastných správ text_repository_usernames_mapping: "Vyberte alebo doplňte užívateľov systému Redmine, ktorí majú byť namapovaní k užívateľským menám, nájdeným v logu repository.\nUžívatelia s rovnakým prihlasovacím menom alebo emailom v systéme Redmine a repository sú mapovaní automaticky." Index: config/locales/th.yml =================================================================== --- config/locales/th.yml (revision 2632) +++ config/locales/th.yml (working copy) @@ -759,7 +759,7 @@ permission_rename_wiki_pages: Rename wiki pages permission_edit_time_entries: Edit time logs permission_edit_own_issue_notes: Edit own notes - setting_gravatar_enabled: Use Gravatar user icons + setting_avatars_enabled: Use Gravatar user icons label_example: Example text_repository_usernames_mapping: "Select ou update the Redmine user mapped to each username found in the repository log.\nUsers with the same Redmine and repository username or email are automatically mapped." permission_edit_own_messages: Edit own messages Index: config/locales/ca.yml =================================================================== --- config/locales/ca.yml (revision 2632) +++ config/locales/ca.yml (working copy) @@ -280,7 +280,7 @@ setting_mail_handler_api_enabled: "Habilita el WS per correus electrònics d'entrada" setting_mail_handler_api_key: Clau API setting_sequential_project_identifiers: Genera identificadors de projecte seqüencials - setting_gravatar_enabled: "Utilitza les icones d'usuari Gravatar" + setting_avatars_enabled: "Utilitza les icones d'usuari Gravatar" setting_diff_max_lines_displayed: Número màxim de línies amb diferències mostrades setting_file_max_size_displayed: Mida màxima dels fitxers de text mostrats en línia setting_repository_log_display_limit: Número màxim de revisions que es mostren al registre de fitxers Index: config/locales/lt.yml =================================================================== --- config/locales/lt.yml (revision 2632) +++ config/locales/lt.yml (working copy) @@ -315,7 +315,7 @@ setting_mail_handler_api_enabled: Įgalinti WS įeinantiems laiškams setting_mail_handler_api_key: API raktas setting_sequential_project_identifiers: Generuoti nuoseklus projekto identifikatorius - setting_gravatar_enabled: Naudoti Gravatar vartotojo ikonkės + setting_avatars_enabled: Naudoti Gravatar vartotojo ikonkės setting_diff_max_lines_displayed: Maksimalus rodomas eilučiu skaičius diff\'e permission_edit_project: Edit project Index: config/locales/pl.yml =================================================================== --- config/locales/pl.yml (revision 2632) +++ config/locales/pl.yml (working copy) @@ -728,7 +728,7 @@ setting_emails_footer: Stopka e-mail setting_enabled_scm: Dostępny SCM setting_feeds_limit: Limit danych RSS - setting_gravatar_enabled: Używaj ikon użytkowników Gravatar + setting_avatars_enabled: Używaj ikon użytkowników Gravatar setting_host_name: Nazwa hosta i ścieżka setting_issue_list_default_columns: Domyślne kolumny wiświetlane na liście zagadnień setting_issues_export_limit: Limit eksportu zagadnień Index: config/locales/tr.yml =================================================================== --- config/locales/tr.yml (revision 2632) +++ config/locales/tr.yml (working copy) @@ -795,7 +795,7 @@ permission_rename_wiki_pages: Rename wiki pages permission_edit_time_entries: Edit time logs permission_edit_own_issue_notes: Edit own notes - setting_gravatar_enabled: Use Gravatar user icons + setting_avatars_enabled: Use Gravatar user icons label_example: Example text_repository_usernames_mapping: "Select ou update the Redmine user mapped to each username found in the repository log.\nUsers with the same Redmine and repository username or email are automatically mapped." permission_edit_own_messages: Edit own messages Index: config/locales/pt-BR.yml =================================================================== --- config/locales/pt-BR.yml (revision 2632) +++ config/locales/pt-BR.yml (working copy) @@ -794,7 +794,7 @@ permission_rename_wiki_pages: Renomear páginas wiki permission_edit_time_entries: Editar tempo gasto permission_edit_own_issue_notes: Editar próprias notas - setting_gravatar_enabled: Usar ícones do Gravatar + setting_avatars_enabled: Usar ícones do Gravatar label_example: Exemplo text_repository_usernames_mapping: "Seleciona ou atualiza os usuários do Redmine mapeando para cada usuário encontrado no log do repositório.\nUsuários com o mesmo login ou email no Redmine e no repositório serão mapeados automaticamente." permission_edit_own_messages: Editar próprias mensagens Index: app/helpers/application_helper.rb =================================================================== --- app/helpers/application_helper.rb (revision 2632) +++ app/helpers/application_helper.rb (working copy) @@ -23,7 +23,6 @@ module ApplicationHelper include Redmine::WikiFormatting::Macros::Definitions include Redmine::I18n - include GravatarHelper::PublicMethods extend Forwardable def_delegators :wiki_helper, :wikitoolbar_for, :heads_for_wiki_formatter @@ -626,14 +625,8 @@ # Returns the avatar image tag for the given +user+ if avatars are enabled # +user+ can be a User or a string that will be scanned for an email address (eg. 'joe ') def avatar(user, options = { }) - if Setting.gravatar_enabled? - email = nil - if user.respond_to?(:mail) - email = user.mail - elsif user.to_s =~ %r{<(.+?)>} - email = $1 - end - return gravatar(email.to_s.downcase, options) unless email.blank? rescue nil + if Setting.avatars_enabled? + return call_hook(:render_avatar, :user => user) rescue nil end end Index: config/locales/ko.yml =================================================================== --- config/locales/ko.yml (revision 2632) +++ config/locales/ko.yml (working copy) @@ -818,7 +818,7 @@ permission_rename_wiki_pages: 위키 페이지 이름변경 permission_edit_time_entries: 시간기록 편집 permission_edit_own_issue_notes: 내 덧글 편집 - setting_gravatar_enabled: 그라바타 사용자 아이콘 쓰기 + setting_avatars_enabled: 그라바타 사용자 아이콘 쓰기 label_example: 예 text_repository_usernames_mapping: "저장소 로그에서 발견된 각 사용자에 레드마인 사용자를 업데이트할때 선택합니다.\n레드마인과 저장소의 이름이나 이메일이 같은 사용자가 자동으로 연결됩니다." permission_edit_own_messages: 자기 메시지 편집 Index: config/locales/uk.yml =================================================================== --- config/locales/uk.yml (revision 2632) +++ config/locales/uk.yml (working copy) @@ -758,7 +758,7 @@ permission_rename_wiki_pages: Rename wiki pages permission_edit_time_entries: Edit time logs permission_edit_own_issue_notes: Edit own notes - setting_gravatar_enabled: Use Gravatar user icons + setting_avatars_enabled: Use Gravatar user icons label_example: Example text_repository_usernames_mapping: "Select ou update the Redmine user mapped to each username found in the repository log.\nUsers with the same Redmine and repository username or email are automatically mapped." permission_edit_own_messages: Edit own messages Index: config/locales/zh.yml =================================================================== --- config/locales/zh.yml (revision 2632) +++ config/locales/zh.yml (working copy) @@ -312,7 +312,7 @@ setting_mail_handler_api_enabled: 启用用于接收邮件的服务 setting_mail_handler_api_key: API key setting_sequential_project_identifiers: 顺序产生项目标识 - setting_gravatar_enabled: 使用Gravatar用户头像 + setting_avatars_enabled: 使用Gravatar用户头像 setting_diff_max_lines_displayed: 查看差别页面上显示的最大行数 setting_file_max_size_displayed: 允许直接显示的最大文本文件 setting_repository_log_display_limit: 在文件变更记录页面上显示的最大修订版本数量 Index: config/locales/ro.yml =================================================================== --- config/locales/ro.yml (revision 2632) +++ config/locales/ro.yml (working copy) @@ -278,7 +278,7 @@ setting_mail_handler_api_enabled: Activeaza WS pentru e-mail-uri intrate setting_mail_handler_api_key: cheie API setting_sequential_project_identifiers: Genereaza secvential identificatoarele de proiect - setting_gravatar_enabled: Foloseste poze Gravatar pentru utilizatori + setting_avatars_enabled: Foloseste poze Gravatar pentru utilizatori setting_diff_max_lines_displayed: Numar maxim de linii de diferenta afisate setting_file_max_size_displayed: Numar maxim de fisiere text afisate in pagina (inline) setting_repository_log_display_limit: Numar maxim de revizii afisate in istoricul fisierului Index: test/unit/helpers/application_helper_test.rb =================================================================== --- test/unit/helpers/application_helper_test.rb (revision 2632) +++ test/unit/helpers/application_helper_test.rb (working copy) @@ -408,14 +408,14 @@ def test_avatar # turn on avatars - Setting.gravatar_enabled = '1' + Setting.avatars_enabled = '1' assert avatar(User.find_by_mail('jsmith@somenet.foo')).include?(Digest::MD5.hexdigest('jsmith@somenet.foo')) assert avatar('jsmith ').include?(Digest::MD5.hexdigest('jsmith@somenet.foo')) assert_nil avatar('jsmith') assert_nil avatar(nil) # turn off avatars - Setting.gravatar_enabled = '0' + Setting.avatars_enabled = '0' assert_nil avatar(User.find_by_mail('jsmith@somenet.foo')) end end Index: config/locales/vi.yml =================================================================== --- config/locales/vi.yml (revision 2632) +++ config/locales/vi.yml (working copy) @@ -781,7 +781,7 @@ enumeration_activities: Hoạt động (theo dõi thời gian) setting_plain_text_mail: mail dạng text đơn giản (không dùng HTML) - setting_gravatar_enabled: Dùng biểu tượng Gravatar + setting_avatars_enabled: Dùng biểu tượng Gravatar permission_edit_project: Chỉnh dự án permission_select_project_modules: Chọn mô-đun permission_manage_members: Quản lý thành viên Index: config/locales/sl.yml =================================================================== --- config/locales/sl.yml (revision 2632) +++ config/locales/sl.yml (working copy) @@ -274,7 +274,7 @@ setting_mail_handler_api_enabled: Omogoči WS za prihajajočo e-pošto setting_mail_handler_api_key: API ključ setting_sequential_project_identifiers: Generiraj projektne identifikatorje sekvenčno - setting_gravatar_enabled: Uporabljaj Gravatar ikone + setting_avatars_enabled: Uporabljaj Gravatar ikone setting_diff_max_lines_displayed: Maksimalno število prikazanih vrstic različnosti permission_edit_project: Uredi projekt Index: config/locales/en.yml =================================================================== --- config/locales/en.yml (revision 2632) +++ config/locales/en.yml (working copy) @@ -280,7 +280,7 @@ setting_mail_handler_api_enabled: Enable WS for incoming emails setting_mail_handler_api_key: API key setting_sequential_project_identifiers: Generate sequential project identifiers - setting_gravatar_enabled: Use Gravatar user icons + setting_avatars_enabled: Use Gravatar user icons 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