Skip to content

Commit

Permalink
Merge pull request #277 from whitesmith/fix-template-tag
Browse files Browse the repository at this point in the history
Expired keys email template fix
  • Loading branch information
dethos authored Apr 9, 2018
2 parents 01e80a2 + 0e5a47f commit 16efb73
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 4 deletions.
2 changes: 1 addition & 1 deletion humans/templates/humans/emails/key_expired.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{% load i18n %}

{% trans "Hello" %} {% if user.first_name %} {{user.first_name}} {{user.last_name}} {% else %} {{user.username}} {% endif %},
{$ blocktrans %}
{% blocktrans %}
During our automatic updates and checks, using the keyserver url that you provided, the system spotted that your current key is already expired. To avoid any issues, the key was removed and all open boxes deactivated until a new one is added.

To enable all functionality again, please go to the settings and add your new public key.
Expand Down
Binary file modified locale/pt_PT/LC_MESSAGES/django.mo
Binary file not shown.
41 changes: 38 additions & 3 deletions locale/pt_PT/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-04-06 10:34+0100\n"
"POT-Creation-Date: 2018-04-09 17:15+0000\n"
"PO-Revision-Date: 2017-10-03 12:36-0300\n"
"Last-Translator: \n"
"Language-Team: \n"
Expand Down Expand Up @@ -1246,6 +1246,41 @@ msgstr ""
"Com os melhores cumprimentos,\n"
"Equipa Hawkpost\n"

#: humans/templates/humans/emails/key_expired.txt:4
#, fuzzy
#| msgid ""
#| "\n"
#| "During our automatic updates and checks, using the key that you provided, "
#| "the system spotted that the key you provided will soon expire.\n"
#| "\n"
#| "To avoid any issues, the key will be removed from Hawkpost when it "
#| "expires and all open boxes deactivated until a new one is added. As such, "
#| "please make sure to update your key as soon as possible.\n"
#| "\n"
#| "Best Regards,\n"
msgid ""
"\n"
"During our automatic updates and checks, using the keyserver url that you "
"provided, the system spotted that your current key is already expired. To "
"avoid any issues, the key was removed and all open boxes deactivated until a "
"new one is added.\n"
"\n"
"To enable all functionality again, please go to the settings and add your "
"new public key.\n"
"\n"
"best regards,\n"
"Hawkpost Team\n"
msgstr ""
"\n"
"Durante as nossas verificações e actualizações automáticas, usando a chave "
"por si dada, o sistema descobriu que a chave existente já expirou. Para evitar a ocurrência de algum problema, a chave foi removida e as caixas existentes desactivadas até que uma nova chave seja introduzida.\n"
"\n"
"Para que possa dispor novamente de todas as funcionalidades do Hawkpost, por "
"favor vá às definições e adicione uma nova chave pública.\n"
"\n"
"Com os melhores cumprimentos,\n"
"Equipa Hawkpost\n"

#: humans/templates/humans/emails/key_invalid.txt:4
msgid ""
"\n"
Expand Down Expand Up @@ -1307,8 +1342,8 @@ msgstr ""
"Durante as nossas verificações e actualizações automáticas, usando a chave "
"por si dada, o sistema descobriu que a chave existente foi revocada.\n"
"\n"
"Para que possa dispor novamente de todas as funcionalidades do Hawkpost, "
"por favor vá às definições e adicione uma nova chave pública.\n"
"Para que possa dispor novamente de todas as funcionalidades do Hawkpost, por "
"favor vá às definições e adicione uma nova chave pública.\n"
"\n"
"Com os melhores cumprimentos,\n"
"Equipa Hawkpost\n"
Expand Down

0 comments on commit 16efb73

Please sign in to comment.