1.1 --- a/model/event.lua	Wed Mar 07 19:30:52 2012 +0100
     1.2 +++ b/model/event.lua	Thu Mar 08 14:34:41 2012 +0100
     1.3 @@ -23,12 +23,12 @@
     1.4  
     1.5    local body = ""
     1.6    
     1.7 -  body = body .. _("      Unit: #{name}\n", { name = self.issue.area.unit.name })
     1.8 -  body = body .. _("      Area: #{name}\n", { name = self.issue.area.name })
     1.9 -  body = body .. _("     Issue: ##{id}\n", { id = self.issue_id })
    1.10 -  body = body .. _("    Policy: #{phase}\n", { phase = self.issue.policy.name })
    1.11 -  body = body .. _("     Phase: #{phase}\n\n", { phase = self.state })
    1.12 -  body = body .. _("     Event: #{event}\n\n", { event = self.event })
    1.13 +  body = body .. _("[event mail]      Unit: #{name}", { name = self.issue.area.unit.name }) .. "\n"
    1.14 +  body = body .. _("[event mail]      Area: #{name}", { name = self.issue.area.name }) .. "\n"
    1.15 +  body = body .. _("[event mail]     Issue: ##{id}", { id = self.issue_id }) .. "\n"
    1.16 +  body = body .. _("[event mail]    Policy: #{policy}", { phase = self.issue.policy.name }) .. "\n"
    1.17 +  body = body .. _("[event mail]     Phase: #{phase}", { phase = self.state }) .. "\n\n"
    1.18 +  body = body .. _("[event mail]     Event: #{event}", { event = self.event }) .. "\n\n"
    1.19  
    1.20    if self.initiative_id then
    1.21      url = request.get_absolute_baseurl() .. "initiative/show/" .. self.initiative_id .. ".html"
    1.22 @@ -38,11 +38,11 @@
    1.23      url = request.get_absolute_baseurl() .. "issue/show/" .. self.issue_id .. ".html"
    1.24    end
    1.25    
    1.26 -  body = body .. _("       URL: #{url}\n\n", { url = url })
    1.27 +  body = body .. _("[event mail]       URL: #{url}", { url = url }) .. "\n\n"
    1.28    
    1.29    if self.initiative_id then
    1.30      local initiative = Initiative:by_id(self.initiative_id)
    1.31 -    body = body .. _("i#{id}: #{name}\n\n", { id = initiative.id, name = initiative.name })
    1.32 +    body = body .. _("i#{id}: #{name}", { id = initiative.id, name = initiative.name }) .. "\n\n"
    1.33    else
    1.34      local initiative_count = Initiative:new_selector()
    1.35        :add_where{ "initiative.issue_id = ?", self.issue_id }
    1.36 @@ -53,10 +53,10 @@
    1.37        :limit(3)
    1.38        :exec()
    1.39      for i, initiative in ipairs(initiatives) do
    1.40 -      body = body .. _("i#{id}: #{name}\n", { id = initiative.id, name = initiative.name })
    1.41 +      body = body .. _("i#{id}: #{name}", { id = initiative.id, name = initiative.name }) .. "\n"
    1.42      end
    1.43      if initiative_count - 3 > 0 then
    1.44 -      body = body .. _("and #{count} more initiatives\n", { count = initiative_count })
    1.45 +      body = body .. _("and #{count} more initiatives", { count = initiative_count }) .. "\n"
    1.46      end
    1.47      body = body .. "\n"
    1.48    end