diff options
| author | Erik Johnston <erik@matrix.org> | 2018-10-26 16:22:45 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2018-10-26 16:22:45 +0100 |
| commit | 03e634dad4cd1014f609ece9574df7a24f1ec254 (patch) | |
| tree | a9f4a53a03bb0205e616ce7cf741fdbd15d4fcf5 /synapse/push/mailer.py | |
| parent | pep8 (diff) | |
| parent | Port register_new_matrix_user to Python 3 and add tests (#4085) (diff) | |
| download | synapse-03e634dad4cd1014f609ece9574df7a24f1ec254.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/purge_state_groups
Diffstat (limited to 'synapse/push/mailer.py')
| -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) |