redmine-20551_CommaTypo.patch

budo kaiman, 2015-10-20 18:36

Download (26.8 KB)

View differences:

app/models/user.rb (working copy)
47 47
        :order => %w(lastname firstname id),
48 48
        :setting_order => 4
49 49
      },
50
    :lastname_coma_firstname => {
50
    :lastname_comma_firstname => {
51 51
        :string => '#{lastname}, #{firstname}',
52 52
        :order => %w(lastname firstname id),
53 53
        :setting_order => 5
app/views/imports/settings.html.erb (working copy)
6 6
    <p>
7 7
      <label><%= l(:label_fields_separator) %></label>
8 8
      <%= select_tag 'import_settings[separator]',
9
            options_for_select([[l(:label_coma_char), ','], [l(:label_semi_colon_char), ';']], @import.settings['separator']) %>
9
            options_for_select([[l(:label_comma_char), ','], [l(:label_semi_colon_char), ';']], @import.settings['separator']) %>
10 10
    </p>
11 11
    <p>
12 12
      <label><%= l(:label_fields_wrapper) %></label>
config/locales/ar.yml (working copy)
1168 1168
  label_fields_separator: Field separator
1169 1169
  label_fields_wrapper: Field wrapper
1170 1170
  label_encoding: Encoding
1171
  label_coma_char: Coma
1171
  label_comma_char: Comma
1172 1172
  label_semi_colon_char: Semi colon
1173 1173
  label_quote_char: Quote
1174 1174
  label_double_quote_char: Double quote
config/locales/az.yml (working copy)
1265 1265
  label_fields_separator: Field separator
1266 1266
  label_fields_wrapper: Field wrapper
1267 1267
  label_encoding: Encoding
1268
  label_coma_char: Coma
1268
  label_comma_char: Comma
1269 1269
  label_semi_colon_char: Semi colon
1270 1270
  label_quote_char: Quote
1271 1271
  label_double_quote_char: Double quote
config/locales/bg.yml (working copy)
1161 1161
  label_fields_separator: Field separator
1162 1162
  label_fields_wrapper: Field wrapper
1163 1163
  label_encoding: Encoding
1164
  label_coma_char: Coma
1164
  label_comma_char: Comma
1165 1165
  label_semi_colon_char: Semi colon
1166 1166
  label_quote_char: Quote
1167 1167
  label_double_quote_char: Double quote
config/locales/bs.yml (working copy)
1181 1181
  label_fields_separator: Field separator
1182 1182
  label_fields_wrapper: Field wrapper
1183 1183
  label_encoding: Encoding
1184
  label_coma_char: Coma
1184
  label_comma_char: Comma
1185 1185
  label_semi_colon_char: Semi colon
1186 1186
  label_quote_char: Quote
1187 1187
  label_double_quote_char: Double quote
config/locales/ca.yml (working copy)
1170 1170
  label_fields_separator: Field separator
1171 1171
  label_fields_wrapper: Field wrapper
1172 1172
  label_encoding: Encoding
1173
  label_coma_char: Coma
1173
  label_comma_char: Comma
1174 1174
  label_semi_colon_char: Semi colon
1175 1175
  label_quote_char: Quote
1176 1176
  label_double_quote_char: Double quote
config/locales/cs.yml (working copy)
1169 1169
  label_fields_separator: Field separator
1170 1170
  label_fields_wrapper: Field wrapper
1171 1171
  label_encoding: Encoding
1172
  label_coma_char: Coma
1172
  label_comma_char: Comma
1173 1173
  label_semi_colon_char: Semi colon
1174 1174
  label_quote_char: Quote
1175 1175
  label_double_quote_char: Double quote
config/locales/da.yml (working copy)
1185 1185
  label_fields_separator: Field separator
1186 1186
  label_fields_wrapper: Field wrapper
1187 1187
  label_encoding: Encoding
1188
  label_coma_char: Coma
1188
  label_comma_char: Comma
1189 1189
  label_semi_colon_char: Semi colon
1190 1190
  label_quote_char: Quote
1191 1191
  label_double_quote_char: Double quote
config/locales/de.yml (working copy)
1177 1177
  label_fields_separator: Field separator
1178 1178
  label_fields_wrapper: Field wrapper
1179 1179
  label_encoding: Encoding
1180
  label_coma_char: Coma
1180
  label_comma_char: Comma
1181 1181
  label_semi_colon_char: Semi colon
1182 1182
  label_quote_char: Quote
1183 1183
  label_double_quote_char: Double quote
config/locales/el.yml (working copy)
1168 1168
  label_fields_separator: Field separator
1169 1169
  label_fields_wrapper: Field wrapper
1170 1170
  label_encoding: Encoding
1171
  label_coma_char: Coma
1171
  label_comma_char: Comma
1172 1172
  label_semi_colon_char: Semi colon
1173 1173
  label_quote_char: Quote
1174 1174
  label_double_quote_char: Double quote
config/locales/en-GB.yml (working copy)
1170 1170
  label_fields_separator: Field separator
1171 1171
  label_fields_wrapper: Field wrapper
1172 1172
  label_encoding: Encoding
1173
  label_coma_char: Coma
1173
  label_comma_char: Comma
1174 1174
  label_semi_colon_char: Semi colon
1175 1175
  label_quote_char: Quote
1176 1176
  label_double_quote_char: Double quote
config/locales/en.yml (working copy)
965 965
  label_fields_separator: Field separator
966 966
  label_fields_wrapper: Field wrapper
967 967
  label_encoding: Encoding
968
  label_coma_char: Coma
968
  label_comma_char: Comma
969 969
  label_semi_colon_char: Semi colon
970 970
  label_quote_char: Quote
971 971
  label_double_quote_char: Double quote
config/locales/es-PA.yml (working copy)
1202 1202
  label_fields_separator: Separador de Campos
1203 1203
  label_fields_wrapper: Envoltorio de Campo
1204 1204
  label_encoding: Codificación
1205
  label_coma_char: Coma
1205
  label_comma_char: Comma
1206 1206
  label_semi_colon_char: Punto y Coma
1207 1207
  label_quote_char: Comilla Simple
1208 1208
  label_double_quote_char: Comilla Doble
config/locales/es.yml (working copy)
1200 1200
  label_fields_separator: Separador de Campos
1201 1201
  label_fields_wrapper: Envoltorio de Campo
1202 1202
  label_encoding: Codificación
1203
  label_coma_char: Coma
1203
  label_comma_char: Comma
1204 1204
  label_semi_colon_char: Punto y Coma
1205 1205
  label_quote_char: Comilla Simple
1206 1206
  label_double_quote_char: Comilla Doble
config/locales/et.yml (working copy)
1181 1181
  label_fields_separator: Field separator
1182 1182
  label_fields_wrapper: Field wrapper
1183 1183
  label_encoding: Encoding
1184
  label_coma_char: Coma
1184
  label_comma_char: Comma
1185 1185
  label_semi_colon_char: Semi colon
1186 1186
  label_quote_char: Quote
1187 1187
  label_double_quote_char: Double quote
config/locales/eu.yml (working copy)
1169 1169
  label_fields_separator: Field separator
1170 1170
  label_fields_wrapper: Field wrapper
1171 1171
  label_encoding: Encoding
1172
  label_coma_char: Coma
1172
  label_comma_char: Comma
1173 1173
  label_semi_colon_char: Semi colon
1174 1174
  label_quote_char: Quote
1175 1175
  label_double_quote_char: Double quote
config/locales/fa.yml (working copy)
1169 1169
  label_fields_separator: Field separator
1170 1170
  label_fields_wrapper: Field wrapper
1171 1171
  label_encoding: Encoding
1172
  label_coma_char: Coma
1172
  label_comma_char: Comma
1173 1173
  label_semi_colon_char: Semi colon
1174 1174
  label_quote_char: Quote
1175 1175
  label_double_quote_char: Double quote
config/locales/fi.yml (working copy)
1189 1189
  label_fields_separator: Field separator
1190 1190
  label_fields_wrapper: Field wrapper
1191 1191
  label_encoding: Encoding
1192
  label_coma_char: Coma
1192
  label_comma_char: Comma
1193 1193
  label_semi_colon_char: Semi colon
1194 1194
  label_quote_char: Quote
1195 1195
  label_double_quote_char: Double quote
config/locales/fr.yml (working copy)
983 983
  label_fields_separator: Séparateur de champs
984 984
  label_fields_wrapper: Délimiteur de texte
985 985
  label_encoding: Encodage
986
  label_coma_char: Virgule
986
  label_comma_char: Virgule
987 987
  label_semi_colon_char: Point virgule
988 988
  label_quote_char: Apostrophe
989 989
  label_double_quote_char: Double apostrophe
config/locales/gl.yml (working copy)
1176 1176
  label_fields_separator: Field separator
1177 1177
  label_fields_wrapper: Field wrapper
1178 1178
  label_encoding: Encoding
1179
  label_coma_char: Coma
1179
  label_comma_char: Comma
1180 1180
  label_semi_colon_char: Semi colon
1181 1181
  label_quote_char: Quote
1182 1182
  label_double_quote_char: Double quote
config/locales/he.yml (working copy)
1173 1173
  label_fields_separator: Field separator
1174 1174
  label_fields_wrapper: Field wrapper
1175 1175
  label_encoding: Encoding
1176
  label_coma_char: Coma
1176
  label_comma_char: Comma
1177 1177
  label_semi_colon_char: Semi colon
1178 1178
  label_quote_char: Quote
1179 1179
  label_double_quote_char: Double quote
config/locales/hr.yml (working copy)
1169 1169
  label_fields_separator: Field separator
1170 1170
  label_fields_wrapper: Field wrapper
1171 1171
  label_encoding: Encoding
1172
  label_coma_char: Coma
1172
  label_comma_char: Comma
1173 1173
  label_semi_colon_char: Semi colon
1174 1174
  label_quote_char: Quote
1175 1175
  label_double_quote_char: Double quote
config/locales/hu.yml (working copy)
1187 1187
  label_fields_separator: Field separator
1188 1188
  label_fields_wrapper: Field wrapper
1189 1189
  label_encoding: Encoding
1190
  label_coma_char: Coma
1190
  label_comma_char: Comma
1191 1191
  label_semi_colon_char: Semi colon
1192 1192
  label_quote_char: Quote
1193 1193
  label_double_quote_char: Double quote
config/locales/id.yml (working copy)
1172 1172
  label_fields_separator: Field separator
1173 1173
  label_fields_wrapper: Field wrapper
1174 1174
  label_encoding: Encoding
1175
  label_coma_char: Coma
1175
  label_comma_char: Comma
1176 1176
  label_semi_colon_char: Semi colon
1177 1177
  label_quote_char: Quote
1178 1178
  label_double_quote_char: Double quote
config/locales/it.yml (working copy)
1163 1163
  label_fields_separator: Field separator
1164 1164
  label_fields_wrapper: Field wrapper
1165 1165
  label_encoding: Encoding
1166
  label_coma_char: Coma
1166
  label_comma_char: Comma
1167 1167
  label_semi_colon_char: Semi colon
1168 1168
  label_quote_char: Quote
1169 1169
  label_double_quote_char: Double quote
config/locales/ja.yml (working copy)
1181 1181
  label_fields_separator: 区切り文字
1182 1182
  label_fields_wrapper: 文字列の引用符
1183 1183
  label_encoding: エンコーディング
1184
  label_coma_char: コンマ
1184
  label_comma_char: コンマ
1185 1185
  label_semi_colon_char: セミコロン
1186 1186
  label_quote_char: シングルクォート
1187 1187
  label_double_quote_char: ダブルクォート
config/locales/ko.yml (working copy)
1212 1212
  label_fields_separator: Field separator
1213 1213
  label_fields_wrapper: Field wrapper
1214 1214
  label_encoding: Encoding
1215
  label_coma_char: Coma
1215
  label_comma_char: Comma
1216 1216
  label_semi_colon_char: Semi colon
1217 1217
  label_quote_char: Quote
1218 1218
  label_double_quote_char: Double quote
config/locales/lt.yml (working copy)
1227 1227
  label_fields_separator: Field separator
1228 1228
  label_fields_wrapper: Field wrapper
1229 1229
  label_encoding: Encoding
1230
  label_coma_char: Coma
1230
  label_comma_char: Comma
1231 1231
  label_semi_colon_char: Semi colon
1232 1232
  label_quote_char: Quote
1233 1233
  label_double_quote_char: Double quote
config/locales/lv.yml (working copy)
1162 1162
  label_fields_separator: Field separator
1163 1163
  label_fields_wrapper: Field wrapper
1164 1164
  label_encoding: Encoding
1165
  label_coma_char: Coma
1165
  label_comma_char: Comma
1166 1166
  label_semi_colon_char: Semi colon
1167 1167
  label_quote_char: Quote
1168 1168
  label_double_quote_char: Double quote
config/locales/mk.yml (working copy)
1168 1168
  label_fields_separator: Field separator
1169 1169
  label_fields_wrapper: Field wrapper
1170 1170
  label_encoding: Encoding
1171
  label_coma_char: Coma
1171
  label_comma_char: Comma
1172 1172
  label_semi_colon_char: Semi colon
1173 1173
  label_quote_char: Quote
1174 1174
  label_double_quote_char: Double quote
config/locales/mn.yml (working copy)
1169 1169
  label_fields_separator: Field separator
1170 1170
  label_fields_wrapper: Field wrapper
1171 1171
  label_encoding: Encoding
1172
  label_coma_char: Coma
1172
  label_comma_char: Comma
1173 1173
  label_semi_colon_char: Semi colon
1174 1174
  label_quote_char: Quote
1175 1175
  label_double_quote_char: Double quote
config/locales/nl.yml (working copy)
1147 1147
  label_fields_separator: Field separator
1148 1148
  label_fields_wrapper: Field wrapper
1149 1149
  label_encoding: Encoding
1150
  label_coma_char: Coma
1150
  label_comma_char: Comma
1151 1151
  label_semi_colon_char: Semi colon
1152 1152
  label_quote_char: Quote
1153 1153
  label_double_quote_char: Double quote
config/locales/no.yml (working copy)
1158 1158
  label_fields_separator: Field separator
1159 1159
  label_fields_wrapper: Field wrapper
1160 1160
  label_encoding: Encoding
1161
  label_coma_char: Coma
1161
  label_comma_char: Comma
1162 1162
  label_semi_colon_char: Semi colon
1163 1163
  label_quote_char: Quote
1164 1164
  label_double_quote_char: Double quote
config/locales/pl.yml (working copy)
1184 1184
  label_fields_separator: Field separator
1185 1185
  label_fields_wrapper: Field wrapper
1186 1186
  label_encoding: Encoding
1187
  label_coma_char: Coma
1187
  label_comma_char: Comma
1188 1188
  label_semi_colon_char: Semi colon
1189 1189
  label_quote_char: Quote
1190 1190
  label_double_quote_char: Double quote
config/locales/pt-BR.yml (working copy)
1187 1187
  label_fields_separator: Field separator
1188 1188
  label_fields_wrapper: Field wrapper
1189 1189
  label_encoding: Encoding
1190
  label_coma_char: Coma
1190
  label_comma_char: Comma
1191 1191
  label_semi_colon_char: Semi colon
1192 1192
  label_quote_char: Quote
1193 1193
  label_double_quote_char: Double quote
config/locales/pt.yml (working copy)
1170 1170
  label_fields_separator: Separador de campos
1171 1171
  label_fields_wrapper: Field wrapper
1172 1172
  label_encoding: Codificação
1173
  label_coma_char: Vírgula
1173
  label_comma_char: Vírgula
1174 1174
  label_semi_colon_char: Ponto e vírgula
1175 1175
  label_quote_char: Aspas
1176 1176
  label_double_quote_char: Aspas duplas
config/locales/ro.yml (working copy)
1163 1163
  label_fields_separator: Field separator
1164 1164
  label_fields_wrapper: Field wrapper
1165 1165
  label_encoding: Encoding
1166
  label_coma_char: Coma
1166
  label_comma_char: Comma
1167 1167
  label_semi_colon_char: Semi colon
1168 1168
  label_quote_char: Quote
1169 1169
  label_double_quote_char: Double quote
config/locales/ru.yml (working copy)
1273 1273
  label_fields_separator: Field separator
1274 1274
  label_fields_wrapper: Field wrapper
1275 1275
  label_encoding: Encoding
1276
  label_coma_char: Coma
1276
  label_comma_char: Comma
1277 1277
  label_semi_colon_char: Semi colon
1278 1278
  label_quote_char: Quote
1279 1279
  label_double_quote_char: Double quote
config/locales/sk.yml (working copy)
1158 1158
  label_fields_separator: Field separator
1159 1159
  label_fields_wrapper: Field wrapper
1160 1160
  label_encoding: Encoding
1161
  label_coma_char: Coma
1161
  label_comma_char: Comma
1162 1162
  label_semi_colon_char: Semi colon
1163 1163
  label_quote_char: Quote
1164 1164
  label_double_quote_char: Double quote
config/locales/sl.yml (working copy)
1168 1168
  label_fields_separator: Field separator
1169 1169
  label_fields_wrapper: Field wrapper
1170 1170
  label_encoding: Encoding
1171
  label_coma_char: Coma
1171
  label_comma_char: Comma
1172 1172
  label_semi_colon_char: Semi colon
1173 1173
  label_quote_char: Quote
1174 1174
  label_double_quote_char: Double quote
config/locales/sq.yml (working copy)
1164 1164
  label_fields_separator: Field separator
1165 1165
  label_fields_wrapper: Field wrapper
1166 1166
  label_encoding: Encoding
1167
  label_coma_char: Coma
1167
  label_comma_char: Comma
1168 1168
  label_semi_colon_char: Semi colon
1169 1169
  label_quote_char: Quote
1170 1170
  label_double_quote_char: Double quote
config/locales/sr-YU.yml (working copy)
1170 1170
  label_fields_separator: Field separator
1171 1171
  label_fields_wrapper: Field wrapper
1172 1172
  label_encoding: Encoding
1173
  label_coma_char: Coma
1173
  label_comma_char: Comma
1174 1174
  label_semi_colon_char: Semi colon
1175 1175
  label_quote_char: Quote
1176 1176
  label_double_quote_char: Double quote
config/locales/sr.yml (working copy)
1169 1169
  label_fields_separator: Field separator
1170 1170
  label_fields_wrapper: Field wrapper
1171 1171
  label_encoding: Encoding
1172
  label_coma_char: Coma
1172
  label_comma_char: Comma
1173 1173
  label_semi_colon_char: Semi colon
1174 1174
  label_quote_char: Quote
1175 1175
  label_double_quote_char: Double quote
config/locales/sv.yml (working copy)
1201 1201
  label_fields_separator: Field separator
1202 1202
  label_fields_wrapper: Field wrapper
1203 1203
  label_encoding: Encoding
1204
  label_coma_char: Coma
1204
  label_comma_char: Comma
1205 1205
  label_semi_colon_char: Semi colon
1206 1206
  label_quote_char: Quote
1207 1207
  label_double_quote_char: Double quote
config/locales/th.yml (working copy)
1165 1165
  label_fields_separator: Field separator
1166 1166
  label_fields_wrapper: Field wrapper
1167 1167
  label_encoding: Encoding
1168
  label_coma_char: Coma
1168
  label_comma_char: Comma
1169 1169
  label_semi_colon_char: Semi colon
1170 1170
  label_quote_char: Quote
1171 1171
  label_double_quote_char: Double quote
config/locales/tr.yml (working copy)
1177 1177
  label_fields_separator: Field separator
1178 1178
  label_fields_wrapper: Field wrapper
1179 1179
  label_encoding: Encoding
1180
  label_coma_char: Coma
1180
  label_comma_char: Comma
1181 1181
  label_semi_colon_char: Semi colon
1182 1182
  label_quote_char: Quote
1183 1183
  label_double_quote_char: Double quote
config/locales/uk.yml (working copy)
1163 1163
  label_fields_separator: Field separator
1164 1164
  label_fields_wrapper: Field wrapper
1165 1165
  label_encoding: Encoding
1166
  label_coma_char: Coma
1166
  label_comma_char: Comma
1167 1167
  label_semi_colon_char: Semi colon
1168 1168
  label_quote_char: Quote
1169 1169
  label_double_quote_char: Double quote
config/locales/vi.yml (working copy)
1221 1221
  label_fields_separator: Field separator
1222 1222
  label_fields_wrapper: Field wrapper
1223 1223
  label_encoding: Encoding
1224
  label_coma_char: Coma
1224
  label_comma_char: Comma
1225 1225
  label_semi_colon_char: Semi colon
1226 1226
  label_quote_char: Quote
1227 1227
  label_double_quote_char: Double quote
config/locales/zh-TW.yml (working copy)
1049 1049
  label_fields_separator: 欄位分隔符號
1050 1050
  label_fields_wrapper: 欄位包裝識別符號
1051 1051
  label_encoding: 編碼
1052
  label_coma_char: 逗號(,)
1052
  label_comma_char: 逗號(,)
1053 1053
  label_semi_colon_char: 分號(;)
1054 1054
  label_quote_char: 引號(')
1055 1055
  label_double_quote_char: 雙引號(")
config/locales/zh.yml (working copy)
1169 1169
  label_fields_separator: Field separator
1170 1170
  label_fields_wrapper: Field wrapper
1171 1171
  label_encoding: Encoding
1172
  label_coma_char: Coma
1172
  label_comma_char: Comma
1173 1173
  label_semi_colon_char: Semi colon
1174 1174
  label_quote_char: Quote
1175 1175
  label_double_quote_char: Double quote
lib/redmine/wiki_formatting/macros.rb (working copy)
92 92
        #   invoked without a block of text.  
93 93
        #
94 94
        # Examples:
95
        # By default, when the macro is invoked, the coma separated list of arguments
95
        # By default, when the macro is invoked, the comma separated list of arguments
96 96
        # is split and passed to the macro block as an array. If no argument is given
97 97
        # the macro will be invoked with an empty array:
98 98
        #
test/unit/query_test.rb (working copy)
1050 1050
  end
1051 1051

  
1052 1052
  def test_sortable_columns_should_sort_assignees_according_to_user_format_setting
1053
    with_settings :user_format => 'lastname_coma_firstname' do
1053
    with_settings :user_format => 'lastname_comma_firstname' do
1054 1054
      q = IssueQuery.new
1055 1055
      assert q.sortable_columns.has_key?('assigned_to')
1056 1056
      assert_equal %w(users.lastname users.firstname users.id), q.sortable_columns['assigned_to']
......
1058 1058
  end
1059 1059

  
1060 1060
  def test_sortable_columns_should_sort_authors_according_to_user_format_setting
1061
    with_settings :user_format => 'lastname_coma_firstname' do
1061
    with_settings :user_format => 'lastname_comma_firstname' do
1062 1062
      q = IssueQuery.new
1063 1063
      assert q.sortable_columns.has_key?('author')
1064 1064
      assert_equal %w(authors.lastname authors.firstname authors.id), q.sortable_columns['author']
test/unit/user_test.rb (working copy)
511 511

  
512 512
  def test_name_format
513 513
    assert_equal 'John S.', @jsmith.name(:firstname_lastinitial)
514
    assert_equal 'Smith, John', @jsmith.name(:lastname_coma_firstname)
514
    assert_equal 'Smith, John', @jsmith.name(:lastname_comma_firstname)
515 515
    assert_equal 'J. Smith', @jsmith.name(:firstinitial_lastname)
516 516
    assert_equal 'J.-P. Lang', User.new(:firstname => 'Jean-Philippe', :lastname => 'Lang').name(:firstinitial_lastname)
517 517
  end
......
560 560
  end
561 561

  
562 562
  def test_fields_for_order_statement_should_return_fields_according_user_format_setting
563
    with_settings :user_format => 'lastname_coma_firstname' do
563
    with_settings :user_format => 'lastname_comma_firstname' do
564 564
      assert_equal ['users.lastname', 'users.firstname', 'users.id'],
565 565
                   User.fields_for_order_statement
566 566
    end