diff options
| author | Richard van der Hoff <richard@matrix.org> | 2018-10-19 14:01:59 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2018-10-19 14:01:59 +0100 |
| commit | cc325c7069599ac0f9b8c31aa3a472d5ea041a4f (patch) | |
| tree | 4ebf48a52cbe3ce2e88c7fd76e420bffc47bd5c7 /synapse/push | |
| parent | Add warnings about the upgrade to 0.33.7 (diff) | |
| download | synapse-cc325c7069599ac0f9b8c31aa3a472d5ea041a4f.tar.xz | |
Calculate absolute path for email templates
Diffstat (limited to 'synapse/push')
| -rw-r--r-- | synapse/push/mailer.py | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/synapse/push/mailer.py b/synapse/push/mailer.py index b9dcfee740..16fb5e8471 100644 --- a/synapse/push/mailer.py +++ b/synapse/push/mailer.py @@ -526,12 +526,8 @@ def load_jinja2_templates(config): Returns: (notif_template_html, notif_template_text) """ - logger.info("loading jinja2") - - if config.email_template_dir: - loader = jinja2.FileSystemLoader(config.email_template_dir) - else: - loader = jinja2.PackageLoader('synapse', 'res/templates') + logger.info("loading email templates from '%s'", config.email_template_dir) + loader = jinja2.FileSystemLoader(config.email_template_dir) env = jinja2.Environment(loader=loader) env.filters["format_ts"] = format_ts_filter env.filters["mxc_to_http"] = _create_mxc_to_http_filter(config) |