aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcin Kuzminski <marcin@python-works.com>2012-12-01 00:20:39 +0100
committerMarcin Kuzminski <marcin@python-works.com>2012-12-01 00:20:39 +0100
commit8334ce59e8da1c627339a32118902207cf318080 (patch)
tree3d93e7a57ebb6ebec95939a9090cd7103c076d78
parent6169e80170abc2d7b6a8f0236b24ce7c35a3d5c1 (diff)
added i18n to email templates
--HG-- branch : beta
-rw-r--r--rhodecode/templates/email_templates/changeset_comment.html2
-rw-r--r--rhodecode/templates/email_templates/password_reset.html8
-rw-r--r--rhodecode/templates/email_templates/pull_request.html12
-rw-r--r--rhodecode/templates/email_templates/pull_request_comment.html7
-rw-r--r--rhodecode/templates/email_templates/registration.html4
5 files changed, 15 insertions, 18 deletions
diff --git a/rhodecode/templates/email_templates/changeset_comment.html b/rhodecode/templates/email_templates/changeset_comment.html
index 8ef1a949..9f357613 100644
--- 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:
<div>
- New status -> ${status_change}
+ ${_('New status$')} -> ${status_change}
</div>
% endif
diff --git a/rhodecode/templates/email_templates/password_reset.html b/rhodecode/templates/email_templates/password_reset.html
index f3f6101f..e25ef894 100644
--- 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
index 725a01ce..ca742b7d 100644
--- 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 <b>${pr_user_created}</b> opened pull request for repository
-${pr_repo_url} and wants you to review changes.
-
-<div>title: ${pr_title}</div>
-<div>description:</div>
+${_('User %s opened pull request for repository %s and wants you to review changes.') % ('<b>%s</b>' % pr_user_created,pr_repo_url)}
+<div>${_('title')}: ${pr_title}</div>
+<div>${_('description')}:</div>
<p>
${body}
</p>
-<div>revisions for reviewing</div>
+<div>${_('revisions for reviewing')}</div>
<ul>
%for r in pr_revisions:
<li>${r}</li>
%endfor
</ul>
-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
index 10eda647..5cd9bb4c 100644
--- 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 <b>${pr_comment_user}</b> commented on pull request #${pr_id} for
-repository ${pr_target_repo}
+${_('User %s commented on pull request #%s for repository %s') % ('<b>%s</b>' % pr_comment_user ,pr_id,pr_target_repo)}
<p>
${body}
%if status_change:
- <span>New status -> ${status_change}</span>
+ <span>${_('New status')} -> ${status_change}</span>
%endif
</p>
-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
index 73c0a7ef..7361c49d 100644
--- 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}