# HG changeset patch # User Daniel Dourvaris # Date 2019-11-08 15:40:09 # Node ID 23a700f2f6f0d56c02ee284ae53254e734848e8b # Parent e5416152602287f5e3980973b8b00c86e83276ab emails: expose inline/general next to comment type. diff --git a/rhodecode/templates/email_templates/commit_comment.mako b/rhodecode/templates/email_templates/commit_comment.mako --- a/rhodecode/templates/email_templates/commit_comment.mako +++ b/rhodecode/templates/email_templates/commit_comment.mako @@ -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 = { % 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 diff --git a/rhodecode/templates/email_templates/pull_request_comment.mako b/rhodecode/templates/email_templates/pull_request_comment.mako --- a/rhodecode/templates/email_templates/pull_request_comment.mako +++ b/rhodecode/templates/email_templates/pull_request_comment.mako @@ -61,7 +61,7 @@ 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 = { % 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