diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2015-10-20 18:26:28 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2015-10-20 18:26:28 +0000 |
| commit | 11bce09825f4b8f72bfb5c9ae0b864574e948b3e (patch) | |
| tree | a6e9e3b3e614c8cfd7f8589d8af7150f23574542 /app | |
| parent | 84ca9ac7fdb875ee0effaedff4fa48dd38713e35 (diff) | |
| download | redmine-11bce09825f4b8f72bfb5c9ae0b864574e948b3e.tar.gz redmine-11bce09825f4b8f72bfb5c9ae0b864574e948b3e.zip | |
Typo "coma" (#20551).
Patch by budo kaiman.
git-svn-id: http://svn.redmine.org/redmine/trunk@14712 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/user.rb | 2 | ||||
| -rw-r--r-- | app/views/imports/settings.html.erb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index b6aafdc0e..e133cd02e 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -47,7 +47,7 @@ class User < Principal :order => %w(lastname firstname id), :setting_order => 4 }, - :lastname_coma_firstname => { + :lastname_comma_firstname => { :string => '#{lastname}, #{firstname}', :order => %w(lastname firstname id), :setting_order => 5 diff --git a/app/views/imports/settings.html.erb b/app/views/imports/settings.html.erb index 0bc87dd9c..374dba5b1 100644 --- a/app/views/imports/settings.html.erb +++ b/app/views/imports/settings.html.erb @@ -6,7 +6,7 @@ <p> <label><%= l(:label_fields_separator) %></label> <%= select_tag 'import_settings[separator]', - options_for_select([[l(:label_coma_char), ','], [l(:label_semi_colon_char), ';']], @import.settings['separator']) %> + options_for_select([[l(:label_comma_char), ','], [l(:label_semi_colon_char), ';']], @import.settings['separator']) %> </p> <p> <label><%= l(:label_fields_wrapper) %></label> |