Edgewall Software

Changes between Version 99 and Version 100 of TracNotification


Ignore:
Timestamp:
Jun 25, 2018, 10:06:51 PM (6 years ago)
Author:
Ryan J Ollos
Comment:

Update default notification template.

Legend:

Unmodified
Added
Removed
Modified
  • TracNotification

    v99 v100  
    116116
    117117{{{#!genshi
    118 ${ticket_body_hdr}
    119 ${ticket_props}
    120 # if ticket.new:
    121 ${ticket.description}
    122 # else:
    123 #   if changes_body:
     118$ticket_body_hdr
     119$ticket_props
     120{% choose ticket.new %}\
     121{%   when True %}\
     122$ticket.description
     123{%   end %}\
     124{%   otherwise %}\
     125{%     if changes_body %}\
    124126${_('Changes (by %(author)s):', author=change.author)}
    125127
    126 ${changes_body}
    127 #   endif
    128 #   if changes_descr:
    129 #     if not changes_body and not change.comment and change.author:
     128$changes_body
     129{%     end %}\
     130{%     if changes_descr %}\
     131{%       if not changes_body and not change.comment and change.author %}\
    130132${_('Description changed by %(author)s:', author=change.author)}
    131 #     endif
    132 ${changes_descr}
     133{%       end %}\
     134$changes_descr
    133135--
    134 #   endif
    135 #   if change.comment:
    136 
    137 ${_('Comment:') if changes_body else
    138   _('Comment (by %(author)s):', author=change.author)}
    139 
    140 ${change.comment}
    141 #   endif
    142 # endif
    143 --
     136{%     end %}\
     137{%     if change.comment %}\
     138
     139${_('Comment:') if changes_body else _('Comment (by %(author)s):', author=change.author)}
     140
     141$change.comment
     142{%     end %}\
     143{%   end %}\
     144{% end %}\
     145
     146${'-- '}
    144147${_('Ticket URL: <%(link)s>', link=ticket.link)}
    145 ${project.name} <${project.url or abs_href()}>
    146 ${project.descr}
     148$project.name <${project.url or abs_href()}>
     149$project.descr
    147150}}}
    148151