kallithea Changeset - 4fbab9d5be4d

Changeset - 4fbab9d5be4d

Parent rev.

Child rev.

[Not reviewed]

default

0 7 0

Andrew Shadura - 11 years ago 2015-01-23 21:26:10
andrew@shadura.me

email templates: don't do HTML escaping in plain text templates - convert to Unicode

7 files changed with 31 insertions and 31 deletions:

kallithea/templates/email_templates/changeset_comment.txt

kallithea/templates/email_templates/default.txt

kallithea/templates/email_templates/main.txt

kallithea/templates/email_templates/password_reset.txt

kallithea/templates/email_templates/pull_request.txt

kallithea/templates/email_templates/pull_request_comment.txt

kallithea/templates/email_templates/registration.txt

0 comments (0 inline, 0 general)

kallithea/templates/email_templates/changeset_comment.txt

➞

Show inline comments

@@ @@ -2,18 +2,18 @@ @@
 <%inherit file="main.txt"/>
 %if is_mention:
 ${_('Comment from %s on %s changeset %s mentioned you') % (cs_comment_user, cs_target_repo, h.short_id(raw_id))}:
+${_('Comment from %s on %s changeset %s mentioned you') % (cs_comment_user, cs_target_repo, h.short_id(raw_id))|n,unicode}:
 %else:
 ${_('Comment from %s on %s changeset %s') % (cs_comment_user, cs_target_repo, h.short_id(raw_id))}:
+${_('Comment from %s on %s changeset %s') % (cs_comment_user, cs_target_repo, h.short_id(raw_id))|n,unicode}:
 %endif
 ${body}
+${body|n,unicode}
 %if status_change:
 ${_('The changeset status was changed to')}: ${status_change}
+${_('The changeset status was changed to')|n,unicode}: ${status_change|n,unicode}
 %endif
 ${_('URL')}: ${cs_comment_url}
+${_('URL')|n,unicode}: ${cs_comment_url|n,unicode}
 ${_('Changeset')}: ${h.short_id(raw_id)}
 ${_('Description')}:
 ${h.shorter(message, 256)}
 ${_('Changeset')|n,unicode}: ${h.short_id(raw_id)|n,unicode}
 ${_('Description')|n,unicode}:
 ${h.shorter(message, 256)|n,unicode}

kallithea/templates/email_templates/default.txt

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <%inherit file="main.txt"/>
 ${body}
+${body|n,unicode}

kallithea/templates/email_templates/main.txt

➞

Show inline comments

 ${self.body()}
+${self.body()|n,unicode}
 --
 ${_("This is an automatic notification. Don't reply to this mail.")}
+${_("This is an automatic notification. Don't reply to this mail.")|n,unicode}

kallithea/templates/email_templates/password_reset.txt

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <%inherit file="main.txt"/>
 ${_('Hello %s') % user}
+${_('Hello %s') % user|n,unicode}
 ${_('We received a request to create a new password for your account.')}
 ${_('You can generate it by clicking following URL')}:
 ${_('We received a request to create a new password for your account.')|n,unicode}
 ${_('You can generate it by clicking following URL')|n,unicode}:
 ${reset_url}
+${reset_url|n,unicode}
 ${_("Please ignore this email if you did not request a new password .")}
+${_("Please ignore this email if you did not request a new password .")|n,unicode}

kallithea/templates/email_templates/pull_request.txt

➞

Show inline comments

@@ @@ -2,19 +2,19 @@ @@
 <%inherit file="main.txt"/>
 %if is_mention:
 ${_('%s mentioned you on %s pull request "%s"') % (pr_user_created, repo_name, pr_title)}
+${_('%s mentioned you on %s pull request "%s"') % (pr_user_created, repo_name, pr_title)|n,unicode}
 %else:
 ${_('%s requested your review of %s pull request "%s"') % (pr_user_created, repo_name, pr_title)}
+${_('%s requested your review of %s pull request "%s"') % (pr_user_created, repo_name, pr_title)|n,unicode}
 %endif
 ${_('URL')}: ${pr_url}
+${_('URL')|n,unicode}: ${pr_url|n,unicode}
 ${_('Description')}:
 ${body}
 ${_('Description')|n,unicode}:
 ${body|n,unicode}
 ${_('Changesets')}:
+${_('Changesets')|n,unicode}:
 %for r,r_msg in pr_revisions:
 ${h.short_id(r)}:
 ${h.shorter(r_msg, 256)}
 ${h.short_id(r)|n,unicode}:
 ${h.shorter(r_msg, 256)|n,unicode}
 %endfor

kallithea/templates/email_templates/pull_request_comment.txt

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <%inherit file="main.txt"/>
 ${_('Comment from %s on %s pull request "%s"') % (pr_comment_user, repo_name, pr_title)}:
 ${body}
 ${_('Comment from %s on %s pull request "%s"') % (pr_comment_user, repo_name, pr_title)|n,unicode}:
 ${body|n,unicode}
 %if status_change:
     %if closing_pr:
 ${_('The comment closed the pull request with status')}: ${status_change}
+${_('The comment closed the pull request with status')|n,unicode}: ${status_change|n,unicode}
     %else:
 ${_('The comment was made with status')}: ${status_change}
+${_('The comment was made with status')|n,unicode}: ${status_change|n,unicode}
     %endif
 %endif
 ${_('URL')}: ${pr_comment_url}
+${_('URL')|n,unicode}: ${pr_comment_url|n,unicode}

kallithea/templates/email_templates/registration.txt

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <%inherit file="main.txt"/>
 ${body}
+${body|n,unicode}
 ${_('View this user here')}: ${registered_user_url}
+${_('View this user here')|n,unicode}: ${registered_user_url|n,unicode}

0 comments (0 inline, 0 general)