From 94590ac50a281d6423a909e31448d6dd1d3247a2 Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Wed, 8 May 2019 12:47:07 +0200 Subject: [PATCH] Mail translation fixes --- debian/changelog | 2 +- package.json | 2 +- rest/misc/locale/es.json | 6 ++++-- rest/misc/mail.php | 9 +++++++-- 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9a31018f..82ef4169 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -hedera-web (1.406.44) stable; urgency=low +hedera-web (1.406.45) stable; urgency=low * Initial Release. diff --git a/package.json b/package.json index 8ec674bd..73aa9ce0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "hedera-web", - "version": "1.406.44", + "version": "1.406.45", "description": "Verdnatura web page", "license": "GPL-3.0", "repository": { diff --git a/rest/misc/locale/es.json b/rest/misc/locale/es.json index ad1f0198..c6fa7ca3 100644 --- a/rest/misc/locale/es.json +++ b/rest/misc/locale/es.json @@ -1,4 +1,6 @@ { - "

The response from the remote server was:

": "

La respuesta del servidor remoto ha sido:

" - ,"An automated message could not be delivered": "Un mensaje automatizado no se ha podido entregar" + "An automated message could not be delivered": "Un mensaje automatizado no se ha podido entregar" + ,"Notification from IT department about problem.": "Desde el departamento de informática te enviamos este correo porque ha habido un problema al intentar entregar un correo automatizado." + ,"If you have questions, resend this email to cau@verdnatura.es.": "Si tienes dudas, reenvia este correo a cau@verdnatura.es." + ,"The response from the remote server was:": "La respuesta del servidor remoto ha sido:" } \ No newline at end of file diff --git a/rest/misc/mail.php b/rest/misc/mail.php index f723c1c5..f2757ed6 100644 --- a/rest/misc/mail.php +++ b/rest/misc/mail.php @@ -42,9 +42,14 @@ class Mail extends Vn\Lib\Method { $status = $e->getMessage(); if ($row->replyTo) { + Vn\Lib\Locale::set('es'); + $errorMsg = + '

'. s('Notification from IT department about problem.') .'

' + .'

'. s('If you have questions, resend this email to cau@verdnatura.es.') .'

' + .'

'. $status .'

'; + $errorMail = $mailer->createObject($row->replyTo, - s('

The response from the remote server was:

') - ."

$status

", + $errorMsg, s('An automated message could not be delivered') ); $errorMail->AddStringAttachment(