<%= 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']) %>
diff --git a/config/locales/ar.yml b/config/locales/ar.yml index ec9630e..b7f0f09 100644 --- a/config/locales/ar.yml +++ b/config/locales/ar.yml @@ -1168,7 +1168,7 @@ ar: label_fields_separator: Field separator label_fields_wrapper: Field wrapper label_encoding: Encoding - label_coma_char: Coma + label_comma_char: Comma label_semi_colon_char: Semi colon label_quote_char: Quote label_double_quote_char: Double quote diff --git a/config/locales/az.yml b/config/locales/az.yml index bfbf4f3..ce278e6 100644 --- a/config/locales/az.yml +++ b/config/locales/az.yml @@ -1265,7 +1265,7 @@ az: label_fields_separator: Field separator label_fields_wrapper: Field wrapper label_encoding: Encoding - label_coma_char: Coma + label_comma_char: Comma label_semi_colon_char: Semi colon label_quote_char: Quote label_double_quote_char: Double quote diff --git a/config/locales/bg.yml b/config/locales/bg.yml index 24461d6..309faa3 100644 --- a/config/locales/bg.yml +++ b/config/locales/bg.yml @@ -1161,7 +1161,7 @@ bg: label_fields_separator: Field separator label_fields_wrapper: Field wrapper label_encoding: Encoding - label_coma_char: Coma + label_comma_char: Comma label_semi_colon_char: Semi colon label_quote_char: Quote label_double_quote_char: Double quote diff --git a/config/locales/bs.yml b/config/locales/bs.yml index c0a3ee1..d18109d 100644 --- a/config/locales/bs.yml +++ b/config/locales/bs.yml @@ -1181,7 +1181,7 @@ bs: label_fields_separator: Field separator label_fields_wrapper: Field wrapper label_encoding: Encoding - label_coma_char: Coma + label_comma_char: Comma label_semi_colon_char: Semi colon label_quote_char: Quote label_double_quote_char: Double quote diff --git a/config/locales/ca.yml b/config/locales/ca.yml index 3a791e6..3d69e70 100644 --- a/config/locales/ca.yml +++ b/config/locales/ca.yml @@ -1170,7 +1170,7 @@ ca: label_fields_separator: Field separator label_fields_wrapper: Field wrapper label_encoding: Encoding - label_coma_char: Coma + label_comma_char: Comma label_semi_colon_char: Semi colon label_quote_char: Quote label_double_quote_char: Double quote diff --git a/config/locales/cs.yml b/config/locales/cs.yml index f777d2a..6b92fe0 100644 --- a/config/locales/cs.yml +++ b/config/locales/cs.yml @@ -1169,7 +1169,7 @@ cs: label_fields_separator: Field separator label_fields_wrapper: Field wrapper label_encoding: Encoding - label_coma_char: Coma + label_comma_char: Comma label_semi_colon_char: Semi colon label_quote_char: Quote label_double_quote_char: Double quote diff --git a/config/locales/da.yml b/config/locales/da.yml index 2c1c4fe..67338e6 100644 --- a/config/locales/da.yml +++ b/config/locales/da.yml @@ -1185,7 +1185,7 @@ da: label_fields_separator: Field separator label_fields_wrapper: Field wrapper label_encoding: Encoding - label_coma_char: Coma + label_comma_char: Comma label_semi_colon_char: Semi colon label_quote_char: Quote label_double_quote_char: Double quote diff --git a/config/locales/de.yml b/config/locales/de.yml index c25c3c1..803af02 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -1177,7 +1177,7 @@ de: label_fields_separator: Field separator label_fields_wrapper: Field wrapper label_encoding: Encoding - label_coma_char: Coma + label_comma_char: Comma label_semi_colon_char: Semi colon label_quote_char: Quote label_double_quote_char: Double quote diff --git a/config/locales/el.yml b/config/locales/el.yml index de963aa..7d48a04 100644 --- a/config/locales/el.yml +++ b/config/locales/el.yml @@ -1168,7 +1168,7 @@ el: label_fields_separator: Field separator label_fields_wrapper: Field wrapper label_encoding: Encoding - label_coma_char: Coma + label_comma_char: Comma label_semi_colon_char: Semi colon label_quote_char: Quote label_double_quote_char: Double quote diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml index 7b99e67..ffc3def 100644 --- a/config/locales/en-GB.yml +++ b/config/locales/en-GB.yml @@ -1170,7 +1170,7 @@ en-GB: label_fields_separator: Field separator label_fields_wrapper: Field wrapper label_encoding: Encoding - label_coma_char: Coma + label_comma_char: Comma label_semi_colon_char: Semi colon label_quote_char: Quote label_double_quote_char: Double quote diff --git a/config/locales/en.yml b/config/locales/en.yml index 90dcb92..b81a471 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -965,7 +965,7 @@ en: label_fields_separator: Field separator label_fields_wrapper: Field wrapper label_encoding: Encoding - label_coma_char: Coma + label_comma_char: Comma label_semi_colon_char: Semi colon label_quote_char: Quote label_double_quote_char: Double quote diff --git a/config/locales/es-PA.yml b/config/locales/es-PA.yml index 0f3af6b..5b80fea 100644 --- a/config/locales/es-PA.yml +++ b/config/locales/es-PA.yml @@ -1202,7 +1202,7 @@ es-PA: label_fields_separator: Separador de Campos label_fields_wrapper: Envoltorio de Campo label_encoding: Codificación - label_coma_char: Coma + label_comma_char: Comma label_semi_colon_char: Punto y Coma label_quote_char: Comilla Simple label_double_quote_char: Comilla Doble diff --git a/config/locales/es.yml b/config/locales/es.yml index 5162469..8c59c30 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -1200,7 +1200,7 @@ es: label_fields_separator: Separador de Campos label_fields_wrapper: Envoltorio de Campo label_encoding: Codificación - label_coma_char: Coma + label_comma_char: Comma label_semi_colon_char: Punto y Coma label_quote_char: Comilla Simple label_double_quote_char: Comilla Doble diff --git a/config/locales/et.yml b/config/locales/et.yml index 5e4533f..522e586 100644 --- a/config/locales/et.yml +++ b/config/locales/et.yml @@ -1181,7 +1181,7 @@ et: label_fields_separator: Field separator label_fields_wrapper: Field wrapper label_encoding: Encoding - label_coma_char: Coma + label_comma_char: Comma label_semi_colon_char: Semi colon label_quote_char: Quote label_double_quote_char: Double quote diff --git a/config/locales/eu.yml b/config/locales/eu.yml index c265419..b4cc1e5 100644 --- a/config/locales/eu.yml +++ b/config/locales/eu.yml @@ -1169,7 +1169,7 @@ eu: label_fields_separator: Field separator label_fields_wrapper: Field wrapper label_encoding: Encoding - label_coma_char: Coma + label_comma_char: Comma label_semi_colon_char: Semi colon label_quote_char: Quote label_double_quote_char: Double quote diff --git a/config/locales/fa.yml b/config/locales/fa.yml index f26905d..b4eb427 100644 --- a/config/locales/fa.yml +++ b/config/locales/fa.yml @@ -1169,7 +1169,7 @@ fa: label_fields_separator: Field separator label_fields_wrapper: Field wrapper label_encoding: Encoding - label_coma_char: Coma + label_comma_char: Comma label_semi_colon_char: Semi colon label_quote_char: Quote label_double_quote_char: Double quote diff --git a/config/locales/fi.yml b/config/locales/fi.yml index 7f71192..404c24b 100644 --- a/config/locales/fi.yml +++ b/config/locales/fi.yml @@ -1189,7 +1189,7 @@ fi: label_fields_separator: Field separator label_fields_wrapper: Field wrapper label_encoding: Encoding - label_coma_char: Coma + label_comma_char: Comma label_semi_colon_char: Semi colon label_quote_char: Quote label_double_quote_char: Double quote diff --git a/config/locales/fr.yml b/config/locales/fr.yml index d3dc556..ad73e5b 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -983,7 +983,7 @@ fr: label_fields_separator: Séparateur de champs label_fields_wrapper: Délimiteur de texte label_encoding: Encodage - label_coma_char: Virgule + label_comma_char: Virgule label_semi_colon_char: Point virgule label_quote_char: Apostrophe label_double_quote_char: Double apostrophe diff --git a/config/locales/gl.yml b/config/locales/gl.yml index 09b35f9..38e745d 100644 --- a/config/locales/gl.yml +++ b/config/locales/gl.yml @@ -1176,7 +1176,7 @@ gl: label_fields_separator: Field separator label_fields_wrapper: Field wrapper label_encoding: Encoding - label_coma_char: Coma + label_comma_char: Comma label_semi_colon_char: Semi colon label_quote_char: Quote label_double_quote_char: Double quote diff --git a/config/locales/he.yml b/config/locales/he.yml index 1aed9c7..e798f4d 100644 --- a/config/locales/he.yml +++ b/config/locales/he.yml @@ -1173,7 +1173,7 @@ he: label_fields_separator: Field separator label_fields_wrapper: Field wrapper label_encoding: Encoding - label_coma_char: Coma + label_comma_char: Comma label_semi_colon_char: Semi colon label_quote_char: Quote label_double_quote_char: Double quote diff --git a/config/locales/hr.yml b/config/locales/hr.yml index cbf5f52..aa6ffbe 100644 --- a/config/locales/hr.yml +++ b/config/locales/hr.yml @@ -1169,7 +1169,7 @@ hr: label_fields_separator: Field separator label_fields_wrapper: Field wrapper label_encoding: Encoding - label_coma_char: Coma + label_comma_char: Comma label_semi_colon_char: Semi colon label_quote_char: Quote label_double_quote_char: Double quote diff --git a/config/locales/hu.yml b/config/locales/hu.yml index c60f171..3316012 100644 --- a/config/locales/hu.yml +++ b/config/locales/hu.yml @@ -1187,7 +1187,7 @@ label_fields_separator: Field separator label_fields_wrapper: Field wrapper label_encoding: Encoding - label_coma_char: Coma + label_comma_char: Comma label_semi_colon_char: Semi colon label_quote_char: Quote label_double_quote_char: Double quote diff --git a/config/locales/id.yml b/config/locales/id.yml index d91fdae..30477ed 100644 --- a/config/locales/id.yml +++ b/config/locales/id.yml @@ -1172,7 +1172,7 @@ id: label_fields_separator: Field separator label_fields_wrapper: Field wrapper label_encoding: Encoding - label_coma_char: Coma + label_comma_char: Comma label_semi_colon_char: Semi colon label_quote_char: Quote label_double_quote_char: Double quote diff --git a/config/locales/it.yml b/config/locales/it.yml index a7261d3..99c8e4d 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -1163,7 +1163,7 @@ it: label_fields_separator: Field separator label_fields_wrapper: Field wrapper label_encoding: Encoding - label_coma_char: Coma + label_comma_char: Comma label_semi_colon_char: Semi colon label_quote_char: Quote label_double_quote_char: Double quote diff --git a/config/locales/ja.yml b/config/locales/ja.yml index 55fccd5..4a31a92 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -1181,7 +1181,7 @@ ja: label_fields_separator: 区切り文字 label_fields_wrapper: 文字列の引用符 label_encoding: エンコーディング - label_coma_char: コンマ + label_comma_char: コンマ label_semi_colon_char: セミコロン label_quote_char: シングルクォート label_double_quote_char: ダブルクォート diff --git a/config/locales/ko.yml b/config/locales/ko.yml index e4e03f6..3991555 100644 --- a/config/locales/ko.yml +++ b/config/locales/ko.yml @@ -1212,7 +1212,7 @@ ko: label_fields_separator: Field separator label_fields_wrapper: Field wrapper label_encoding: Encoding - label_coma_char: Coma + label_comma_char: Comma label_semi_colon_char: Semi colon label_quote_char: Quote label_double_quote_char: Double quote diff --git a/config/locales/lt.yml b/config/locales/lt.yml index 91af9f9..e0d8a90 100644 --- a/config/locales/lt.yml +++ b/config/locales/lt.yml @@ -1227,7 +1227,7 @@ lt: label_fields_separator: Field separator label_fields_wrapper: Field wrapper label_encoding: Encoding - label_coma_char: Coma + label_comma_char: Comma label_semi_colon_char: Semi colon label_quote_char: Quote label_double_quote_char: Double quote diff --git a/config/locales/lv.yml b/config/locales/lv.yml index 4a01a65..78253e8 100644 --- a/config/locales/lv.yml +++ b/config/locales/lv.yml @@ -1162,7 +1162,7 @@ lv: label_fields_separator: Field separator label_fields_wrapper: Field wrapper label_encoding: Encoding - label_coma_char: Coma + label_comma_char: Comma label_semi_colon_char: Semi colon label_quote_char: Quote label_double_quote_char: Double quote diff --git a/config/locales/mk.yml b/config/locales/mk.yml index c612744..9274ecc 100644 --- a/config/locales/mk.yml +++ b/config/locales/mk.yml @@ -1168,7 +1168,7 @@ mk: label_fields_separator: Field separator label_fields_wrapper: Field wrapper label_encoding: Encoding - label_coma_char: Coma + label_comma_char: Comma label_semi_colon_char: Semi colon label_quote_char: Quote label_double_quote_char: Double quote diff --git a/config/locales/mn.yml b/config/locales/mn.yml index 68fa099..670a5e7 100644 --- a/config/locales/mn.yml +++ b/config/locales/mn.yml @@ -1169,7 +1169,7 @@ mn: label_fields_separator: Field separator label_fields_wrapper: Field wrapper label_encoding: Encoding - label_coma_char: Coma + label_comma_char: Comma label_semi_colon_char: Semi colon label_quote_char: Quote label_double_quote_char: Double quote diff --git a/config/locales/nl.yml b/config/locales/nl.yml index bfe6774..dd69d33 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -1147,7 +1147,7 @@ nl: label_fields_separator: Field separator label_fields_wrapper: Field wrapper label_encoding: Encoding - label_coma_char: Coma + label_comma_char: Comma label_semi_colon_char: Semi colon label_quote_char: Quote label_double_quote_char: Double quote diff --git a/config/locales/no.yml b/config/locales/no.yml index 60a5921..3f8b14d 100644 --- a/config/locales/no.yml +++ b/config/locales/no.yml @@ -1158,7 +1158,7 @@ label_fields_separator: Field separator label_fields_wrapper: Field wrapper label_encoding: Encoding - label_coma_char: Coma + label_comma_char: Comma label_semi_colon_char: Semi colon label_quote_char: Quote label_double_quote_char: Double quote diff --git a/config/locales/pl.yml b/config/locales/pl.yml index e0e986e..b7d4b60 100644 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -1184,7 +1184,7 @@ pl: label_fields_separator: Field separator label_fields_wrapper: Field wrapper label_encoding: Encoding - label_coma_char: Coma + label_comma_char: Comma label_semi_colon_char: Semi colon label_quote_char: Quote label_double_quote_char: Double quote diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml index d04863e..99601df 100644 --- a/config/locales/pt-BR.yml +++ b/config/locales/pt-BR.yml @@ -1187,7 +1187,7 @@ pt-BR: label_fields_separator: Field separator label_fields_wrapper: Field wrapper label_encoding: Encoding - label_coma_char: Coma + label_comma_char: Comma label_semi_colon_char: Semi colon label_quote_char: Quote label_double_quote_char: Double quote diff --git a/config/locales/pt.yml b/config/locales/pt.yml index b3cfcee..bc1db13 100644 --- a/config/locales/pt.yml +++ b/config/locales/pt.yml @@ -1170,7 +1170,7 @@ pt: label_fields_separator: Separador de campos label_fields_wrapper: Field wrapper label_encoding: Codificação - label_coma_char: Vírgula + label_comma_char: Vírgula label_semi_colon_char: Ponto e vírgula label_quote_char: Aspas label_double_quote_char: Aspas duplas diff --git a/config/locales/ro.yml b/config/locales/ro.yml index 5ff2920..eea4ccf 100644 --- a/config/locales/ro.yml +++ b/config/locales/ro.yml @@ -1163,7 +1163,7 @@ ro: label_fields_separator: Field separator label_fields_wrapper: Field wrapper label_encoding: Encoding - label_coma_char: Coma + label_comma_char: Comma label_semi_colon_char: Semi colon label_quote_char: Quote label_double_quote_char: Double quote diff --git a/config/locales/ru.yml b/config/locales/ru.yml index 972e640..ae1cc1d 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -1273,7 +1273,7 @@ ru: label_fields_separator: Field separator label_fields_wrapper: Field wrapper label_encoding: Encoding - label_coma_char: Coma + label_comma_char: Comma label_semi_colon_char: Semi colon label_quote_char: Quote label_double_quote_char: Double quote diff --git a/config/locales/sk.yml b/config/locales/sk.yml index 2477b17..86a384a 100644 --- a/config/locales/sk.yml +++ b/config/locales/sk.yml @@ -1158,7 +1158,7 @@ sk: label_fields_separator: Field separator label_fields_wrapper: Field wrapper label_encoding: Encoding - label_coma_char: Coma + label_comma_char: Comma label_semi_colon_char: Semi colon label_quote_char: Quote label_double_quote_char: Double quote diff --git a/config/locales/sl.yml b/config/locales/sl.yml index 374536b..e153fbb 100644 --- a/config/locales/sl.yml +++ b/config/locales/sl.yml @@ -1168,7 +1168,7 @@ sl: label_fields_separator: Field separator label_fields_wrapper: Field wrapper label_encoding: Encoding - label_coma_char: Coma + label_comma_char: Comma label_semi_colon_char: Semi colon label_quote_char: Quote label_double_quote_char: Double quote diff --git a/config/locales/sq.yml b/config/locales/sq.yml index 5c48b7b..486919e 100644 --- a/config/locales/sq.yml +++ b/config/locales/sq.yml @@ -1164,7 +1164,7 @@ sq: label_fields_separator: Field separator label_fields_wrapper: Field wrapper label_encoding: Encoding - label_coma_char: Coma + label_comma_char: Comma label_semi_colon_char: Semi colon label_quote_char: Quote label_double_quote_char: Double quote diff --git a/config/locales/sr-YU.yml b/config/locales/sr-YU.yml index 20ccea1..6d174a7 100644 --- a/config/locales/sr-YU.yml +++ b/config/locales/sr-YU.yml @@ -1170,7 +1170,7 @@ sr-YU: label_fields_separator: Field separator label_fields_wrapper: Field wrapper label_encoding: Encoding - label_coma_char: Coma + label_comma_char: Comma label_semi_colon_char: Semi colon label_quote_char: Quote label_double_quote_char: Double quote diff --git a/config/locales/sr.yml b/config/locales/sr.yml index 8dae055..9a524d3 100644 --- a/config/locales/sr.yml +++ b/config/locales/sr.yml @@ -1169,7 +1169,7 @@ sr: label_fields_separator: Field separator label_fields_wrapper: Field wrapper label_encoding: Encoding - label_coma_char: Coma + label_comma_char: Comma label_semi_colon_char: Semi colon label_quote_char: Quote label_double_quote_char: Double quote diff --git a/config/locales/sv.yml b/config/locales/sv.yml index fa7175c..cf8b3e8 100644 --- a/config/locales/sv.yml +++ b/config/locales/sv.yml @@ -1201,7 +1201,7 @@ sv: label_fields_separator: Field separator label_fields_wrapper: Field wrapper label_encoding: Encoding - label_coma_char: Coma + label_comma_char: Comma label_semi_colon_char: Semi colon label_quote_char: Quote label_double_quote_char: Double quote diff --git a/config/locales/th.yml b/config/locales/th.yml index 3500a16..4b4f25e 100644 --- a/config/locales/th.yml +++ b/config/locales/th.yml @@ -1165,7 +1165,7 @@ th: label_fields_separator: Field separator label_fields_wrapper: Field wrapper label_encoding: Encoding - label_coma_char: Coma + label_comma_char: Comma label_semi_colon_char: Semi colon label_quote_char: Quote label_double_quote_char: Double quote diff --git a/config/locales/tr.yml b/config/locales/tr.yml index fe179ff..fddb424 100644 --- a/config/locales/tr.yml +++ b/config/locales/tr.yml @@ -1177,7 +1177,7 @@ tr: label_fields_separator: Field separator label_fields_wrapper: Field wrapper label_encoding: Encoding - label_coma_char: Coma + label_comma_char: Comma label_semi_colon_char: Semi colon label_quote_char: Quote label_double_quote_char: Double quote diff --git a/config/locales/uk.yml b/config/locales/uk.yml index 7081978..55efd46 100644 --- a/config/locales/uk.yml +++ b/config/locales/uk.yml @@ -1163,7 +1163,7 @@ uk: label_fields_separator: Field separator label_fields_wrapper: Field wrapper label_encoding: Encoding - label_coma_char: Coma + label_comma_char: Comma label_semi_colon_char: Semi colon label_quote_char: Quote label_double_quote_char: Double quote diff --git a/config/locales/vi.yml b/config/locales/vi.yml index 5cb696b..ed34d47 100644 --- a/config/locales/vi.yml +++ b/config/locales/vi.yml @@ -1221,7 +1221,7 @@ vi: label_fields_separator: Field separator label_fields_wrapper: Field wrapper label_encoding: Encoding - label_coma_char: Coma + label_comma_char: Comma label_semi_colon_char: Semi colon label_quote_char: Quote label_double_quote_char: Double quote diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml index d36db23..e96f6d7 100644 --- a/config/locales/zh-TW.yml +++ b/config/locales/zh-TW.yml @@ -1049,7 +1049,7 @@ label_fields_separator: 欄位分隔符號 label_fields_wrapper: 欄位包裝識別符號 label_encoding: 編碼 - label_coma_char: 逗號(,) + label_comma_char: 逗號(,) label_semi_colon_char: 分號(;) label_quote_char: 引號(') label_double_quote_char: 雙引號(") diff --git a/config/locales/zh.yml b/config/locales/zh.yml index b6a2db0..74cfa10 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -1169,7 +1169,7 @@ zh: label_fields_separator: Field separator label_fields_wrapper: Field wrapper label_encoding: Encoding - label_coma_char: Coma + label_comma_char: Comma label_semi_colon_char: Semi colon label_quote_char: Quote label_double_quote_char: Double quote diff --git a/lib/redmine/wiki_formatting/macros.rb b/lib/redmine/wiki_formatting/macros.rb index 4e479b3..cae5197 100644 --- a/lib/redmine/wiki_formatting/macros.rb +++ b/lib/redmine/wiki_formatting/macros.rb @@ -92,7 +92,7 @@ module Redmine # invoked without a block of text. # # Examples: - # By default, when the macro is invoked, the coma separated list of arguments + # By default, when the macro is invoked, the comma separated list of arguments # is split and passed to the macro block as an array. If no argument is given # the macro will be invoked with an empty array: # diff --git a/test/unit/query_test.rb b/test/unit/query_test.rb index c76ad72..30db3ab 100644 --- a/test/unit/query_test.rb +++ b/test/unit/query_test.rb @@ -1050,7 +1050,7 @@ class QueryTest < ActiveSupport::TestCase end def test_sortable_columns_should_sort_assignees_according_to_user_format_setting - with_settings :user_format => 'lastname_coma_firstname' do + with_settings :user_format => 'lastname_comma_firstname' do q = IssueQuery.new assert q.sortable_columns.has_key?('assigned_to') assert_equal %w(users.lastname users.firstname users.id), q.sortable_columns['assigned_to'] @@ -1058,7 +1058,7 @@ class QueryTest < ActiveSupport::TestCase end def test_sortable_columns_should_sort_authors_according_to_user_format_setting - with_settings :user_format => 'lastname_coma_firstname' do + with_settings :user_format => 'lastname_comma_firstname' do q = IssueQuery.new assert q.sortable_columns.has_key?('author') assert_equal %w(authors.lastname authors.firstname authors.id), q.sortable_columns['author'] diff --git a/test/unit/user_test.rb b/test/unit/user_test.rb index 831ff57..bc625c4 100644 --- a/test/unit/user_test.rb +++ b/test/unit/user_test.rb @@ -511,7 +511,7 @@ class UserTest < ActiveSupport::TestCase def test_name_format assert_equal 'John S.', @jsmith.name(:firstname_lastinitial) - assert_equal 'Smith, John', @jsmith.name(:lastname_coma_firstname) + assert_equal 'Smith, John', @jsmith.name(:lastname_comma_firstname) assert_equal 'J. Smith', @jsmith.name(:firstinitial_lastname) assert_equal 'J.-P. Lang', User.new(:firstname => 'Jean-Philippe', :lastname => 'Lang').name(:firstinitial_lastname) end @@ -560,7 +560,7 @@ class UserTest < ActiveSupport::TestCase end def test_fields_for_order_statement_should_return_fields_according_user_format_setting - with_settings :user_format => 'lastname_coma_firstname' do + with_settings :user_format => 'lastname_comma_firstname' do assert_equal ['users.lastname', 'users.firstname', 'users.id'], User.fields_for_order_statement end