liquid_feedback_frontend

changeset 1305:fd50bdd36a4b

Set name for To: field of notification mails, added missing translation function call
author bsw
date Sat May 07 19:27:58 2016 +0200 (2016-05-07)
parents 0160d9a01d0a
children 1172f9411000
files model/event.lua model/initiative_for_notification.lua model/newsletter.lua
line diff
     1.1 --- a/model/event.lua	Fri May 06 09:40:25 2016 +0200
     1.2 +++ b/model/event.lua	Sat May 07 19:27:58 2016 +0200
     1.3 @@ -124,7 +124,7 @@
     1.4            envelope_from = config.mail_envelope_from,
     1.5            from          = config.mail_from,
     1.6            reply_to      = config.mail_reply_to,
     1.7 -          to            = member.notify_email,
     1.8 +          to            = { name = member.name, address = member.notify_email },
     1.9            subject       = subject,
    1.10            content_type  = "text/plain; charset=UTF-8",
    1.11            content       = body
     2.1 --- a/model/initiative_for_notification.lua	Fri May 06 09:40:25 2016 +0200
     2.2 +++ b/model/initiative_for_notification.lua	Sat May 07 19:27:58 2016 +0200
     2.3 @@ -76,9 +76,7 @@
     2.4        if string.sub(issue.state_time_left, 1, 1) == "-" then
     2.5          state_time_text = _"Phase ends soon"
     2.6        else
     2.7 -        state_time_text = _( "#{interval} left", {
     2.8 -          interval = format.interval_text(issue.state_time_left)
     2.9 -        })
    2.10 +        state_time_text = format.interval_text(issue.state_time_left, { mode = "time_left" })
    2.11        end
    2.12        m[#m+1] = "---"
    2.13        m[#m+1] = policy.name .. " #" .. issue.id .. " - " .. issue.state_name .. " - " .. state_time_text
    2.14 @@ -112,7 +110,7 @@
    2.15      end
    2.16      if entry.leading then
    2.17        source = source and source .. ", " or ""
    2.18 -      source = source .. "currently leading"
    2.19 +      source = source .. _"currently leading"
    2.20      end
    2.21      m[#m+1] = "(" .. source .. ")"
    2.22      m[#m+1] = ""
    2.23 @@ -162,7 +160,7 @@
    2.24      envelope_from = config.mail_envelope_from,
    2.25      from          = config.mail_from,
    2.26      reply_to      = config.mail_reply_to,
    2.27 -    to            = member.notify_email,
    2.28 +    to            = { name = member.name, address = member.notify_email },
    2.29      subject       = subject,
    2.30      content_type  = "text/plain; charset=UTF-8",
    2.31      content       = message
     3.1 --- a/model/newsletter.lua	Fri May 06 09:40:25 2016 +0200
     3.2 +++ b/model/newsletter.lua	Sat May 07 19:27:58 2016 +0200
     3.3 @@ -28,7 +28,7 @@
     3.4          envelope_from = config.mail_envelope_from,
     3.5          from          = config.mail_from,
     3.6          reply_to      = config.mail_reply_to,
     3.7 -        to            = member.notify_email,
     3.8 +        to            = { name = member.name, address = member.notify_email },
     3.9          subject       = newsletter.subject,
    3.10          content_type  = "text/plain; charset=UTF-8",
    3.11          content       = newsletter.content
    3.12 @@ -39,4 +39,4 @@
    3.13    
    3.14    return true
    3.15    
    3.16 -end
    3.17 \ No newline at end of file
    3.18 +end

Impressum / About Us