wpMandrill - Version 1.09

Version Description

  • ADDED: Reply-To Setting
  • ADDED: Replacing line feed by
    setting.
Download this release

Release Info

Developer MC_Will
Plugin Icon wp plugin wpMandrill
Version 1.09
Comparing to
See all releases

Code changes from version 1.07 to 1.09

lang/wpmandrill-es_ES.mo CHANGED
Binary file
lang/wpmandrill.po CHANGED
@@ -2,7 +2,7 @@ msgid ""
2
  msgstr ""
3
  "Project-Id-Version: wpMandrill 1.0 rc1\n"
4
  "Report-Msgid-Bugs-To: \n"
5
- "POT-Creation-Date: 2012-05-08 11:56-0500\n"
6
  "PO-Revision-Date: \n"
7
  "Last-Translator: Will Castillo <will@mailchimp.com>\n"
8
  "Language-Team: MailChimp <will@mailchimp.com>\n"
@@ -136,325 +136,355 @@ msgstr "Campo De:"
136
  msgid "FROM Email"
137
  msgstr "Campo Email:"
138
 
139
- #: wpmandrill.php:106
140
- msgid "General Template"
141
- msgstr "Plantilla General"
142
 
143
  #: wpmandrill.php:107
144
- #: wpmandrill.php:111
145
- msgid "&nbsp;"
146
- msgstr "&nbsp;"
 
 
 
 
 
 
 
147
 
148
- #: wpmandrill.php:110
149
  msgid "General Tags"
150
  msgstr "Etiquetas Generales"
151
 
152
- #: wpmandrill.php:117
 
 
 
 
153
  msgid "Send a test email using these settings"
154
  msgstr "Enviar un correo electrónico de prueba usando estas configuraciones"
155
 
156
- #: wpmandrill.php:118
157
  msgid "Send to"
158
  msgstr "Enviar a"
159
 
160
- #: wpmandrill.php:119
161
  msgid "Subject"
162
  msgstr "Asunto"
163
 
164
- #: wpmandrill.php:120
165
  msgid "Message"
166
  msgstr "Mensaje"
167
 
168
- #: wpmandrill.php:132
169
- #: wpmandrill.php:254
170
  msgid "Mandrill Settings"
171
  msgstr "Configuración de Mandrill"
172
 
173
- #: wpmandrill.php:133
174
  msgid "Mandrill"
175
  msgstr "Mandrill"
176
 
177
- #: wpmandrill.php:141
178
- #: wpmandrill.php:142
179
  msgid "Mandrill Reports"
180
  msgstr "Reportes Mandrill"
181
 
182
- #: wpmandrill.php:164
183
  msgid "Mandrill: wp_mail has been declared by another process or plugin, so you won't be able to use Mandrill until the problem is solved."
184
  msgstr "Mandrill: wp?install ha sido declarado por otro proceso o plugin por lo que no podras usar Mandrill hasta que soluciones este inconveniente."
185
 
186
- #: wpmandrill.php:193
187
  msgid "To use this plugin you will need:"
188
  msgstr "Para utilizar este plugin necesitarás:"
189
 
190
- #: wpmandrill.php:195
191
  msgid "Your Mandrill account."
192
  msgstr "Tu cuenta Mandrill"
193
 
194
- #: wpmandrill.php:196
195
  msgid "At least one domain defined in your Mandrill account."
196
  msgstr "Mandrill: ¿Cómo decirle a WordPress que utilice wpMandrill?"
197
 
198
- #: wpmandrill.php:197
199
  msgid "A valid sender email address."
200
  msgstr "Una dirección de correo electrónico de remitente válido."
201
 
202
- #: wpmandrill.php:202
203
  msgid "Once you have properly configured the settings, the plugin will take care of all the emails sent through your WordPress installation."
204
  msgstr "Una vez que hayas completado la configuración, el plugin se hará cargo de todos los correos enviados a través de tu instalación WordPress."
205
 
206
- #: wpmandrill.php:203
207
  msgid "However, if you need to customize any part of the email before sending, you can do so by using the WordPress filter <strong>mandrill_payload</strong>."
208
  msgstr "De cualquier forma, si alguna vez necesitas alterar cualquier parte del email antes de que este sea enviado, lo podrás hacer utilizando el filtro WordPress <strong>mandrill_payload</strong>."
209
 
210
- #: wpmandrill.php:204
211
  msgid "This filter has the same structure as Mandrill's API call <a href=\"http://mandrillapp.com/api/docs/messages.html#method=send\" target=\"_blank\">/messages/send</a>, except that it can have one additional parameter when the email is based on a template. The parameter is called \"<em>template</em>\", which is an associative array of two elements (the first element, a string whose key is \"<em>template_name</em>\", and a second parameter whose key is \"<em>template_content</em>\". Its value is an array with the same structure of the parameter \"<em>template_content</em>\" in the call <a href=\"http://mandrillapp.com/api/docs/messages.html#method=send-template\" target=\"_blank\">/messages/send-template</a>.)"
212
  msgstr "Este filtro tiene la misma estructura de la llamada a la API de Mandrill <a href=\"http://mandrillapp.com/api/docs/messages.html#method=send\" target=\"_blank\">/messages/send</a>, excepto que esta podría tener un parámetro adicional cuando el email está basado en una plantilla. El parametro se llama \"<em>template</em>\", el cual es un arreglo asociativo de dos elementos (el primero, una cadena de caracteres cuya clave es \"<em>template_name</em>\", y un segundo parámetro cuya clave es \"<em>template_content</em>\" y su valor es una arreglo con la misma estructura del parámetro \"<em>template_content</em>\" de la llamada <a href=\"http://mandrillapp.com/api/docs/messages.html#method=send-template\" target=\"_blank\">/messages/send-template</a>.)"
213
 
214
- #: wpmandrill.php:205
215
  msgid "Note that if you're sending additional headers in your emails, the only valid headers are <em>From:</em>, <em>Reply-To:</em>, and <em>X-*:</em>. <em>Bcc:</em> is also valid, but Mandrill will send the blind carbon copy to only the first address, and the remaining will be silently discarted."
216
  msgstr "Ten en cuenta que si estás intentando enviar cabeceras adicionales en tus correos, las únicas cabeceras válidas serán <em>From:</em>, <em>Reply-To:</em> y <em>X-*:</em>. <em>Bcc:</em> también es válido, pero Mandrill sólo enviará la copia oculta a la primera dirección, descartando silenciosamente el resto de las direcciones especificadas en el campo Bcc: que envíes."
217
 
218
- #: wpmandrill.php:206
219
  msgid "Also note that if any error occurs while sending the email, the plugin will try to send the message again using the native WordPress mailing capabilities."
220
  msgstr "También ten presente que si ocurre cualquier error durante el envío del correo, el plugin intentará enviar el mensaje otra vez, utilizando las capacidades de envío de correo nativas de WordPress."
221
 
222
- #: wpmandrill.php:207
223
  msgid "Confirm that any change you made to the payload is in line with the <a href=\"http://mandrillapp.com/api/docs/\" target=\"_blank\">Mandrill's API's documentation</a>. Also, the <em>X-*:</em> headers, must be in line with the <a href=\"http://help.mandrill.com/customer/portal/articles/456744-smtp-headers-api\" target=\"_blank\">SMTP API documentation</a>. By using this plugin, you agree that you and your website will adhere to <a href=\"http://mandrill.com/legal/terms/\" target=\"_blank\">Mandrill's Terms of Use</a>."
224
  msgstr "Asegúrate que cualquier cambio que hagas en el payload esté cónsono con la <a href=\"http://mandrillapp.com/api/docs/\" target=\"_blank\">Documentacion de la API de Mandrill</a>. También, las cabeceras <em>X-*:</em> deben estar en línea con la <a href=\"http://help.mandrill.com/customer/portal/articles/456744-smtp-headers-api\" target=\"_blank\">Documentación de la API SMTP</a>. Al utilizar este plugin estás aceptando adherirte tu y tu sitio web a los <a href=\"http://mandrill.com/legal/terms/\" target=\"_blank\">Términos y Condiciones de Mandrill</a>."
225
 
226
- #: wpmandrill.php:208
227
  msgid "if you have any question about Mandrill or this plugin, visit the <a href=\"http://help.mandrill.com/\" target=\"_blank\">Mandrill's Support Center</a>."
228
  msgstr "Si tienes alguna pregunta sobre mandrill o este plugin, visita el <a href=\"http://help.mandrill.com/\" target=\"_blank\">Centro de Soporte de Mandrill</a>."
229
 
230
- #: wpmandrill.php:226
231
  msgid "Settings"
232
  msgstr "Configuraciones"
233
 
234
- #: wpmandrill.php:229
235
  msgid "Reports"
236
  msgstr "Reportes"
237
 
238
- #: wpmandrill.php:245
239
  #: stats.php:1
240
  msgid "You do not have sufficient permissions to access this page."
241
  msgstr "No tienes suficiente permisología para acceder a esta página."
242
 
243
- #: wpmandrill.php:275
244
  msgid "Send Email"
245
  msgstr "Campo Email:"
246
 
247
- #: wpmandrill.php:293
248
  msgid "Latest from Mandrill..."
249
  msgstr "Lo último de Mandrill..."
250
 
251
- #: wpmandrill.php:307
252
  msgid "News from MailChimp..."
253
  msgstr "Noticias de MailChimp"
254
 
255
- #: wpmandrill.php:334
256
  msgid "Mandrill How-Tos"
257
  msgstr "Mandrill: ¿Cómo hago?"
258
 
259
- #: wpmandrill.php:361
260
  msgid "You must define a valid sender email."
261
  msgstr "Debes definir un correo electrónico de remitente válido."
262
 
263
- #: wpmandrill.php:611
264
  msgid "Test email send failed. "
265
  msgstr "El correo electrónico de prueba falló."
266
 
267
- #: wpmandrill.php:628
268
  #, php-format
269
  msgid "Test executed: %d emails sent, %d emails queued and %d emails rejected"
270
  msgstr "Prueba ejecutada: %d emails enviados, %d emails encolados y %d emails rechazados"
271
 
272
- #: wpmandrill.php:643
273
  msgid "To get your API key, please visit your <a href=\"http://mandrillapp.com/settings/index\" target=\"_blank\">Mandrill Settings</a>"
274
  msgstr "Para obtener tu Clave API, por favor visita tu <a href=\"http://mandrillapp.com/settings/index\" target=\"_blank\">Configuración Mandrill</a>"
275
 
276
- #: wpmandrill.php:645
277
  msgid "We are connected to your Mandrill Account."
278
  msgstr "Estamos conectados a tu cuenta Mandrill."
279
 
280
- #: wpmandrill.php:647
281
  msgid "Sorry, invalid API key."
282
  msgstr "Lo siento, Clave API inválida."
283
 
284
- #: wpmandrill.php:663
285
  msgid "No domains found."
286
  msgstr "No se encontraros dominios."
287
 
288
- #: wpmandrill.php:675
289
  msgid "This address will be used as the sender of the outgoing emails:"
290
  msgstr "Esta dirección será utilizada como el remitente para los correos salientes:"
291
 
292
- #: wpmandrill.php:681
293
  msgid "If you need to add a new domain, please visit your <a href=\"https://mandrillapp.com/settings/sending-domains\" target=\"_blank\">Mandrill Settings</a>"
294
  msgstr "Si necesita agregar un nuevo dominio, por favor visita tu <a href=\"https://mandrillapp.com/settings/sending-domains\" target=\"_blank\">Configuracipón Mandrill</a>"
295
 
296
- #: wpmandrill.php:691
297
  msgid "Name the recipients will see in their email clients:"
298
  msgstr "Nombre que los destinatarios verán en sus clientes de correo:"
299
 
300
- #: wpmandrill.php:702
301
- #: wpmandrill.php:712
 
 
 
 
 
 
 
 
302
  msgid "No templates found."
303
  msgstr "No se encontraron plantillas."
304
 
305
- #: wpmandrill.php:721
306
  msgid "Select the template to use:"
307
  msgstr "Seleccione la plantilla a utilizar:"
308
 
309
- #: wpmandrill.php:727
310
  msgid "<small>The selected template must have a <strong><em>mc:edit=\"main\"</em></strong> placeholder defined. The message will be shown there.</small>"
311
  msgstr "<small>La plantilla seleccionada debe tener una sección <strong><em>mc:edit=\"main\"</em></strong> definida. El mensaje será mostrado ahí.</small>"
312
 
313
- #: wpmandrill.php:737
 
 
 
 
 
 
 
 
 
 
 
 
314
  msgid "If there are tags that you want appended to every call, list them here, one per line:"
315
  msgstr "Si hay etiquetas que quieras agregar a cada llamada, lístalas aquí, una por línea."
316
 
317
- #: wpmandrill.php:739
318
  msgid "Also keep in mind that you can add or remove tags using the <em><a href=\"#\" onclick=\"jQuery('a#contextual-help-link').trigger('click');return false;\">mandrill_payload</a></em> WordPress filter."
319
  msgstr "También recuerda que puedes agregar o eliminar etiquetas utilizando el filtro WordPress <em><a href=\"#\" onclick=\"jQuery('a#contextual-help-link').trigger('click');return false;\">mandrill_payload</a></em>."
320
 
321
- #: wpmandrill.php:963
322
  msgid "Mandrill Recent Statistics"
323
  msgstr "Estadistas Recientes de Mandrill"
324
 
325
- #: wpmandrill.php:985
326
- #: wpmandrill.php:1201
327
- #: stats.php:8
328
- msgid "There was a problem retrieving statistics."
329
- msgstr "Hubo un problema recuperando las estadísticas."
330
-
331
- #: wpmandrill.php:1043
332
- #: wpmandrill.php:1298
333
  msgid "Sending Volume"
334
  msgstr "Volumen de Envío"
335
 
336
- #: wpmandrill.php:1044
337
- #: wpmandrill.php:1299
338
  msgid " emails"
339
  msgstr " emails"
340
 
341
- #: wpmandrill.php:1045
342
- #: wpmandrill.php:1300
343
  msgid "Total Volume per Day"
344
  msgstr "Volumen Total por Período"
345
 
346
- #: wpmandrill.php:1047
347
- #: wpmandrill.php:1302
348
  msgid "in the last few days"
349
  msgstr "en los últimos días"
350
 
351
- #: wpmandrill.php:1048
352
- #: wpmandrill.php:1303
353
  msgid "in the last few months"
354
  msgstr "en los últimos meses"
355
 
356
- #: wpmandrill.php:1049
357
- #: wpmandrill.php:1304
358
  msgid "Today"
359
  msgstr "Hoy"
360
 
361
- #: wpmandrill.php:1050
362
- #: wpmandrill.php:1305
363
  msgid "Last 7 Days"
364
  msgstr "Últimos 7 Días"
365
 
366
- #: wpmandrill.php:1051
367
- #: wpmandrill.php:1306
368
  msgid "Last 30 Days"
369
  msgstr "Últimos 30 Días"
370
 
371
- #: wpmandrill.php:1052
372
- #: wpmandrill.php:1307
373
  msgid "Last 60 Days"
374
  msgstr "Últimos 60 Días"
375
 
376
- #: wpmandrill.php:1053
377
- #: wpmandrill.php:1308
378
  msgid "Last 90 Days"
379
  msgstr "Últimos 90 Días"
380
 
381
- #: wpmandrill.php:1054
382
- #: wpmandrill.php:1309
383
  msgid "Periods"
384
  msgstr "Períodos"
385
 
386
- #: wpmandrill.php:1055
387
- #: wpmandrill.php:1310
388
  #: stats.php:30
389
  msgid "Volume"
390
  msgstr "Volumen"
391
 
392
- #: wpmandrill.php:1056
393
- #: wpmandrill.php:1311
394
  msgid "Total:"
395
  msgstr "Cuota:"
396
 
397
- #: wpmandrill.php:1057
398
- #: wpmandrill.php:1312
399
  msgid "Unopened"
400
  msgstr "No abiertos"
401
 
402
- #: wpmandrill.php:1058
403
- #: wpmandrill.php:1313
404
  msgid "Bounced or Rejected"
405
  msgstr "Rebotes o Rechazos"
406
 
407
- #: wpmandrill.php:1059
408
- #: wpmandrill.php:1314
409
  msgid "Opened"
410
  msgstr "Abiertos"
411
 
412
- #: wpmandrill.php:1062
413
- #: wpmandrill.php:1317
414
  msgid "Average Sending Volume"
415
  msgstr "Volumen de Envío Promedio"
416
 
417
- #: wpmandrill.php:1063
418
- #: wpmandrill.php:1318
419
  msgid "/day"
420
  msgstr "/día"
421
 
422
- #: wpmandrill.php:1064
423
- #: wpmandrill.php:1319
424
  msgid "Average Volume per Day"
425
  msgstr "Volumen Promedio por Período"
426
 
427
- #: wpmandrill.php:1230
 
 
 
 
 
428
  #: stats.php:57
429
  msgid "Filter by:"
430
  msgstr "Filtrar por:"
431
 
432
- #: wpmandrill.php:1232
433
  #: stats.php:59
434
  msgid "No filter"
435
  msgstr "Sin Filtro"
436
 
437
- #: wpmandrill.php:1233
438
  #: stats.php:60
439
  msgid "Sender:"
440
  msgstr "Remitente:"
441
 
442
- #: wpmandrill.php:1240
443
  #: stats.php:67
444
  msgid "Tag:"
445
  msgstr "Etiqueta:"
446
 
447
- #: wpmandrill.php:1248
448
  #: stats.php:80
449
  msgid "Display:"
450
  msgstr "Mostrar:"
451
 
452
- #: wpmandrill.php:1250
453
  #: stats.php:82
454
  msgid "Total Volume per Period"
455
  msgstr "Volumen Total por Período"
456
 
457
- #: wpmandrill.php:1251
458
  #: stats.php:83
459
  msgid "Average Volume per Period"
460
  msgstr "Volumen Promedio por Período"
2
  msgstr ""
3
  "Project-Id-Version: wpMandrill 1.0 rc1\n"
4
  "Report-Msgid-Bugs-To: \n"
5
+ "POT-Creation-Date: 2012-05-10 10:30-0500\n"
6
  "PO-Revision-Date: \n"
7
  "Last-Translator: Will Castillo <will@mailchimp.com>\n"
8
  "Language-Team: MailChimp <will@mailchimp.com>\n"
136
  msgid "FROM Email"
137
  msgstr "Campo Email:"
138
 
139
+ #: wpmandrill.php:104
140
+ msgid "Reply-To Email"
141
+ msgstr "Dirección Reply-To"
142
 
143
  #: wpmandrill.php:107
144
+ msgid "General Design"
145
+ msgstr "Diseño General"
146
+
147
+ #: wpmandrill.php:108
148
+ msgid "Template"
149
+ msgstr "Plantilla"
150
+
151
+ #: wpmandrill.php:109
152
+ msgid "Content"
153
+ msgstr "Contenido"
154
 
155
+ #: wpmandrill.php:112
156
  msgid "General Tags"
157
  msgstr "Etiquetas Generales"
158
 
159
+ #: wpmandrill.php:113
160
+ msgid "&nbsp;"
161
+ msgstr "&nbsp;"
162
+
163
+ #: wpmandrill.php:119
164
  msgid "Send a test email using these settings"
165
  msgstr "Enviar un correo electrónico de prueba usando estas configuraciones"
166
 
167
+ #: wpmandrill.php:120
168
  msgid "Send to"
169
  msgstr "Enviar a"
170
 
171
+ #: wpmandrill.php:121
172
  msgid "Subject"
173
  msgstr "Asunto"
174
 
175
+ #: wpmandrill.php:122
176
  msgid "Message"
177
  msgstr "Mensaje"
178
 
179
+ #: wpmandrill.php:134
180
+ #: wpmandrill.php:256
181
  msgid "Mandrill Settings"
182
  msgstr "Configuración de Mandrill"
183
 
184
+ #: wpmandrill.php:135
185
  msgid "Mandrill"
186
  msgstr "Mandrill"
187
 
188
+ #: wpmandrill.php:143
189
+ #: wpmandrill.php:144
190
  msgid "Mandrill Reports"
191
  msgstr "Reportes Mandrill"
192
 
193
+ #: wpmandrill.php:166
194
  msgid "Mandrill: wp_mail has been declared by another process or plugin, so you won't be able to use Mandrill until the problem is solved."
195
  msgstr "Mandrill: wp?install ha sido declarado por otro proceso o plugin por lo que no podras usar Mandrill hasta que soluciones este inconveniente."
196
 
197
+ #: wpmandrill.php:195
198
  msgid "To use this plugin you will need:"
199
  msgstr "Para utilizar este plugin necesitarás:"
200
 
201
+ #: wpmandrill.php:197
202
  msgid "Your Mandrill account."
203
  msgstr "Tu cuenta Mandrill"
204
 
205
+ #: wpmandrill.php:198
206
  msgid "At least one domain defined in your Mandrill account."
207
  msgstr "Mandrill: ¿Cómo decirle a WordPress que utilice wpMandrill?"
208
 
209
+ #: wpmandrill.php:199
210
  msgid "A valid sender email address."
211
  msgstr "Una dirección de correo electrónico de remitente válido."
212
 
213
+ #: wpmandrill.php:204
214
  msgid "Once you have properly configured the settings, the plugin will take care of all the emails sent through your WordPress installation."
215
  msgstr "Una vez que hayas completado la configuración, el plugin se hará cargo de todos los correos enviados a través de tu instalación WordPress."
216
 
217
+ #: wpmandrill.php:205
218
  msgid "However, if you need to customize any part of the email before sending, you can do so by using the WordPress filter <strong>mandrill_payload</strong>."
219
  msgstr "De cualquier forma, si alguna vez necesitas alterar cualquier parte del email antes de que este sea enviado, lo podrás hacer utilizando el filtro WordPress <strong>mandrill_payload</strong>."
220
 
221
+ #: wpmandrill.php:206
222
  msgid "This filter has the same structure as Mandrill's API call <a href=\"http://mandrillapp.com/api/docs/messages.html#method=send\" target=\"_blank\">/messages/send</a>, except that it can have one additional parameter when the email is based on a template. The parameter is called \"<em>template</em>\", which is an associative array of two elements (the first element, a string whose key is \"<em>template_name</em>\", and a second parameter whose key is \"<em>template_content</em>\". Its value is an array with the same structure of the parameter \"<em>template_content</em>\" in the call <a href=\"http://mandrillapp.com/api/docs/messages.html#method=send-template\" target=\"_blank\">/messages/send-template</a>.)"
223
  msgstr "Este filtro tiene la misma estructura de la llamada a la API de Mandrill <a href=\"http://mandrillapp.com/api/docs/messages.html#method=send\" target=\"_blank\">/messages/send</a>, excepto que esta podría tener un parámetro adicional cuando el email está basado en una plantilla. El parametro se llama \"<em>template</em>\", el cual es un arreglo asociativo de dos elementos (el primero, una cadena de caracteres cuya clave es \"<em>template_name</em>\", y un segundo parámetro cuya clave es \"<em>template_content</em>\" y su valor es una arreglo con la misma estructura del parámetro \"<em>template_content</em>\" de la llamada <a href=\"http://mandrillapp.com/api/docs/messages.html#method=send-template\" target=\"_blank\">/messages/send-template</a>.)"
224
 
225
+ #: wpmandrill.php:207
226
  msgid "Note that if you're sending additional headers in your emails, the only valid headers are <em>From:</em>, <em>Reply-To:</em>, and <em>X-*:</em>. <em>Bcc:</em> is also valid, but Mandrill will send the blind carbon copy to only the first address, and the remaining will be silently discarted."
227
  msgstr "Ten en cuenta que si estás intentando enviar cabeceras adicionales en tus correos, las únicas cabeceras válidas serán <em>From:</em>, <em>Reply-To:</em> y <em>X-*:</em>. <em>Bcc:</em> también es válido, pero Mandrill sólo enviará la copia oculta a la primera dirección, descartando silenciosamente el resto de las direcciones especificadas en el campo Bcc: que envíes."
228
 
229
+ #: wpmandrill.php:208
230
  msgid "Also note that if any error occurs while sending the email, the plugin will try to send the message again using the native WordPress mailing capabilities."
231
  msgstr "También ten presente que si ocurre cualquier error durante el envío del correo, el plugin intentará enviar el mensaje otra vez, utilizando las capacidades de envío de correo nativas de WordPress."
232
 
233
+ #: wpmandrill.php:209
234
  msgid "Confirm that any change you made to the payload is in line with the <a href=\"http://mandrillapp.com/api/docs/\" target=\"_blank\">Mandrill's API's documentation</a>. Also, the <em>X-*:</em> headers, must be in line with the <a href=\"http://help.mandrill.com/customer/portal/articles/456744-smtp-headers-api\" target=\"_blank\">SMTP API documentation</a>. By using this plugin, you agree that you and your website will adhere to <a href=\"http://mandrill.com/legal/terms/\" target=\"_blank\">Mandrill's Terms of Use</a>."
235
  msgstr "Asegúrate que cualquier cambio que hagas en el payload esté cónsono con la <a href=\"http://mandrillapp.com/api/docs/\" target=\"_blank\">Documentacion de la API de Mandrill</a>. También, las cabeceras <em>X-*:</em> deben estar en línea con la <a href=\"http://help.mandrill.com/customer/portal/articles/456744-smtp-headers-api\" target=\"_blank\">Documentación de la API SMTP</a>. Al utilizar este plugin estás aceptando adherirte tu y tu sitio web a los <a href=\"http://mandrill.com/legal/terms/\" target=\"_blank\">Términos y Condiciones de Mandrill</a>."
236
 
237
+ #: wpmandrill.php:210
238
  msgid "if you have any question about Mandrill or this plugin, visit the <a href=\"http://help.mandrill.com/\" target=\"_blank\">Mandrill's Support Center</a>."
239
  msgstr "Si tienes alguna pregunta sobre mandrill o este plugin, visita el <a href=\"http://help.mandrill.com/\" target=\"_blank\">Centro de Soporte de Mandrill</a>."
240
 
241
+ #: wpmandrill.php:228
242
  msgid "Settings"
243
  msgstr "Configuraciones"
244
 
245
+ #: wpmandrill.php:231
246
  msgid "Reports"
247
  msgstr "Reportes"
248
 
249
+ #: wpmandrill.php:247
250
  #: stats.php:1
251
  msgid "You do not have sufficient permissions to access this page."
252
  msgstr "No tienes suficiente permisología para acceder a esta página."
253
 
254
+ #: wpmandrill.php:277
255
  msgid "Send Email"
256
  msgstr "Campo Email:"
257
 
258
+ #: wpmandrill.php:295
259
  msgid "Latest from Mandrill..."
260
  msgstr "Lo último de Mandrill..."
261
 
262
+ #: wpmandrill.php:309
263
  msgid "News from MailChimp..."
264
  msgstr "Noticias de MailChimp"
265
 
266
+ #: wpmandrill.php:336
267
  msgid "Mandrill How-Tos"
268
  msgstr "Mandrill: ¿Cómo hago?"
269
 
270
+ #: wpmandrill.php:363
271
  msgid "You must define a valid sender email."
272
  msgstr "Debes definir un correo electrónico de remitente válido."
273
 
274
+ #: wpmandrill.php:643
275
  msgid "Test email send failed. "
276
  msgstr "El correo electrónico de prueba falló."
277
 
278
+ #: wpmandrill.php:660
279
  #, php-format
280
  msgid "Test executed: %d emails sent, %d emails queued and %d emails rejected"
281
  msgstr "Prueba ejecutada: %d emails enviados, %d emails encolados y %d emails rechazados"
282
 
283
+ #: wpmandrill.php:675
284
  msgid "To get your API key, please visit your <a href=\"http://mandrillapp.com/settings/index\" target=\"_blank\">Mandrill Settings</a>"
285
  msgstr "Para obtener tu Clave API, por favor visita tu <a href=\"http://mandrillapp.com/settings/index\" target=\"_blank\">Configuración Mandrill</a>"
286
 
287
+ #: wpmandrill.php:677
288
  msgid "We are connected to your Mandrill Account."
289
  msgstr "Estamos conectados a tu cuenta Mandrill."
290
 
291
+ #: wpmandrill.php:679
292
  msgid "Sorry, invalid API key."
293
  msgstr "Lo siento, Clave API inválida."
294
 
295
+ #: wpmandrill.php:695
296
  msgid "No domains found."
297
  msgstr "No se encontraros dominios."
298
 
299
+ #: wpmandrill.php:707
300
  msgid "This address will be used as the sender of the outgoing emails:"
301
  msgstr "Esta dirección será utilizada como el remitente para los correos salientes:"
302
 
303
+ #: wpmandrill.php:713
304
  msgid "If you need to add a new domain, please visit your <a href=\"https://mandrillapp.com/settings/sending-domains\" target=\"_blank\">Mandrill Settings</a>"
305
  msgstr "Si necesita agregar un nuevo dominio, por favor visita tu <a href=\"https://mandrillapp.com/settings/sending-domains\" target=\"_blank\">Configuracipón Mandrill</a>"
306
 
307
+ #: wpmandrill.php:723
308
  msgid "Name the recipients will see in their email clients:"
309
  msgstr "Nombre que los destinatarios verán en sus clientes de correo:"
310
 
311
+ #: wpmandrill.php:735
312
+ msgid "This address will be used as the recipient where replies from the users will be sent to:"
313
+ msgstr "Esta dirección será utilizada como el destinatario a donde irán las respuestas de los remitentes:"
314
+
315
+ #: wpmandrill.php:737
316
+ msgid "Leave blank to use the FROM Email. If you want to override this setting, you must use the <em><a href=\"#\" onclick=\"jQuery('a#contextual-help-link').trigger('click');return false;\">mandrill_payload</a></em> WordPress filter."
317
+ msgstr "Deja en blanco para usar el Campo Email. Si quisieras cambiar esta configuración para casos particulares, deberás usar el filtro WordPress <em><a href=\"#\" onclick=\"jQuery('a#contextual-help-link').trigger('click');return false;\">mandrill_payload</a></em>."
318
+
319
+ #: wpmandrill.php:746
320
+ #: wpmandrill.php:756
321
  msgid "No templates found."
322
  msgstr "No se encontraron plantillas."
323
 
324
+ #: wpmandrill.php:765
325
  msgid "Select the template to use:"
326
  msgstr "Seleccione la plantilla a utilizar:"
327
 
328
+ #: wpmandrill.php:771
329
  msgid "<small>The selected template must have a <strong><em>mc:edit=\"main\"</em></strong> placeholder defined. The message will be shown there.</small>"
330
  msgstr "<small>La plantilla seleccionada debe tener una sección <strong><em>mc:edit=\"main\"</em></strong> definida. El mensaje será mostrado ahí.</small>"
331
 
332
+ #: wpmandrill.php:780
333
+ msgid ""
334
+ "Replace all line feeds (\"\\n"
335
+ "\") by &lt;br/&gt; in the message body?"
336
+ msgstr ""
337
+ "Reemplazar todas las Nuevas Líneas (\"\n"
338
+ "\") por <br/> en el cuerpo del mensaje?"
339
+
340
+ #: wpmandrill.php:782
341
+ msgid "<small>If you are sending HTML emails already keep this setting deactivated.<br/>But if you are sending text only emails (WordPress default) this option might help your emails look better.</small>"
342
+ msgstr "<small>Si ya estás enviando correos HTML mantén esta opción desactivada.<br/>Pero si estás enviando correos de solo texto (forma predeterminada de WordPress) esta opción podría ayudarte a que los correos se vean mejor.</small>"
343
+
344
+ #: wpmandrill.php:791
345
  msgid "If there are tags that you want appended to every call, list them here, one per line:"
346
  msgstr "Si hay etiquetas que quieras agregar a cada llamada, lístalas aquí, una por línea."
347
 
348
+ #: wpmandrill.php:793
349
  msgid "Also keep in mind that you can add or remove tags using the <em><a href=\"#\" onclick=\"jQuery('a#contextual-help-link').trigger('click');return false;\">mandrill_payload</a></em> WordPress filter."
350
  msgstr "También recuerda que puedes agregar o eliminar etiquetas utilizando el filtro WordPress <em><a href=\"#\" onclick=\"jQuery('a#contextual-help-link').trigger('click');return false;\">mandrill_payload</a></em>."
351
 
352
+ #: wpmandrill.php:1017
353
  msgid "Mandrill Recent Statistics"
354
  msgstr "Estadistas Recientes de Mandrill"
355
 
356
+ #: wpmandrill.php:1102
357
+ #: wpmandrill.php:1357
 
 
 
 
 
 
358
  msgid "Sending Volume"
359
  msgstr "Volumen de Envío"
360
 
361
+ #: wpmandrill.php:1103
362
+ #: wpmandrill.php:1358
363
  msgid " emails"
364
  msgstr " emails"
365
 
366
+ #: wpmandrill.php:1104
367
+ #: wpmandrill.php:1359
368
  msgid "Total Volume per Day"
369
  msgstr "Volumen Total por Período"
370
 
371
+ #: wpmandrill.php:1106
372
+ #: wpmandrill.php:1361
373
  msgid "in the last few days"
374
  msgstr "en los últimos días"
375
 
376
+ #: wpmandrill.php:1107
377
+ #: wpmandrill.php:1362
378
  msgid "in the last few months"
379
  msgstr "en los últimos meses"
380
 
381
+ #: wpmandrill.php:1108
382
+ #: wpmandrill.php:1363
383
  msgid "Today"
384
  msgstr "Hoy"
385
 
386
+ #: wpmandrill.php:1109
387
+ #: wpmandrill.php:1364
388
  msgid "Last 7 Days"
389
  msgstr "Últimos 7 Días"
390
 
391
+ #: wpmandrill.php:1110
392
+ #: wpmandrill.php:1365
393
  msgid "Last 30 Days"
394
  msgstr "Últimos 30 Días"
395
 
396
+ #: wpmandrill.php:1111
397
+ #: wpmandrill.php:1366
398
  msgid "Last 60 Days"
399
  msgstr "Últimos 60 Días"
400
 
401
+ #: wpmandrill.php:1112
402
+ #: wpmandrill.php:1367
403
  msgid "Last 90 Days"
404
  msgstr "Últimos 90 Días"
405
 
406
+ #: wpmandrill.php:1113
407
+ #: wpmandrill.php:1368
408
  msgid "Periods"
409
  msgstr "Períodos"
410
 
411
+ #: wpmandrill.php:1114
412
+ #: wpmandrill.php:1369
413
  #: stats.php:30
414
  msgid "Volume"
415
  msgstr "Volumen"
416
 
417
+ #: wpmandrill.php:1115
418
+ #: wpmandrill.php:1370
419
  msgid "Total:"
420
  msgstr "Cuota:"
421
 
422
+ #: wpmandrill.php:1116
423
+ #: wpmandrill.php:1371
424
  msgid "Unopened"
425
  msgstr "No abiertos"
426
 
427
+ #: wpmandrill.php:1117
428
+ #: wpmandrill.php:1372
429
  msgid "Bounced or Rejected"
430
  msgstr "Rebotes o Rechazos"
431
 
432
+ #: wpmandrill.php:1118
433
+ #: wpmandrill.php:1373
434
  msgid "Opened"
435
  msgstr "Abiertos"
436
 
437
+ #: wpmandrill.php:1121
438
+ #: wpmandrill.php:1376
439
  msgid "Average Sending Volume"
440
  msgstr "Volumen de Envío Promedio"
441
 
442
+ #: wpmandrill.php:1122
443
+ #: wpmandrill.php:1377
444
  msgid "/day"
445
  msgstr "/día"
446
 
447
+ #: wpmandrill.php:1123
448
+ #: wpmandrill.php:1378
449
  msgid "Average Volume per Day"
450
  msgstr "Volumen Promedio por Período"
451
 
452
+ #: wpmandrill.php:1260
453
+ #: stats.php:8
454
+ msgid "There was a problem retrieving statistics."
455
+ msgstr "Hubo un problema recuperando las estadísticas."
456
+
457
+ #: wpmandrill.php:1289
458
  #: stats.php:57
459
  msgid "Filter by:"
460
  msgstr "Filtrar por:"
461
 
462
+ #: wpmandrill.php:1291
463
  #: stats.php:59
464
  msgid "No filter"
465
  msgstr "Sin Filtro"
466
 
467
+ #: wpmandrill.php:1292
468
  #: stats.php:60
469
  msgid "Sender:"
470
  msgstr "Remitente:"
471
 
472
+ #: wpmandrill.php:1299
473
  #: stats.php:67
474
  msgid "Tag:"
475
  msgstr "Etiqueta:"
476
 
477
+ #: wpmandrill.php:1307
478
  #: stats.php:80
479
  msgid "Display:"
480
  msgstr "Mostrar:"
481
 
482
+ #: wpmandrill.php:1309
483
  #: stats.php:82
484
  msgid "Total Volume per Period"
485
  msgstr "Volumen Total por Período"
486
 
487
+ #: wpmandrill.php:1310
488
  #: stats.php:83
489
  msgid "Average Volume per Period"
490
  msgstr "Volumen Promedio por Período"
lib/mandrill.class.php CHANGED
@@ -478,4 +478,5 @@ class Mandrill {
478
  );
479
  }
480
  }
 
481
  ?>
478
  );
479
  }
480
  }
481
+
482
  ?>
readme.txt CHANGED
@@ -87,3 +87,10 @@ If the sending fails for any reason, the plugin will try to send it again using
87
  * UPDATED: Spanish translation updated.
88
  * FIXED: Speeding dashboard widget results.
89
 
 
 
 
 
 
 
 
87
  * UPDATED: Spanish translation updated.
88
  * FIXED: Speeding dashboard widget results.
89
 
90
+ = 1.08 =
91
+ * FIXED: Wrong references to self:: in wp_mail introduce in 1.04 :(
92
+
93
+ = 1.09 =
94
+ * ADDED: Reply-To Setting
95
+ * ADDED: Replacing line feed by <br> setting.
96
+
wpmandrill.php CHANGED
@@ -5,7 +5,7 @@ Description: wpMandrill sends emails, generated by WordPress using Mandrill.
5
  Author: Mandrill
6
  Author URI: http://mandrillapp.com/
7
  Plugin URI: http://connect.mailchimp.com/integrations/wpmandrill
8
- Version: 1.07
9
  Text Domain: wpmandrill
10
  */
11
 
@@ -62,18 +62,18 @@ class wpMandrill {
62
 
63
  try {
64
 
65
- $sent = self::mail( $to, $subject, $message, $headers, $attachments );
66
 
67
  if ( is_wp_error($sent)
68
  || !isset($sent[0]['status'])
69
  || ( isset($sent[0]['status']) && 'sent' != $sent[0]['status'] ) ) {
70
 
71
- return self::wp_mail_native( $to, $subject, $message, $headers, $attachments );
72
  }
73
 
74
  return true;
75
  } catch ( Exception $e ) {
76
- return self::wp_mail_native( $to, $subject, $message, $headers, $attachments );
77
  }
78
  }
79
  }
@@ -101,10 +101,12 @@ class wpMandrill {
101
  add_settings_section('wpmandrill-addresses', __('Sender Settings', self::WPDOMAIN), '__return_false', self::WPDOMAIN);
102
  add_settings_field('from-name', __('FROM Name', self::WPDOMAIN), array(__CLASS__, 'askFromName'), self::WPDOMAIN, 'wpmandrill-addresses');
103
  add_settings_field('from-email', __('FROM Email', self::WPDOMAIN), array(__CLASS__, 'askFromEmail'), self::WPDOMAIN, 'wpmandrill-addresses');
 
104
 
105
  // Template
106
- add_settings_section('wpmandrill-templates', __('General Template', self::WPDOMAIN), '__return_false', self::WPDOMAIN);
107
- add_settings_field('template', __('&nbsp;', self::WPDOMAIN), array(__CLASS__, 'askTemplate'), self::WPDOMAIN, 'wpmandrill-templates');
 
108
 
109
  // Tags
110
  add_settings_section('wpmandrill-tags', __('General Tags', self::WPDOMAIN), '__return_false', self::WPDOMAIN);
@@ -366,8 +368,13 @@ class wpMandrill {
366
  $input['from_username'] = '';
367
  $input['from_domain'] = '';
368
  }
 
 
 
 
 
369
 
370
- return array_map('wp_strip_all_tags', $input);
371
  }
372
 
373
  /**
@@ -487,6 +494,14 @@ jQuery(document).bind( 'ready', function() {
487
  return self::getOption('from_name');
488
  }
489
 
 
 
 
 
 
 
 
 
490
  /**
491
  * @return string|boolean
492
  */
@@ -495,6 +510,14 @@ jQuery(document).bind( 'ready', function() {
495
  return self::getOption('template');
496
  }
497
 
 
 
 
 
 
 
 
 
498
  /**
499
  * @return string|boolean
500
  */
@@ -681,7 +704,7 @@ jQuery(document).bind( 'ready', function() {
681
  return;
682
  }
683
 
684
- ?><span class="setting-description"><em><?php _e('This address will be used as the sender of the outgoing emails:', self::WPDOMAIN); ?></em></span><br />
685
  <input id="from_username" name="wpmandrill[from_username]" type="text" value="<?php esc_attr_e($from_username);?>" style="text-align:right;width:100px">@
686
  <select id="from_domain" name="wpmandrill[from_domain]"><?php
687
  foreach( $domains as $curdomain ) {
@@ -697,13 +720,25 @@ jQuery(document).bind( 'ready', function() {
697
 
698
  $from_name = self::getFromName();
699
 
700
- ?><span class="setting-description"><em><?php _e('Name the recipients will see in their email clients:', self::WPDOMAIN); ?></em></span><br />
701
  <input name="wpmandrill[from_name]" type="text" value="<?php esc_attr_e($from_name); ?>">
702
  <?php
703
 
704
  echo '</div>';
705
  }
706
 
 
 
 
 
 
 
 
 
 
 
 
 
707
  static function askTemplate() {
708
  echo '<div class="inside">';
709
 
@@ -727,7 +762,7 @@ jQuery(document).bind( 'ready', function() {
727
  return;
728
  }
729
 
730
- ?><span class="setting-description"><em><?php _e('Select the template to use:', self::WPDOMAIN); ?></em></span><br />
731
  <select name="wpmandrill[template]">
732
  <option value="">-None-</option><?php
733
  foreach( $templates as $curtemplate ) {
@@ -737,13 +772,23 @@ jQuery(document).bind( 'ready', function() {
737
 
738
  echo '</div>';
739
  }
740
-
 
 
 
 
 
 
 
 
 
 
741
  static function askTags() {
742
  echo '<div class="inside">';
743
 
744
  $tags = self::getTags();
745
 
746
- ?><span class="setting-description"><em><?php _e('If there are tags that you want appended to every call, list them here, one per line:', self::WPDOMAIN); ?></em></span><br />
747
  <textarea name="wpmandrill[tags]" cols="25" rows="3"><?php echo $tags; ?></textarea><br/>
748
  <span class="setting-description"><small><em><?php _e('Also keep in mind that you can add or remove tags using the <em><a href="#" onclick="jQuery(\'a#contextual-help-link\').trigger(\'click\');return false;">mandrill_payload</a></em> WordPress filter.', self::WPDOMAIN); ?></em></small></span>
749
  <?php
@@ -1634,7 +1679,7 @@ JS;
1634
  break;
1635
 
1636
  case 'bcc':
1637
- // Note: Mandrill's API only accept one BCC address. The other addresses supplied will be silently discarted
1638
  $bcc = array_merge( (array) $bcc, explode( ',', $content ) );
1639
 
1640
  $message['bcc_address'] = $bcc[0];
@@ -1653,6 +1698,11 @@ JS;
1653
  }
1654
  }
1655
  }
 
 
 
 
 
1656
 
1657
  // Checking the To: field
1658
  if( !is_array($message['to']) ) $message['to'] = explode(',', $message['to']);
@@ -1683,7 +1733,7 @@ JS;
1683
  $message['track_clicks']= $track_clicks;
1684
 
1685
  // Common transformations for the HTML part
1686
- $message['html'] = nl2br($message['html']);
1687
 
1688
  // Defining template to use
1689
 
5
  Author: Mandrill
6
  Author URI: http://mandrillapp.com/
7
  Plugin URI: http://connect.mailchimp.com/integrations/wpmandrill
8
+ Version: 1.09
9
  Text Domain: wpmandrill
10
  */
11
 
62
 
63
  try {
64
 
65
+ $sent = wpMandrill::mail( $to, $subject, $message, $headers, $attachments );
66
 
67
  if ( is_wp_error($sent)
68
  || !isset($sent[0]['status'])
69
  || ( isset($sent[0]['status']) && 'sent' != $sent[0]['status'] ) ) {
70
 
71
+ return wpMandrill::wp_mail_native( $to, $subject, $message, $headers, $attachments );
72
  }
73
 
74
  return true;
75
  } catch ( Exception $e ) {
76
+ return wpMandrill::wp_mail_native( $to, $subject, $message, $headers, $attachments );
77
  }
78
  }
79
  }
101
  add_settings_section('wpmandrill-addresses', __('Sender Settings', self::WPDOMAIN), '__return_false', self::WPDOMAIN);
102
  add_settings_field('from-name', __('FROM Name', self::WPDOMAIN), array(__CLASS__, 'askFromName'), self::WPDOMAIN, 'wpmandrill-addresses');
103
  add_settings_field('from-email', __('FROM Email', self::WPDOMAIN), array(__CLASS__, 'askFromEmail'), self::WPDOMAIN, 'wpmandrill-addresses');
104
+ add_settings_field('reply-to', __('Reply-To Email', self::WPDOMAIN), array(__CLASS__, 'askReplyTo'), self::WPDOMAIN, 'wpmandrill-addresses');
105
 
106
  // Template
107
+ add_settings_section('wpmandrill-templates', __('General Design', self::WPDOMAIN), '__return_false', self::WPDOMAIN);
108
+ add_settings_field('template', __('Template', self::WPDOMAIN), array(__CLASS__, 'askTemplate'), self::WPDOMAIN, 'wpmandrill-templates');
109
+ add_settings_field('nl2br', __('Content', self::WPDOMAIN), array(__CLASS__, 'asknl2br'), self::WPDOMAIN, 'wpmandrill-templates');
110
 
111
  // Tags
112
  add_settings_section('wpmandrill-tags', __('General Tags', self::WPDOMAIN), '__return_false', self::WPDOMAIN);
368
  $input['from_username'] = '';
369
  $input['from_domain'] = '';
370
  }
371
+
372
+ // Preserving the Reply-To address
373
+ $reply_to = $input['reply_to'];
374
+ $response = array_map('wp_strip_all_tags', $input);
375
+ $response['reply_to'] = $reply_to;
376
 
377
+ return $response;
378
  }
379
 
380
  /**
494
  return self::getOption('from_name');
495
  }
496
 
497
+ /**
498
+ * @return string|boolean
499
+ */
500
+ static function getReplyTo() {
501
+
502
+ return self::getOption('reply_to');
503
+ }
504
+
505
  /**
506
  * @return string|boolean
507
  */
510
  return self::getOption('template');
511
  }
512
 
513
+ /**
514
+ * @return string|boolean
515
+ */
516
+ static function getnl2br() {
517
+
518
+ return self::getOption('nl2br');
519
+ }
520
+
521
  /**
522
  * @return string|boolean
523
  */
704
  return;
705
  }
706
 
707
+ ?><?php _e('This address will be used as the sender of the outgoing emails:', self::WPDOMAIN); ?><br />
708
  <input id="from_username" name="wpmandrill[from_username]" type="text" value="<?php esc_attr_e($from_username);?>" style="text-align:right;width:100px">@
709
  <select id="from_domain" name="wpmandrill[from_domain]"><?php
710
  foreach( $domains as $curdomain ) {
720
 
721
  $from_name = self::getFromName();
722
 
723
+ ?><?php _e('Name the recipients will see in their email clients:', self::WPDOMAIN); ?><br />
724
  <input name="wpmandrill[from_name]" type="text" value="<?php esc_attr_e($from_name); ?>">
725
  <?php
726
 
727
  echo '</div>';
728
  }
729
 
730
+ static function askReplyTo() {
731
+ echo '<div class="inside">';
732
+
733
+ $reply_to = self::getReplyTo();
734
+
735
+ ?><?php _e('This address will be used as the recipient where replies from the users will be sent to:', self::WPDOMAIN); ?><br />
736
+ <input id="reply_to" name="wpmandrill[reply_to]" type="text" value="<?php esc_attr_e($reply_to);?>"><br/>
737
+ <span class="setting-description"><small><em><?php _e('Leave blank to use the FROM Email. If you want to override this setting, you must use the <em><a href="#" onclick="jQuery(\'a#contextual-help-link\').trigger(\'click\');return false;">mandrill_payload</a></em> WordPress filter.', self::WPDOMAIN); ?></em></small></span><?php
738
+
739
+ echo '</div>';
740
+ }
741
+
742
  static function askTemplate() {
743
  echo '<div class="inside">';
744
 
762
  return;
763
  }
764
 
765
+ ?><?php _e('Select the template to use:', self::WPDOMAIN); ?><br />
766
  <select name="wpmandrill[template]">
767
  <option value="">-None-</option><?php
768
  foreach( $templates as $curtemplate ) {
772
 
773
  echo '</div>';
774
  }
775
+ static function asknl2br() {
776
+ $nl2br = self::getnl2br();
777
+ if ( $nl2br == '' ) $nl2br = 0;
778
+ ?>
779
+ <div class="inside">
780
+ <?php _e('Replace all line feeds ("\n") by &lt;br/&gt; in the message body?', self::WPDOMAIN); ?>
781
+ <input name="wpmandrill[nl2br]" type="checkbox" <?=checked($nl2br,1); ?> value='1' /><br/>
782
+ <span class="setting-description"><em><?php _e('<small>If you are sending HTML emails already keep this setting deactivated.<br/>But if you are sending text only emails (WordPress default) this option might help your emails look better.</small>', self::WPDOMAIN); ?></em></span>
783
+ </div><?php
784
+ }
785
+
786
  static function askTags() {
787
  echo '<div class="inside">';
788
 
789
  $tags = self::getTags();
790
 
791
+ ?><?php _e('If there are tags that you want appended to every call, list them here, one per line:', self::WPDOMAIN); ?><br />
792
  <textarea name="wpmandrill[tags]" cols="25" rows="3"><?php echo $tags; ?></textarea><br/>
793
  <span class="setting-description"><small><em><?php _e('Also keep in mind that you can add or remove tags using the <em><a href="#" onclick="jQuery(\'a#contextual-help-link\').trigger(\'click\');return false;">mandrill_payload</a></em> WordPress filter.', self::WPDOMAIN); ?></em></small></span>
794
  <?php
1679
  break;
1680
 
1681
  case 'bcc':
1682
+ // TODO: Mandrill's API only accept one BCC address. The other addresses supplied will be silently discarted
1683
  $bcc = array_merge( (array) $bcc, explode( ',', $content ) );
1684
 
1685
  $message['bcc_address'] = $bcc[0];
1698
  }
1699
  }
1700
  }
1701
+
1702
+ $reply_to = self::getReplyTo();
1703
+ if ( !empty($reply_to) && !in_array( 'reply_to', array_map( 'strtolower', array_keys($message['headers']) ) ) ) {
1704
+ $message['headers']['Reply-To'] = trim(self::getReplyTo());
1705
+ }
1706
 
1707
  // Checking the To: field
1708
  if( !is_array($message['to']) ) $message['to'] = explode(',', $message['to']);
1733
  $message['track_clicks']= $track_clicks;
1734
 
1735
  // Common transformations for the HTML part
1736
+ if ( self::getnl2br() == 1 ) $message['html'] = nl2br($message['html']);
1737
 
1738
  // Defining template to use
1739