diff --git a/rhodecode/templates/email_templates/changeset_comment.html b/rhodecode/templates/email_templates/changeset_comment.html --- a/rhodecode/templates/email_templates/changeset_comment.html +++ b/rhodecode/templates/email_templates/changeset_comment.html @@ -7,6 +7,6 @@ ${body} % if status_change is not None:
- New status -> ${status_change} + ${_('New status$')} -> ${status_change}
% endif diff --git a/rhodecode/templates/email_templates/password_reset.html b/rhodecode/templates/email_templates/password_reset.html --- a/rhodecode/templates/email_templates/password_reset.html +++ b/rhodecode/templates/email_templates/password_reset.html @@ -1,12 +1,12 @@ ## -*- coding: utf-8 -*- <%inherit file="main.html"/> -Hello ${user} +${_('Hello')} ${user} -We received a request to create a new password for your account. +${_('We received a request to create a new password for your account.')} -You can generate it by clicking following URL: +${_('You can generate it by clicking following URL')}: ${reset_url} -If you didn't request new password please ignore this email. +${_('If you didn't request new password please ignore this email.')} diff --git a/rhodecode/templates/email_templates/pull_request.html b/rhodecode/templates/email_templates/pull_request.html --- a/rhodecode/templates/email_templates/pull_request.html +++ b/rhodecode/templates/email_templates/pull_request.html @@ -1,20 +1,18 @@ ## -*- coding: utf-8 -*- <%inherit file="main.html"/> -User ${pr_user_created} opened pull request for repository -${pr_repo_url} and wants you to review changes. - -
title: ${pr_title}
-
description:
+${_('User %s opened pull request for repository %s and wants you to review changes.') % ('%s' % pr_user_created,pr_repo_url)} +
${_('title')}: ${pr_title}
+
${_('description')}:

${body}

-
revisions for reviewing
+
${_('revisions for reviewing')}
-View this pull request here: ${pr_url} +${_('View this pull request here')}: ${pr_url} diff --git a/rhodecode/templates/email_templates/pull_request_comment.html b/rhodecode/templates/email_templates/pull_request_comment.html --- a/rhodecode/templates/email_templates/pull_request_comment.html +++ b/rhodecode/templates/email_templates/pull_request_comment.html @@ -1,15 +1,14 @@ ## -*- coding: utf-8 -*- <%inherit file="main.html"/> -User ${pr_comment_user} commented on pull request #${pr_id} for -repository ${pr_target_repo} +${_('User %s commented on pull request #%s for repository %s') % ('%s' % pr_comment_user ,pr_id,pr_target_repo)}

${body} %if status_change: - New status -> ${status_change} + ${_('New status')} -> ${status_change} %endif

-View this comment here: ${pr_comment_url} +${_('View this comment here')}: ${pr_comment_url} diff --git a/rhodecode/templates/email_templates/registration.html b/rhodecode/templates/email_templates/registration.html --- a/rhodecode/templates/email_templates/registration.html +++ b/rhodecode/templates/email_templates/registration.html @@ -1,9 +1,9 @@ ## -*- coding: utf-8 -*- <%inherit file="main.html"/> -A new user have registered in RhodeCode +${_('A new user have registered in RhodeCode')} ${body} -View this user here: ${registered_user_url} +${_('View this user here')}: ${registered_user_url}