engineering/unrhodecode
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

emails: expose inline/general next to comment type.

Browse source
This commit is contained in:
Daniel Dourvaris 2019-11-08 16:40:09 +01:00
parent 06b5e64be7
commit 1cda15c2a2
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
rhodecode/templates/email_templates/commit_comment.mako
View file

@ -47,7 +47,7 @@ data = {
}
%>
* ${_('Comment link')}: ${commit_comment_url}
* ${('Inline' if comment_file else 'General')} ${_('Comment link')}: ${commit_comment_url}
%if status_change:
* ${_('Commit status')}: ${_('Status was changed to')}: *${status_change}*
@ -152,9 +152,9 @@ data = {
<tr style="border-bottom:1px solid #dbd9da;">
<td colspan="2" style="padding-right:20px;">
% if comment_type == 'todo':
${_('`TODO` number')} ${comment_id}:
${('Inline' if comment_file else 'General')} ${_('`TODO` number')} ${comment_id}:
% else:
${_('`Note` number')} ${comment_id}:
${('Inline' if comment_file else 'General')} ${_('`Note` number')} ${comment_id}:
% endif
</td>
</tr>

6
rhodecode/templates/email_templates/pull_request_comment.mako
View file

@ -61,7 +61,7 @@ ${h.literal(_('Pull request !{pr_id}: `{pr_title}`').format(**data))}
* ${h.literal(_('Commit flow: {source_ref_type}:{source_ref_name} of {source_repo_url} into {target_ref_type}:{target_ref_name} of {target_repo_url}').format(**data))}
* ${_('Comment link')}: ${pr_comment_url}
* ${('Inline' if comment_file else 'General')} ${_('Comment link')}: ${pr_comment_url}
%if status_change and not closing_pr:
* ${_('{user} submitted pull request !{pr_id} status: *{status}*').format(**data)}
@ -182,9 +182,9 @@ data = {
<tr style="border-bottom:1px solid #dbd9da;">
<td colspan="2" style="padding-right:20px;">
% if comment_type == 'todo':
${_('`TODO` number')} ${comment_id}:
${('Inline' if comment_file else 'General')} ${_('`TODO` number')} ${comment_id}:
% else:
${_('`Note` number')} ${comment_id}:
${('Inline' if comment_file else 'General')} ${_('`Note` number')} ${comment_id}:
% endif
</td>
</tr>