diff options
| author | David Baker <dave@matrix.org> | 2016-06-02 17:20:56 +0100 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2016-06-02 17:20:56 +0100 |
| commit | c71177f285fc21cef48912e138956a7b10f57f9e (patch) | |
| tree | c8ee989d97e041b98c7f2d21f8dfadaa9457d6b7 /synapse/push | |
| parent | Merge remote-tracking branch 'origin/develop' into dbkr/email_unsubscribe (diff) | |
| parent | Fix error in email notification string formatting (diff) | |
| download | synapse-c71177f285fc21cef48912e138956a7b10f57f9e.tar.xz | |
Merge remote-tracking branch 'origin/dbkr/email_notif_string_fmt_error' into dbkr/email_unsubscribe
Diffstat (limited to 'synapse/push')
| -rw-r--r-- | synapse/push/mailer.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/push/mailer.py b/synapse/push/mailer.py index b172aca1d2..e877d8fdad 100644 --- a/synapse/push/mailer.py +++ b/synapse/push/mailer.py @@ -41,7 +41,7 @@ logger = logging.getLogger(__name__) MESSAGE_FROM_PERSON_IN_ROOM = "You have a message on %(app)s from %(person)s " \ - "in the %s room..." + "in the %(room)s room..." MESSAGE_FROM_PERSON = "You have a message on %(app)s from %(person)s..." MESSAGES_FROM_PERSON = "You have messages on %(app)s from %(person)s..." MESSAGES_IN_ROOM = "You have messages on %(app)s in the %(room)s room..." |