emails: optimize some labels, and made few i18n fixes.

- use more consistent messages
- use `data` variable for readability
- don't show some redundant info on comments
- use better titles that reflect action

rhodecode/templates/email_templates/commit_comment.mako

@@ -1,48 +1,74 b''
 ## -*- coding: utf-8 -*-
 <%inherit file="base.mako"/>
 
+
 <%def name="subject()" filter="n,trim">
-${_('[mention]') if mention else ''} ${_('%(user)s commented on a commit of %(repo_name)s') % {
-                                         'user': h.person(user),
-                                         'repo_name': repo_name
-                                         } }
+<%
+data = {
+    'user': h.person(user),
+    'comment_file': comment_file,
+    'comment_line': comment_line,
+    'repo_name': repo_name,
+    'commit_id': h.show_id(commit),
+}
+%>
+${_('[mention]') if mention else ''} \
+
+% if comment_file:
+    ${_('%(user)s commented on commit `%(commit_id)s` (file: `%(comment_file)s`)') % data} ${_('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
+
 </%def>
 
 <%def name="body_plaintext()" filter="n,trim">
 ${self.subject()}
 
 * ${_('Comment link')}: ${commit_comment_url}
 
 * ${_('Commit')}: ${h.show_id(commit)}
 
 %if comment_file:
 * ${_('File: %(comment_file)s on line %(comment_line)s') % {'comment_file': comment_file, 'comment_line': comment_line}}
 %endif
 
 ---
 
 ${comment_body|n}
 
 
 %if status_change:
     ${_('Commit status was changed to')}: *${status_change}*
 %endif
 
 ${self.plaintext_footer()}
 </%def>
 
+
+<%
+data = {
+    'user': h.person(user),
+    'comment_file': comment_file,
+    'comment_line': comment_line,
+    'repo': commit_target_repo,
+    'repo_name': repo_name,
+    'commit_id': h.show_id(commit),
+}
+%>
 <table style="text-align:left;vertical-align:middle;">
-    <tr><td colspan="2" style="width:100%;padding-bottom:15px;border-bottom:1px solid #dbd9da;"><h4><a href="${commit_comment_url}" style="color:#427cc9;text-decoration:none;cursor:pointer">
+    <tr><td colspan="2" style="width:100%;padding-bottom:15px;border-bottom:1px solid #dbd9da;">
 % if comment_file:
-        ${_('%(user)s commented on %(comment_file)s on line %(comment_line)s</a> in the %(repo)s repository') % {'user': h.person(user), 'comment_file': comment_file, 'comment_line': comment_line, 'repo': commit_target_repo} |n}</h4>
+    <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:
-        ${_('%(user)s commented on a commit</a> in the %(repo)s repository') % {'user': h.person(user), 'repo': commit_target_repo} |n}
+    <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
-    </h4></td></tr>
+    </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>
-    %if status_change:
-        <tr><td style="padding-right:20px;">${_('Status')}<td/>${_('The commit status was changed to')} ${status_change}.</td></tr>
-    %endif
-    <tr><td style="padding-right:20px;">${_('Comment')}</td><td style="line-height:1.2em;">${h.render(comment_body, renderer=renderer_type, mentions=True)}</td></tr>
-</table>
  No newline at end of file
+
+    % if status_change:
+        <tr><td style="padding-right:20px;">${_('Status')}</td><td>${_('The commit status was changed to')}: ${status_change}.</td></tr>
+    % endif
+    <tr><td style="padding-right:20px;">${(_('Comment on line: %(comment_line)s') if comment_file else _('Comment')) % data}</td><td style="line-height:1.2em;">${h.render(comment_body, renderer=renderer_type, mentions=True)}</td></tr>
+</table>

rhodecode/templates/email_templates/password_reset.mako

@@ -1,31 +1,31 b''
 ## -*- coding: utf-8 -*-
 <%inherit file="base.mako"/>
 
 <%def name="subject()" filter="n,trim">
 RhodeCode Password reset
 </%def>
 
 ## plain text version of the email. Empty by default
 <%def name="body_plaintext()" filter="n,trim">
 Hi ${user.username},
 
 There was a request to reset your password using the email address ${email} on ${h.format_date(date)}
 
 *If you didn't do this, please contact your RhodeCode administrator.*
 
 You can continue, and generate new password by clicking following URL:
 ${password_reset_url}
 
 ${self.plaintext_footer()}
 </%def>
 
 ## BODY GOES BELOW
 <p>
 Hello ${user.username},
 </p><p>
 There was a request to reset your password using the email address ${email} on ${h.format_date(date)}
 <br/>
 <strong>If you did not request a password reset, please contact your RhodeCode administrator.</strong>
 </p><p>
-${_('<a href="%(url)s">Generate new password here</a>.') % {'url': password_reset_url} |n}
-</p>
  No newline at end of file
+<a href="${password_reset_url}">${_('Generate new password here')}.</a>
+</p>

rhodecode/templates/email_templates/password_reset_confirmation.mako

@@ -1,30 +1,30 b''
 ## -*- coding: utf-8 -*-
 <%inherit file="base.mako"/>
 
 <%def name="subject()" filter="n,trim">
 Your new RhodeCode password
 </%def>
 
 ## plain text version of the email. Empty by default
 <%def name="body_plaintext()" filter="n,trim">
 Hi ${user.username},
 
 There was a request to reset your password using the email address ${email} on ${h.format_date(date)}
 
 *If you didn't do this, please contact your RhodeCode administrator.*
 
 You can continue, and generate new password by clicking following URL:
 ${password_reset_url}
 
 ${self.plaintext_footer()}
 </%def>
 
 ## BODY GOES BELOW
 <p>
 Hello ${user.username},
 </p><p>
 Below is your new access password for RhodeCode.
 <br/>
 <strong>If you didn't request a new password, please contact your RhodeCode administrator.</strong>
 </p>
-<p>password: <input value='${new_password}'></pre></p>
  No newline at end of file
+<p>password: <input value='${new_password}'/></p>

rhodecode/templates/email_templates/pull_request_comment.mako

@@ -1,60 +1,96 b''
 ## -*- coding: utf-8 -*-
 <%inherit file="base.mako"/>
 
+
 <%def name="subject()" filter="n,trim">
-${_('[mention]') if mention else ''} ${_('%(user)s commented on pull request #%(pr_id)s: "%(pr_title)s"') % {
-                                     'user': h.person(user),
-                                     'pr_title': pull_request.title,
-                                     'pr_id': pull_request.pull_request_id
-                                     } |n}
+<%
+data = {
+    'user': h.person(user),
+    'pr_title': pull_request.title,
+    'pr_id': pull_request.pull_request_id,
+    'status': status_change,
+    'comment_file': comment_file,
+    'comment_line': comment_line,
+}
+%>
+
+${_('[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}
+% else:
+    % if status_change:
+    ${_('%(user)s commented on pull request #%(pr_id)s "%(pr_title)s" (status: %(status)s)') % data |n}
+    % else:
+    ${_('%(user)s commented on pull request #%(pr_id)s "%(pr_title)s"') % data |n}
+    % endif
+
+% endif
 </%def>
 
 <%def name="body_plaintext()" filter="n,trim">
+<%
+data = {
+    'user': h.person(user),
+    'pr_title': pull_request.title,
+    'pr_id': pull_request.pull_request_id,
+    'status': status_change,
+    'comment_file': comment_file,
+    'comment_line': comment_line,
+}
+%>
 ${self.subject()}
 
 * ${_('Comment link')}: ${pr_comment_url}
 
 * ${_('Source repository')}: ${pr_source_repo_url}
 
 %if comment_file:
 * ${_('File: %(comment_file)s on line %(comment_line)s') % {'comment_file': comment_file, 'comment_line': comment_line}}
 %endif
 
 ---
 
+%if status_change and not closing_pr:
+   ${_('%(user)s submitted pull request #%(pr_id)s status: *%(status)s*') % data}
+%elif status_change and closing_pr:
+   ${_('%(user)s submitted pull request #%(pr_id)s status: *%(status)s and closed*') % data}
+%endif
+
 ${comment_body|n}
 
 
-%if status_change and not closing_pr:
-   ${_('Pull request status was changed to')}: *${status_change}*
-%elif status_change and closing_pr:
-   ${_('Pull request was closed with status')}: *${status_change}*
-%endif
-
 ${self.plaintext_footer()}
 </%def>
 
+
+<%
+data = {
+    'user': h.person(user),
+    'pr_title': pull_request.title,
+    'pr_id': pull_request.pull_request_id,
+    'status': status_change,
+    'comment_file': comment_file,
+    'comment_line': comment_line,
+}
+%>
 <table style="text-align:left;vertical-align:middle;">
-    <tr><td colspan="2" style="width:100%;padding-bottom:15px;border-bottom:1px solid #dbd9da;"><h4><a href="${pr_comment_url}" style="color:#427cc9;text-decoration:none;cursor:pointer">
-% if comment_file:
-    ${_('%(user)s commented on %(comment_file)s on pull request #%(pr_id)s: "%(pr_title)s".') % {'user': h.person(user), 'comment_file': comment_file, 'pr_title': pull_request.title, 'pr_id': pull_request.pull_request_id} |n}
-% elif status_change and not closing_pr:
-    ${_('%(user)s changed the status of pull request #%(pr_id)s "%(pr_title)s" to %(status)s.') % {'user': h.person(user),'pr_title': pull_request.title,'pr_id': pull_request.pull_request_id, 'status': status_change} |n}
-%elif status_change and closing_pr:
-    ${_('%(user)s closed pull request #%(pr_id)s "%(pr_title)s" with status %(status)s.') % {'user': h.person(user),'pr_title': pull_request.title,'pr_id': pull_request.pull_request_id, 'status': status_change} |n}
-%else:
-    ${_('%(user)s commented in pull request #%(pr_id)s "%(pr_title)s".') % {'user': h.person(user),'pr_title': pull_request.title,'pr_id': pull_request.pull_request_id} |n}
-% endif
-    </a></h4></td></tr>
+    <tr><td colspan="2" style="width:100%;padding-bottom:15px;border-bottom:1px solid #dbd9da;">
+    <h4><a href="${pr_comment_url}" style="color:#427cc9;text-decoration:none;cursor:pointer">
+
+    % if comment_file:
+        ${_('%(user)s commented on pull request #%(pr_id)s "%(pr_title)s" (file:`%(comment_file)s`)') % data |n}
+    % else:
+        ${_('%(user)s commented on pull request #%(pr_id)s "%(pr_title)s"') % data |n}
+    % endif
+    </a>
+    %if status_change and not closing_pr:
+       , ${_('submitted pull request status: %(status)s') % data}
+    %elif status_change and closing_pr:
+       , ${_('submitted pull request status: %(status)s and closed') % data}
+    %endif
+    </h4>
+    </td></tr>
     <tr><td style="padding-right:20px;padding-top:15px;">${_('Source')}</td><td style="padding-top:15px;"><a style="color:#427cc9;text-decoration:none;cursor:pointer" href="${pr_source_repo_url}">${pr_source_repo.repo_name}</a></td></tr>
-    % if comment_file:
-        <tr><td style="padding-right:20px;">${_('File')}</td><td>${_('%(comment_file)s on line %(comment_line)s') % {'comment_file': comment_file, 'comment_line': comment_line}}</td></tr>
-    %endif
-    %if status_change and not closing_pr:
-       <tr><td style="padding-right:20px;">${_('Status')}</td><td>${_('The commit status was changed to')} ${status_change}</td></tr>
-    %elif status_change and closing_pr:
-       <tr><td style="padding-right:20px;">${_('Status')}</td><td>${_('Pull request was closed with status')}: ${status_change}</td></tr>
-    %endif
-    <tr><td style="padding-right:20px;">${_('Comment')}</td><td style="line-height:1.2em;">${h.render(comment_body, renderer=renderer_type, mentions=True)}</td></tr>
+    <tr><td style="padding-right:20px;">${(_('Comment on line: %(comment_line)s') if comment_file else _('Comment')) % data}</td><td style="line-height:1.2em;">${h.render(comment_body, renderer=renderer_type, mentions=True)}</td></tr>
 </table>
-

rhodecode/templates/password_reset.html

@@ -1,78 +1,78 b''
 ## -*- coding: utf-8 -*-
 <%inherit file="base/root.html"/>
 
 <%def name="title()">
     ${_('Create an Account')}
     %if c.rhodecode_name:
         &middot; ${h.branding(c.rhodecode_name)}
     %endif
 </%def>
 <style>body{background-color:#eeeeee;}</style>
 
 <div class="loginbox">
     <div class="header">
         <div id="header-inner" class="title">
             <div id="logo">
                 <div class="logo-wrapper">
                     <a href="${h.url('home')}"><img src="${h.asset('images/rhodecode-logo-white-216x60.png')}" alt="RhodeCode"/></a>
                 </div>
                 %if c.rhodecode_name:
                 <div class="branding"> ${h.branding(c.rhodecode_name)}</div>
                 %endif
             </div>
         </div>
     </div>
 
     <div class="loginwrapper">
         <div class="left-column">
             <img class="sign-in-image" src="${h.asset('images/sign-in.png')}" alt="RhodeCode"/>
         </div>
 
         <div id="register" class="right-column">
             <%include file="/base/flash_msg.html"/>
             <!-- login -->
             <div class="sign-in-title">
                 <h1>${_('Reset your Password')}</h1>
                 <h4>${h.link_to(_("Go to the login page to sign in."), request.route_path('login'))}</h4>
             </div>
             <div class="inner form">
                 ${h.form(request.route_path('reset_password'), needs_csrf_token=False)}
                     <label for="email">${_('Email Address')}:</label>
                     ${h.text('email', defaults.get('email'))}
                     %if 'email' in errors:
                       <span class="error-message">${errors.get('email')}</span>
                       <br />
                     %endif
 
                     %if captcha_active:
                     <div class="login-captcha"
                         <label for="email">${_('Captcha')}:</label>
                         ${h.hidden('recaptcha_field')}
                         <div id="recaptcha"></div>
                         %if 'recaptcha_field' in errors:
                           <span class="error-message">${errors.get('recaptcha_field')}</span>
                           <br />
                         %endif
                     </div>
                     %endif
 
                     ${h.submit('send', _('Send password reset email'), class_="btn sign-in")}
-                    <div class="activation_msg">${_('Password reset link will be send to matching email address')}</div>
+                    <div class="activation_msg">${_('Password reset link will be sent to matching email address')}</div>
 
                 ${h.end_form()}
             </div>
         </div>
     </div>
 </div>
 
 %if captcha_active:
 <script type="text/javascript" src="https://www.google.com/recaptcha/api/js/recaptcha_ajax.js"></script>
 %endif
 <script type="text/javascript">
  $(document).ready(function(){
     $('#email').focus();
     %if captcha_active:
       Recaptcha.create("${captcha_public_key}", "recaptcha", {theme: "white"});
     %endif
  });
 </script>