emails: use more consistent output between commits email and pull request email.

rhodecode/templates/email_templates/commit_comment.mako

@@ -6,10 +6,11 b''
 <%
 data = {
     'user': h.person(user),
+    'repo_name': repo_name,
+    'commit_id': h.show_id(commit),
+    'status': status_change,
     'comment_file': comment_file,
     'comment_line': comment_line,
-    'repo_name': repo_name,
-    'commit_id': h.show_id(commit),
 }
 %>
 ${_('[mention]') if mention else ''} \
@@ -17,12 +18,26 b' data = {'
 % if comment_file:
     ${_('%(user)s commented on commit `%(commit_id)s` (file: `%(comment_file)s`)') % data} ${_('in the %(repo_name)s repository') % data}
 % else:
+    % if status_change:
+    ${_('%(user)s commented on commit `%(commit_id)s` (status: %(status)s)') % data |n} ${_('in the %(repo_name)s repository') % data}
+    % else:
     ${_('%(user)s commented on commit `%(commit_id)s`') % data |n} ${_('in the %(repo_name)s repository') % data}
+    % endif
 % endif
 
 </%def>
 
 <%def name="body_plaintext()" filter="n,trim">
+<%
+data = {
+    'user': h.person(user),
+    'repo_name': repo_name,
+    'commit_id': h.show_id(commit),
+    'status': status_change,
+    'comment_file': comment_file,
+    'comment_line': comment_line,
+}
+%>
 ${self.subject()}
 
 * ${_('Comment link')}: ${commit_comment_url}
@@ -35,13 +50,12 b' data = {'
 
 ---
 
-${comment_body|n}
-
-
 %if status_change:
     ${_('Commit status was changed to')}: *${status_change}*
 %endif
 
+${comment_body|n}
+
 ${self.plaintext_footer()}
 </%def>
 
@@ -58,11 +72,11 b' data = {'
 %>
 <table style="text-align:left;vertical-align:middle;">
     <tr><td colspan="2" style="width:100%;padding-bottom:15px;border-bottom:1px solid #dbd9da;">
-% if comment_file:
-    <h4><a href="${commit_comment_url}" style="color:#427cc9;text-decoration:none;cursor:pointer">${_('%(user)s commented on commit `%(commit_id)s` (file:`%(comment_file)s`)') % data}</a> ${_('in the %(repo)s repository') % data |n}</h4>
-% else:
-    <h4><a href="${commit_comment_url}" style="color:#427cc9;text-decoration:none;cursor:pointer">${_('%(user)s commented on commit `%(commit_id)s`') % data |n}</a> ${_('in the %(repo)s repository') % data |n}</h4>
-% endif
+    % if comment_file:
+        <h4><a href="${commit_comment_url}" style="color:#427cc9;text-decoration:none;cursor:pointer">${_('%(user)s commented on commit `%(commit_id)s` (file:`%(comment_file)s`)') % data}</a> ${_('in the %(repo)s repository') % data |n}</h4>
+    % else:
+        <h4><a href="${commit_comment_url}" style="color:#427cc9;text-decoration:none;cursor:pointer">${_('%(user)s commented on commit `%(commit_id)s`') % data |n}</a> ${_('in the %(repo)s repository') % data |n}</h4>
+    % endif
     </td></tr>
     <tr><td style="padding-right:20px;padding-top:15px;">${_('Commit')}</td><td style="padding-top:15px;"><a href="${commit_comment_url}" style="color:#427cc9;text-decoration:none;cursor:pointer">${h.show_id(commit)}</a></td></tr>
     <tr><td style="padding-right:20px;">${_('Description')}</td><td>${h.urlify_commit_message(commit.message, repo_name)}</td></tr>

rhodecode/templates/email_templates/pull_request_comment.mako

@@ -17,14 +17,13 b' data = {'
 ${_('[mention]') if mention else ''} \
 
 % if comment_file:
-    ${_('%(user)s commented on pull request #%(pr_id)s "%(pr_title)s" (file: `%(comment_file)s`)') % data |n}
+    ${_('%(user)s commented on pull request #%(pr_id)s "%(pr_title)s" (file: `%(comment_file)s`)') % data}
 % else:
     % if status_change:
-    ${_('%(user)s commented on pull request #%(pr_id)s "%(pr_title)s" (status: %(status)s)') % data |n}
+    ${_('%(user)s commented on pull request #%(pr_id)s "%(pr_title)s" (status: %(status)s)') % data}
     % else:
-    ${_('%(user)s commented on pull request #%(pr_id)s "%(pr_title)s"') % data |n}
+    ${_('%(user)s commented on pull request #%(pr_id)s "%(pr_title)s"') % data}
     % endif
-
 % endif
 </%def>
 
@@ -59,7 +58,6 b' data = {'
 
 ${comment_body|n}
 
-
 ${self.plaintext_footer()}
 </%def>