Patch #2734 » gravatar_schemes.diff
app/helpers/application_helper.rb (working copy) | ||
---|---|---|
609 | 609 |
def avatar(user, options = { }) |
610 | 610 |
if Setting.gravatar_enabled? |
611 | 611 |
email = nil |
612 |
options[:default] = Setting.gravatar_default |
|
612 | 613 |
if user.respond_to?(:mail) |
613 | 614 |
email = user.mail |
614 | 615 |
elsif user.to_s =~ %r{<(.+?)>} |
app/views/settings/_general.rhtml (working copy) | ||
---|---|---|
53 | 53 | |
54 | 54 |
<p><label><%= l(:setting_gravatar_enabled) %></label> |
55 | 55 |
<%= check_box_tag 'settings[gravatar_enabled]', 1, Setting.gravatar_enabled? %><%= hidden_field_tag 'settings[gravatar_enabled]', 0 %></p> |
56 | ||
57 |
<p><label><%= l(:setting_gravatar_default) %></label> |
|
58 |
<%= select_tag 'settings[gravatar_default]', options_for_select(['wavatar', 'identicon', 'monsterid'], Setting.gravatar_default) %></p> |
|
56 | 59 |
</div> |
57 | 60 | |
58 | 61 |
<%= submit_tag l(:button_save) %> |
lang/en.yml (working copy) | ||
---|---|---|
225 | 225 |
setting_mail_handler_api_key: API key |
226 | 226 |
setting_sequential_project_identifiers: Generate sequential project identifiers |
227 | 227 |
setting_gravatar_enabled: Use Gravatar user icons |
228 |
setting_gravatar_default: Default Gravatars |
|
228 | 229 |
setting_diff_max_lines_displayed: Max number of diff lines displayed |
229 | 230 | |
230 | 231 |
permission_edit_project: Edit project |
lang/de.yml (working copy) | ||
---|---|---|
223 | 223 |
setting_mail_handler_api_key: API-Schlüssel |
224 | 224 |
setting_sequential_project_identifiers: Fortlaufende Projektkennungen generieren |
225 | 225 |
setting_gravatar_enabled: Gravatar Benutzerbilder benutzen |
226 |
setting_gravatar_default: Standard Gravatarschema |
|
226 | 227 |
setting_diff_max_lines_displayed: Maximale Anzahl anzuzeigender Diff-Zeilen |
227 | 228 | |
228 | 229 |
permission_edit_project: Projekt bearbeiten |
lang/fr.yml (working copy) | ||
---|---|---|
225 | 225 |
setting_mail_handler_api_key: Clé de protection de l'API |
226 | 226 |
setting_sequential_project_identifiers: Générer des identifiants de projet séquentiels |
227 | 227 |
setting_gravatar_enabled: Afficher les Gravatar des utilisateurs |
228 |
setting_gravatar_default: Gravatar par défaut |
|
228 | 229 |
setting_diff_max_lines_displayed: Nombre maximum de lignes de diff affichées |
229 | 230 | |
230 | 231 |
permission_edit_project: Modifier le projet |
config/settings.yml (working copy) | ||
---|---|---|
140 | 140 |
To change your notification preferences, please click here: http://hostname/my/account |
141 | 141 |
gravatar_enabled: |
142 | 142 |
default: 0 |
143 |
gravatar_default: |
|
144 |
default: 'wavatar' |