<%= 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']) %>
Index: config/locales/ar.yml =================================================================== --- config/locales/ar.yml (revision 14708) +++ config/locales/ar.yml (working copy) @@ -1168,7 +1168,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 Index: config/locales/az.yml =================================================================== --- config/locales/az.yml (revision 14708) +++ config/locales/az.yml (working copy) @@ -1265,7 +1265,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 Index: config/locales/bg.yml =================================================================== --- config/locales/bg.yml (revision 14708) +++ config/locales/bg.yml (working copy) @@ -1161,7 +1161,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 Index: config/locales/bs.yml =================================================================== --- config/locales/bs.yml (revision 14708) +++ config/locales/bs.yml (working copy) @@ -1181,7 +1181,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 Index: config/locales/ca.yml =================================================================== --- config/locales/ca.yml (revision 14708) +++ config/locales/ca.yml (working copy) @@ -1170,7 +1170,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 Index: config/locales/cs.yml =================================================================== --- config/locales/cs.yml (revision 14708) +++ config/locales/cs.yml (working copy) @@ -1169,7 +1169,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 Index: config/locales/da.yml =================================================================== --- config/locales/da.yml (revision 14708) +++ config/locales/da.yml (working copy) @@ -1185,7 +1185,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 Index: config/locales/de.yml =================================================================== --- config/locales/de.yml (revision 14708) +++ config/locales/de.yml (working copy) @@ -1177,7 +1177,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 Index: config/locales/el.yml =================================================================== --- config/locales/el.yml (revision 14708) +++ config/locales/el.yml (working copy) @@ -1168,7 +1168,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 Index: config/locales/en-GB.yml =================================================================== --- config/locales/en-GB.yml (revision 14708) +++ config/locales/en-GB.yml (working copy) @@ -1170,7 +1170,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 Index: config/locales/en.yml =================================================================== --- config/locales/en.yml (revision 14708) +++ config/locales/en.yml (working copy) @@ -965,7 +965,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 Index: config/locales/es-PA.yml =================================================================== --- config/locales/es-PA.yml (revision 14708) +++ config/locales/es-PA.yml (working copy) @@ -1202,7 +1202,7 @@ 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 Index: config/locales/es.yml =================================================================== --- config/locales/es.yml (revision 14708) +++ config/locales/es.yml (working copy) @@ -1200,7 +1200,7 @@ 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 Index: config/locales/et.yml =================================================================== --- config/locales/et.yml (revision 14708) +++ config/locales/et.yml (working copy) @@ -1181,7 +1181,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 Index: config/locales/eu.yml =================================================================== --- config/locales/eu.yml (revision 14708) +++ config/locales/eu.yml (working copy) @@ -1169,7 +1169,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 Index: config/locales/fa.yml =================================================================== --- config/locales/fa.yml (revision 14708) +++ config/locales/fa.yml (working copy) @@ -1169,7 +1169,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 Index: config/locales/fi.yml =================================================================== --- config/locales/fi.yml (revision 14708) +++ config/locales/fi.yml (working copy) @@ -1189,7 +1189,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 Index: config/locales/fr.yml =================================================================== --- config/locales/fr.yml (revision 14708) +++ config/locales/fr.yml (working copy) @@ -983,7 +983,7 @@ 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 Index: config/locales/gl.yml =================================================================== --- config/locales/gl.yml (revision 14708) +++ config/locales/gl.yml (working copy) @@ -1176,7 +1176,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 Index: config/locales/he.yml =================================================================== --- config/locales/he.yml (revision 14708) +++ config/locales/he.yml (working copy) @@ -1173,7 +1173,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 Index: config/locales/hr.yml =================================================================== --- config/locales/hr.yml (revision 14708) +++ config/locales/hr.yml (working copy) @@ -1169,7 +1169,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 Index: config/locales/hu.yml =================================================================== --- config/locales/hu.yml (revision 14708) +++ config/locales/hu.yml (working copy) @@ -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 Index: config/locales/id.yml =================================================================== --- config/locales/id.yml (revision 14708) +++ config/locales/id.yml (working copy) @@ -1172,7 +1172,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 Index: config/locales/it.yml =================================================================== --- config/locales/it.yml (revision 14708) +++ config/locales/it.yml (working copy) @@ -1163,7 +1163,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 Index: config/locales/ja.yml =================================================================== --- config/locales/ja.yml (revision 14708) +++ config/locales/ja.yml (working copy) @@ -1181,7 +1181,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: ダブルクォート Index: config/locales/ko.yml =================================================================== --- config/locales/ko.yml (revision 14708) +++ config/locales/ko.yml (working copy) @@ -1212,7 +1212,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 Index: config/locales/lt.yml =================================================================== --- config/locales/lt.yml (revision 14708) +++ config/locales/lt.yml (working copy) @@ -1227,7 +1227,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 Index: config/locales/lv.yml =================================================================== --- config/locales/lv.yml (revision 14708) +++ config/locales/lv.yml (working copy) @@ -1162,7 +1162,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 Index: config/locales/mk.yml =================================================================== --- config/locales/mk.yml (revision 14708) +++ config/locales/mk.yml (working copy) @@ -1168,7 +1168,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 Index: config/locales/mn.yml =================================================================== --- config/locales/mn.yml (revision 14708) +++ config/locales/mn.yml (working copy) @@ -1169,7 +1169,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 Index: config/locales/nl.yml =================================================================== --- config/locales/nl.yml (revision 14708) +++ config/locales/nl.yml (working copy) @@ -1147,7 +1147,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 Index: config/locales/no.yml =================================================================== --- config/locales/no.yml (revision 14708) +++ config/locales/no.yml (working copy) @@ -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 Index: config/locales/pl.yml =================================================================== --- config/locales/pl.yml (revision 14708) +++ config/locales/pl.yml (working copy) @@ -1184,7 +1184,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 Index: config/locales/pt-BR.yml =================================================================== --- config/locales/pt-BR.yml (revision 14708) +++ config/locales/pt-BR.yml (working copy) @@ -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 Index: config/locales/pt.yml =================================================================== --- config/locales/pt.yml (revision 14708) +++ config/locales/pt.yml (working copy) @@ -1170,7 +1170,7 @@ 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 Index: config/locales/ro.yml =================================================================== --- config/locales/ro.yml (revision 14708) +++ config/locales/ro.yml (working copy) @@ -1163,7 +1163,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 Index: config/locales/ru.yml =================================================================== --- config/locales/ru.yml (revision 14708) +++ config/locales/ru.yml (working copy) @@ -1273,7 +1273,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 Index: config/locales/sk.yml =================================================================== --- config/locales/sk.yml (revision 14708) +++ config/locales/sk.yml (working copy) @@ -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 Index: config/locales/sl.yml =================================================================== --- config/locales/sl.yml (revision 14708) +++ config/locales/sl.yml (working copy) @@ -1168,7 +1168,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 Index: config/locales/sq.yml =================================================================== --- config/locales/sq.yml (revision 14708) +++ config/locales/sq.yml (working copy) @@ -1164,7 +1164,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 Index: config/locales/sr-YU.yml =================================================================== --- config/locales/sr-YU.yml (revision 14708) +++ config/locales/sr-YU.yml (working copy) @@ -1170,7 +1170,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 Index: config/locales/sr.yml =================================================================== --- config/locales/sr.yml (revision 14708) +++ config/locales/sr.yml (working copy) @@ -1169,7 +1169,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 Index: config/locales/sv.yml =================================================================== --- config/locales/sv.yml (revision 14708) +++ config/locales/sv.yml (working copy) @@ -1201,7 +1201,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 Index: config/locales/th.yml =================================================================== --- config/locales/th.yml (revision 14708) +++ config/locales/th.yml (working copy) @@ -1165,7 +1165,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 Index: config/locales/tr.yml =================================================================== --- config/locales/tr.yml (revision 14708) +++ config/locales/tr.yml (working copy) @@ -1177,7 +1177,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 Index: config/locales/uk.yml =================================================================== --- config/locales/uk.yml (revision 14708) +++ config/locales/uk.yml (working copy) @@ -1163,7 +1163,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 Index: config/locales/vi.yml =================================================================== --- config/locales/vi.yml (revision 14708) +++ config/locales/vi.yml (working copy) @@ -1221,7 +1221,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 Index: config/locales/zh-TW.yml =================================================================== --- config/locales/zh-TW.yml (revision 14708) +++ config/locales/zh-TW.yml (working copy) @@ -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: 雙引號(") Index: config/locales/zh.yml =================================================================== --- config/locales/zh.yml (revision 14708) +++ config/locales/zh.yml (working copy) @@ -1169,7 +1169,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 Index: lib/redmine/wiki_formatting/macros.rb =================================================================== --- lib/redmine/wiki_formatting/macros.rb (revision 14708) +++ lib/redmine/wiki_formatting/macros.rb (working copy) @@ -92,7 +92,7 @@ # 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: # Index: test/unit/query_test.rb =================================================================== --- test/unit/query_test.rb (revision 14708) +++ test/unit/query_test.rb (working copy) @@ -1050,7 +1050,7 @@ 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 @@ 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'] Index: test/unit/user_test.rb =================================================================== --- test/unit/user_test.rb (revision 14708) +++ test/unit/user_test.rb (working copy) @@ -511,7 +511,7 @@ 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 @@ 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