Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-09 15:35:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

closes #4026

Browse Source
This commit is contained in:
psychobunny
2016-02-23 13:33:46 -05:00
parent 1dba781923
commit 75917e25b3
11 changed files with 14 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/emailer.js
View File

@@ -140,20 +140,11 @@ var fallbackTransport;
} }
function renderAndTranslate(tpl, params, lang, callback) { function renderAndTranslate(tpl, params, lang, callback) {
async.waterfall([ render(tpl, params, function(err, html) {
function(next) { translator.translate(html, lang, function(translated) {
render('emails/partials/footer' + (tpl.indexOf('_plaintext') !== -1 ? '_plaintext' : ''), params, next); callback(err, translated);
}, });
function(footer, next) { });
params.footer = footer;
render(tpl, params, next);
},
function(html, next) {
translator.translate(html, lang, function(translated) {
next(null, translated);
});
}
], callback);
} }
function getHostname() { function getHostname() {

2
src/views/emails/digest.tpl
View File

@@ -42,7 +42,7 @@
<a href="{url}">[[email:digest.cta, {site_title}]]</a> <a href="{url}">[[email:digest.cta, {site_title}]]</a>
</p> </p>
{footer} <!-- IMPORT emails/partials/footer.tpl -->
<hr /> <hr />
<p> <p>

2
src/views/emails/invitation.tpl
View File

@@ -8,4 +8,4 @@
<a href="{registerLink}">[[email:invitation.ctr]]</a> <a href="{registerLink}">[[email:invitation.ctr]]</a>
</blockquote> </blockquote>
{footer} <!-- IMPORT emails/partials/footer.tpl -->

2
src/views/emails/notif_chat.tpl
View File

@@ -5,7 +5,7 @@
<a href="{url}/chats/{fromUserslug}">[[email:notif.chat.cta]]</a> <a href="{url}/chats/{fromUserslug}">[[email:notif.chat.cta]]</a>
{footer} <!-- IMPORT emails/partials/footer.tpl -->
<hr /> <hr />
<p> <p>

2
src/views/emails/notif_post.tpl
View File

@@ -5,7 +5,7 @@
<a href="{url}">[[email:notif.post.cta]]</a> <a href="{url}">[[email:notif.post.cta]]</a>
{footer} <!-- IMPORT emails/partials/footer.tpl -->
<hr /> <hr />
<p> <p>

2
src/views/emails/partials/footer_plaintext.tpl
View File

@@ -1,2 +0,0 @@
[[email:closing]]
{site_title}

2
src/views/emails/registration_accepted.tpl
View File

@@ -6,4 +6,4 @@
<p>[[email:welcome.text3]]</p> <p>[[email:welcome.text3]]</p>
{footer} <!-- IMPORT emails/partials/footer.tpl -->

2
src/views/emails/reset.tpl
View File

@@ -8,4 +8,4 @@
<a href="{reset_link}">[[email:reset.cta]]</a> <a href="{reset_link}">[[email:reset.cta]]</a>
</blockquote> </blockquote>
{footer} <!-- IMPORT emails/partials/footer.tpl -->

2
src/views/emails/reset_notify.tpl
View File

@@ -4,4 +4,4 @@
<p>[[email:reset.notify.text2]]</p> <p>[[email:reset.notify.text2]]</p>
{footer} <!-- IMPORT emails/partials/footer.tpl -->

2
src/views/emails/test.tpl
View File

@@ -2,4 +2,4 @@
<p>[[email:test.text1]]</p> <p>[[email:test.text1]]</p>
{footer} <!-- IMPORT emails/partials/footer.tpl -->

2
src/views/emails/welcome.tpl
View File

@@ -10,4 +10,4 @@
<a href="{confirm_link}">[[email:welcome.cta]]</a> <a href="{confirm_link}">[[email:welcome.cta]]</a>
</blockquote> </blockquote>
{footer} <!-- IMPORT emails/partials/footer.tpl -->