diff options
54 files changed, 56 insertions, 56 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> diff --git a/config/locales/ar.yml b/config/locales/ar.yml index ec9630eb0..b7f0f099b 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 bfbf4f347..ce278e65c 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 24461d639..309faa32c 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 c0a3ee144..d18109d12 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 3a791e6a1..3d69e70f0 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 f777d2a24..6b92fe037 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 2c1c4feea..67338e663 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 c25c3c14b..803af025f 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 de963aac6..7d48a042b 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 7b99e67bf..ffc3defd3 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 90dcb9212..b81a471f4 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 0f3af6bd6..5b80feaf3 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 516246972..8c59c30ea 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 5e4533f49..522e5864f 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 c265419da..b4cc1e597 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 f26905d2d..b4eb4274c 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 7f7119285..404c24bde 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 d3dc55608..ad73e5bb9 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 09b35f9a1..38e745d82 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 1aed9c7bc..e798f4d76 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 cbf5f5262..aa6ffbeaf 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 c60f1716f..331601235 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 d91fdae60..30477edf6 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 a7261d33b..99c8e4da6 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 55fccd5fe..4a31a92ad 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 e4e03f67b..39915552a 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 91af9f98c..e0d8a905a 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 4a01a65d5..78253e8aa 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 c61274475..9274eccad 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 68fa09917..670a5e7d8 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 bfe677422..dd69d33d0 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 60a59217c..3f8b14d8b 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 e0e986ea3..b7d4b602c 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 d04863e2c..99601dfed 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 b3cfceeec..bc1db13f6 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 5ff29206d..eea4ccf40 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 972e6409c..ae1cc1dad 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 2477b17b1..86a384a7e 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 374536bec..e153fbbcb 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 5c48b7b05..486919ed1 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 20ccea1dd..6d174a7ad 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 8dae0558c..9a524d364 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 fa7175c86..cf8b3e80b 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 3500a16d6..4b4f25eba 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 fe179ff46..fddb4242b 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 7081978aa..55efd4633 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 5cb696b94..ed34d4752 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 d36db23e1..e96f6d7f8 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 b6a2db0a6..74cfa10e1 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 4e479b307..cae519717 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 c76ad7265..30db3abd7 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 831ff577d..bc625c4bd 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 |