##// END OF EJS Templates
fixes #691: Notifications for pull requests: move link to pull request to the top...
marcink -
r3121:3274ba9f beta
parent child Browse files
Show More
@@ -270,8 +270,9 b' class EmailNotificationModel(BaseModel):'
270
270
271 base = self.email_types.get(type_, self.email_types[self.TYPE_DEFAULT])
271 base = self.email_types.get(type_, self.email_types[self.TYPE_DEFAULT])
272 email_template = self._tmpl_lookup.get_template(base)
272 email_template = self._tmpl_lookup.get_template(base)
273 # translator inject
273 # translator and helpers inject
274 _kwargs = {'_': _}
274 _kwargs = {'_': _,
275 'h': h}
275 _kwargs.update(kwargs)
276 _kwargs.update(kwargs)
276 log.debug('rendering tmpl %s with kwargs %s' % (base, _kwargs))
277 log.debug('rendering tmpl %s with kwargs %s' % (base, _kwargs))
277 return email_template.render(**_kwargs)
278 return email_template.render(**_kwargs)
@@ -1,9 +1,10 b''
1 ## -*- coding: utf-8 -*-
1 ## -*- coding: utf-8 -*-
2 <%inherit file="main.html"/>
2 <%inherit file="main.html"/>
3
3
4 ${_('User %s opened pull request for repository %s and wants you to review changes.') % ('<b>%s</b>' % pr_user_created,pr_repo_url)}
4 ${_('User %s opened pull request for repository %s and wants you to review changes.') % (('<b>%s</b>' % pr_user_created),pr_repo_url) |n}
5 <div>${_('title')}: ${pr_title}</div>
5 <div>${_('title')}: ${pr_title}</div>
6 <div>${_('description')}:</div>
6 <div>${_('description')}:</div>
7 <div>${_('View this pull request here')}: ${pr_url}</div>
7 <p>
8 <p>
8 ${body}
9 ${body}
9 </p>
10 </p>
@@ -15,4 +16,4 b''
15 %endfor
16 %endfor
16 </ul>
17 </ul>
17
18
18 ${_('View this pull request here')}: ${pr_url}
19
General Comments 0
You need to be logged in to leave comments. Login now