Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Email on closed box page #287

Merged
merged 2 commits into from
Nov 2, 2018
Merged

Email on closed box page #287

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dec09ce
Fixed translation and owner email on the page for closed boxes
dethos Oct 26, 2018
192e2b2
Merge branch 'master' into fix_closed_box
dethos Nov 2, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion boxes/templates/boxes/closed.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,10 @@ <h4 class="text-darkest text sub">{% trans "That could be because:" %}</h4>
<li class="mt-small"><span class="subtitle">- </span>{% trans "The recipient did not suply a valid public key in order to correctly encrypt the content." %}</li>
<br>
</ul>
<p class="text-note">{% blocktrans %}In any of the above cases, you should contact the recipient (<a href="mailto:{{box.owner.email}}" class="text-blue">{{box.owner.first_name}} {{box.owner.last_name}}</a>) in order to fix the issue.{% endblocktrans %}</p>
<p class="text-note">
{% blocktrans with name=box.owner.get_full_name|default:box.owner.email email=box.owner.email %}In any of the above cases, you should contact the recipient (<a href="mailto:{{email}}" class="text-blue">{{name}}</a>) in order to fix the issue.
{% endblocktrans %}
</p>
</div>
</div>
</div>
Expand Down
Binary file modified locale/pt_PT/LC_MESSAGES/django.mo
View file
Open in desktop
Binary file not shown.
25 changes: 13 additions & 12 deletions locale/pt_PT/LC_MESSAGES/django.po
View file
Open in desktop
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-09 17:15+0000\n"
"POT-Creation-Date: 2018-10-26 00:38+0000\n"
"PO-Revision-Date: 2017-10-03 12:36-0300\n"
"Last-Translator: \n"
"Language-Team: \n"
Expand Down Expand Up @@ -347,17 +347,16 @@ msgstr ""
"O destinatário não forneceu uma chave pública válida para cifrar "
"correctamente o conteúdo."

#: boxes/templates/boxes/closed.html:19
#, python-format
#: boxes/templates/boxes/closed.html:21
msgid ""
"In any of the above cases, you should contact the recipient (<a href="
"\"mailto:%(box.owner.email)s\" class=\"text-blue\">%(box.owner.first_name)s "
"%(box.owner.last_name)s</a>) in order to fix the issue."
"\"mailto:%(email)s\" class=\"text-blue\">%(name)s</a>) in order to fix the "
"issue.\n"
" "
msgstr ""
"Em qualquer dos casos acima descritos, deve contactar o destinatário (<a "
"href=\"mailto:%(box.owner.email)s\" class=\"text-blue\">"
"%(box.owner.first_name)s %(box.owner.last_name)s</a>) de modo a resolver o "
"problema."
"href=\"mailto:%(email)s\" class=\"text-blue\">%(name)s</"
"a>) de modo a resolver o problema."

#: boxes/templates/boxes/success.html:15
msgid "MESSAGE SENT WITH SUCCESS!"
Expand Down Expand Up @@ -886,17 +885,17 @@ msgstr ""
msgid "Hawkpost - Submit your content securely"
msgstr "Hawkpost - Submeta o seu conteúdo de modo seguro"

#: hawkpost/templates/layout/base.html:30
#: hawkpost/templates/layout/base.html:31
msgid "With love by"
msgstr "Desenvolvido pela"

#: hawkpost/templates/layout/base.html:72
#: hawkpost/templates/layout/base.html:73
#: hawkpost/templates/layout/navbar.html:22
#: hawkpost/templates/layout/navbar.html:56
msgid "About"
msgstr "Sobre"

#: hawkpost/templates/layout/base.html:73
#: hawkpost/templates/layout/base.html:74
#: hawkpost/templates/layout/navbar.html:23
#: hawkpost/templates/layout/navbar.html:57
msgid "Support"
Expand Down Expand Up @@ -1273,7 +1272,9 @@ msgid ""
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"
"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"
Expand Down