Show More
@@ -204,7 +204,7 b' class EmailNotificationModel(object):' | |||||
204 | return generated template for email based on given type |
|
204 | return generated template for email based on given type | |
205 | """ |
|
205 | """ | |
206 |
|
206 | |||
207 |
base = 'email |
|
207 | base = 'email/' + self.email_types.get(type_, self.email_types[self.TYPE_DEFAULT]) + '.' + content_type | |
208 | email_template = self._tmpl_lookup.get_template(base) |
|
208 | email_template = self._tmpl_lookup.get_template(base) | |
209 | # translator and helpers inject |
|
209 | # translator and helpers inject | |
210 | _kwargs = {'_': _, |
|
210 | _kwargs = {'_': _, |
1 | NO CONTENT: file renamed from kallithea/templates/email_templates/button.html to kallithea/templates/email/button.html |
|
NO CONTENT: file renamed from kallithea/templates/email_templates/button.html to kallithea/templates/email/button.html |
1 | NO CONTENT: file renamed from kallithea/templates/email_templates/button.txt to kallithea/templates/email/button.txt |
|
NO CONTENT: file renamed from kallithea/templates/email_templates/button.txt to kallithea/templates/email/button.txt |
1 | NO CONTENT: file renamed from kallithea/templates/email_templates/changeset_comment.html to kallithea/templates/email/changeset_comment.html |
|
NO CONTENT: file renamed from kallithea/templates/email_templates/changeset_comment.html to kallithea/templates/email/changeset_comment.html |
1 | NO CONTENT: file renamed from kallithea/templates/email_templates/changeset_comment.txt to kallithea/templates/email/changeset_comment.txt |
|
NO CONTENT: file renamed from kallithea/templates/email_templates/changeset_comment.txt to kallithea/templates/email/changeset_comment.txt |
1 | NO CONTENT: file renamed from kallithea/templates/email_templates/comment.html to kallithea/templates/email/comment.html |
|
NO CONTENT: file renamed from kallithea/templates/email_templates/comment.html to kallithea/templates/email/comment.html |
1 | NO CONTENT: file renamed from kallithea/templates/email_templates/comment.txt to kallithea/templates/email/comment.txt |
|
NO CONTENT: file renamed from kallithea/templates/email_templates/comment.txt to kallithea/templates/email/comment.txt |
1 | NO CONTENT: file renamed from kallithea/templates/email_templates/default.html to kallithea/templates/email/default.html |
|
NO CONTENT: file renamed from kallithea/templates/email_templates/default.html to kallithea/templates/email/default.html |
1 | NO CONTENT: file renamed from kallithea/templates/email_templates/default.txt to kallithea/templates/email/default.txt |
|
NO CONTENT: file renamed from kallithea/templates/email_templates/default.txt to kallithea/templates/email/default.txt |
1 | NO CONTENT: file renamed from kallithea/templates/email_templates/header.html to kallithea/templates/email/header.html |
|
NO CONTENT: file renamed from kallithea/templates/email_templates/header.html to kallithea/templates/email/header.html |
1 | NO CONTENT: file renamed from kallithea/templates/email_templates/header.txt to kallithea/templates/email/header.txt |
|
NO CONTENT: file renamed from kallithea/templates/email_templates/header.txt to kallithea/templates/email/header.txt |
1 | NO CONTENT: file renamed from kallithea/templates/email_templates/main.html to kallithea/templates/email/main.html |
|
NO CONTENT: file renamed from kallithea/templates/email_templates/main.html to kallithea/templates/email/main.html |
1 | NO CONTENT: file renamed from kallithea/templates/email_templates/password_reset.html to kallithea/templates/email/password_reset.html |
|
NO CONTENT: file renamed from kallithea/templates/email_templates/password_reset.html to kallithea/templates/email/password_reset.html |
1 | NO CONTENT: file renamed from kallithea/templates/email_templates/password_reset.txt to kallithea/templates/email/password_reset.txt |
|
NO CONTENT: file renamed from kallithea/templates/email_templates/password_reset.txt to kallithea/templates/email/password_reset.txt |
1 | NO CONTENT: file renamed from kallithea/templates/email_templates/pull_request.html to kallithea/templates/email/pull_request.html |
|
NO CONTENT: file renamed from kallithea/templates/email_templates/pull_request.html to kallithea/templates/email/pull_request.html |
1 | NO CONTENT: file renamed from kallithea/templates/email_templates/pull_request.txt to kallithea/templates/email/pull_request.txt |
|
NO CONTENT: file renamed from kallithea/templates/email_templates/pull_request.txt to kallithea/templates/email/pull_request.txt |
1 | NO CONTENT: file renamed from kallithea/templates/email_templates/pull_request_comment.html to kallithea/templates/email/pull_request_comment.html |
|
NO CONTENT: file renamed from kallithea/templates/email_templates/pull_request_comment.html to kallithea/templates/email/pull_request_comment.html |
1 | NO CONTENT: file renamed from kallithea/templates/email_templates/pull_request_comment.txt to kallithea/templates/email/pull_request_comment.txt |
|
NO CONTENT: file renamed from kallithea/templates/email_templates/pull_request_comment.txt to kallithea/templates/email/pull_request_comment.txt |
1 | NO CONTENT: file renamed from kallithea/templates/email_templates/registration.html to kallithea/templates/email/registration.html |
|
NO CONTENT: file renamed from kallithea/templates/email_templates/registration.html to kallithea/templates/email/registration.html |
1 | NO CONTENT: file renamed from kallithea/templates/email_templates/registration.txt to kallithea/templates/email/registration.txt |
|
NO CONTENT: file renamed from kallithea/templates/email_templates/registration.txt to kallithea/templates/email/registration.txt |
@@ -2,7 +2,7 b'' | |||||
2 |
|
2 | |||
3 | # Enforce some consistency in whitespace - just to avoid spurious whitespaces changes |
|
3 | # Enforce some consistency in whitespace - just to avoid spurious whitespaces changes | |
4 |
|
4 | |||
5 |
files=`hg mani | egrep -v '/fontello/|/ |
|
5 | files=`hg mani | egrep -v '/fontello/|/templates/email/|(^LICENSE-MERGELY.html|^docs/Makefile|^scripts/whitespacecleanup.sh|/(graph|mergely|native.history)\.js|/test_dump_html_mails.ref.html|\.png|\.gif|\.ico|\.pot|\.po|\.mo|\.tar\.gz|\.diff)$'` | |
6 |
|
6 | |||
7 | sed -i "s/`printf '\r'`//g" $files |
|
7 | sed -i "s/`printf '\r'`//g" $files | |
8 | sed -i -e "s,`printf '\t'`, ,g" $files |
|
8 | sed -i -e "s,`printf '\t'`, ,g" $files |
General Comments 0
You need to be logged in to leave comments.
Login now