From dec09cec303efc96426b942197e894028b614fc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gon=C3=A7alo=20Val=C3=A9rio?= Date: Fri, 26 Oct 2018 01:43:35 +0100 Subject: [PATCH] Fixed translation and owner email on the page for closed boxes --- boxes/templates/boxes/closed.html | 5 ++++- locale/pt_PT/LC_MESSAGES/django.mo | Bin 49718 -> 49631 bytes locale/pt_PT/LC_MESSAGES/django.po | 25 +++++++++++++------------ 3 files changed, 17 insertions(+), 13 deletions(-) diff --git a/boxes/templates/boxes/closed.html b/boxes/templates/boxes/closed.html index 0c491bf7..80ee7468 100644 --- a/boxes/templates/boxes/closed.html +++ b/boxes/templates/boxes/closed.html @@ -16,7 +16,10 @@

{% trans "That could be because:" %}

  • - {% trans "The recipient did not suply a valid public key in order to correctly encrypt the content." %}

    • -

    {% blocktrans %}In any of the above cases, you should contact the recipient ({{box.owner.first_name}} {{box.owner.last_name}}) in order to fix the issue.{% endblocktrans %}

    +

    + {% 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 ({{name}}) in order to fix the issue. + {% endblocktrans %} +

    diff --git a/locale/pt_PT/LC_MESSAGES/django.mo b/locale/pt_PT/LC_MESSAGES/django.mo index e8f023a757b816ae4c783abcf29db641a38ebbd1..cc5acef107a81039e2fd88e195c11eb26f2cb2a8 100644 GIT binary patch delta 4407 zcmYk5qvmnKoUt;G}W7c2}F2)Pk1IMHp6O8k)C$7Xm{3C|pJI?)2Fo^gvM&fs< z`$6gSjqw`#tw2p^HF{x*<4dRxH=|a( z6T`6q_1-1ig;((|mSh?efyFNJu0{>&!9SxqI*FRt1?+%dyz3?nH#bs*30!C!Wm7$Hw0+U1PK*RwE+@y!$(O6>~Nj5lKnE3QNx zzsuu{c>-HedpIl0uCx~0SBUK^#NOP$=*0K&dt$Hgc4BSlN8ByjZgm{Gbj+sH7|no7 zZ~$=wqtp?9gWBuYbBsyF6ZjB%PvRXMhD!Y=48Vi&>i>6KA5f%y$O)UqmBl2CKp6(H#$?itu9$#q;Qcx6v0{96dN&s*%p9>%rI!d!YtM zbm9yro{59Go{xuctBXb@jY+eNc@n=zcTzulwyokP@<DK>ID?nf14&Rkne zi%}WcfX`tK9>l18TSHCQlh|jT-TOYM3Fcrj&PR8h|JP{foWF%iWgV&rk0^FC<`y>M zo%x*g4iq72nt)*i#*E|o(+f>|4K=WjT0k=@V^NFw$lzl*8^6FeFl~wb0^Vqs{r?vY z&FlyCN8jHXlZ0W|zG75$FUANg!Z_T8`c9m}b=ZoGVTzWLP5c2hkzY``y>LFV+h#pR zGVyDe%J|0jS(|||sDX3Q6Sp{4Vprmws1EC~3pQg%yoZ{g=kILX1r_(i2poXJaGY~} z9nK=IKvy&~X`!JHNcaldaV)CZhofdb5_RtL(Hpm5JXWD5`YG!9v*?STqqg)qYJx4O zB2}Sii~TSP1D|96Rn z4wZpR7|i(QN9RT-rmfTmp{l(%P)RsA%6fXgt5EqJKHetL3r*!2+CttFQnsp#~aLX^ScgTZr>< zDCTXmnJLFE#BX9xJc{A?IqI0--A4Xb(&)3DipCmL%KnX7@m=)6j#ai=15gtjhC!Hu zkvIYS;ZoFut1uMzqEdeXC$jSMsQdkQ*bF4?aM@q48C*~XO0fM!)QnG{Ch`?NfVWV4 z*NU2m*=fIIUa0&1@L3#+>TfS9)fZ3;`vO%nH&K~sb2%4+cG=>I#u#o4LZx^zs^jUX z)Xl>OajkQ`0=4oQ{287`4cLZ-tk|Q*zE|=Zzc2M1=3wOO_5&#tHfyK&=fR1KU!K4RtyvUszk)_%#lzt8uZI0gMMct0ltqi{4ld7;@{DS^k{;g;XEwl zBcb1rH!zs^)`#{x;a+D49*C-;RCMVRneALCK<(9PRLZvDTKoWqV(KCL`~4X_One4Q za6>(HfT0a`3ufY0;%Xd;$vj+*#i;&ckJyQ29^rS0W-^rvFW{4S41dIEtUqe^@G1@> z_W8&bTM}xo$D;?ng8o?H#BZRU-}6!J^58%>x3je`hMafn;Nw<1H?*Id+tRX)U2k{b q!?-3aIkxQE(cWdJQ$ou8Qe*vmBmVDSZ9?kQ3IDrYd$BBcz<&X(Q>0-4 delta 4489 zcmbW(dsNr;9mnwx*8~AYP(hTNV!#wu;x#7<8se=K$Pn0IkPUecMD zOd*$9Ol2aP9&ckUv$Z29=bT!{9jnFMI%3nY=Znwxoc8zr;5&-eTNT;89{k6Wc4 zCsunLJMH1RV2qiYY|JoB8f?reEXG27f}L^R5MzRIGj_oP*bYC&Q2e9w{5uRHc26-T z3Ok^l_ro?g4%^~XY>h=J#$^I1xSR)N=t;a6JK#a|!dh&F=g<%9(HE~f&+ni*_!~xG z6MADvs(n8KI}!Il4Lr@MpOoq{#-EBARH(rPsF9VR4{mbYjvClL)PUZ_r|^hlHELkB zs2N|uaJ+;1&TS}@L2rD5M=%nrT;yGadi2C^Pz^Pr2KEHqvGw!D+{FM?#}80T@gu6E zkTm;!U)1*lQQxQI6r6w=cmlo9cQ|dKt1SgLH`0c^sEA6psm?^bFa_1YYp4`%LZ$dH z&cVw_woTFqo54k>rCNng;YJL@3Mc*m)$U0Qp?`CUf;zZ`zW5*1X7d?o*EAe^Gr$DY z^H)dNwVjJSi5FrN9z+^6moN}-p*Q{mHIODpGumdV6^7Bj@u#2{;&2TC zFcOC|>WerFwMi4R$p7mU`epHl@1Y0YMQy@+*byJ24+e9Vv1Jx@%mh2;&C^&#!IOB&ruzHh1!(O zs7&}xwKI*xQsN;Pix-jAG=Inam^#gFcGuSw*f(YlJ8S^f;ZAJA;kcEB+>2kLHe+#~ z-Ap@B89I*3upUoh+6=pgnz0LU!c4pNqfi4Z#(`LdWZGqZPeFJ0Ra7c(p*G=Hirx5V z7C$f;lF!C=XA_d93>;LzMxwra9!Hn=@34-VfM21_SQ?fS7h(>26&X{BdFX|0=1bPU zJq3*{3R=rX~bddSS{T&jKDHvwarnC zV&MLZI92p-5*OPH%tLitf*Rpz$MYCMd~ri@VN8GYe$!@RF!G9Nz^<6T&30Ud zk;GNVgk7edg09%xsMI~O4@}T@o5FZ(Su2d<`4a4myD~yo)+^|3(eOZ>N1P4E6s(EGn~o zP^V!Cs=cx3g)iwj{hL=*z!|6y3o#r^up910?dl6ygMYvvmSD|W_5#|q%MSQ5s)L89 zb{?Y!=DXYe4;hLB_^vbR)J$MqU9l9hDaduGRDFnQpa#{zCCtJ>#49f%L( zBRqqBu;y)>neS20^#jrcI-(}l8{=^NUh==3!U`%z;bT-L()ZaJk4GQkEYxnDfg0cz z)Rny*wI|-gc>Dx4;D@Ls^4@P#ACBXhc>?Nr=>eO8@&hjW-|H?al!2Sr^5Hvn#Nnva z4@6y5!%%BC7B!Fw7>!e$=PPkB@n%$e-Un?*iKvP7MeUgsRAw?z3@jjl!%n$4g{g2sSul^WG{adIGPNBYQz$6U&(C(QRQTM}Q z)Ltvc4cPW0{YS+5@1~#&rV%@#N44Dp;aEZ32T78t$F5lT8)Lq}?dXrQkF$Ys38rHc zDsw3(Y&*j-mN*A}a6RfisK5aFH}6pJ#g828P#s-y;%}Y!A!@0@NXIWQ8n0pwYJflI za+rw?sQ)2{{MP>J4LfD;iAkuA*J2>;!p7m z#-6tSMBc;ai3{rN5*)`}#7&rn6}-G3Z=l*=e%20b_gVfA(MXO_u@TSX1swCSz4?O9 z*){Bk&rqL(+HB>hwXQ@@{06mm8lAWq^}gr%>f+#bZf*;zH@Cm;=Kh7L&g&TO=4L9k zhJ5et<5s;YbYOSisdE=6%w1G4y)dETOmdglpTfLZg+=qT3vyqZ9#<3@^FI&fynxiA0# diff --git a/locale/pt_PT/LC_MESSAGES/django.po b/locale/pt_PT/LC_MESSAGES/django.po index 32f612a9..cff01bf8 100644 --- a/locale/pt_PT/LC_MESSAGES/django.po +++ b/locale/pt_PT/LC_MESSAGES/django.po @@ -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" @@ -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 (%(box.owner.first_name)s " -"%(box.owner.last_name)s) in order to fix the issue." +"\"mailto:%(email)s\" class=\"text-blue\">%(name)s) in order to fix the " +"issue.\n" +" " msgstr "" "Em qualquer dos casos acima descritos, deve contactar o destinatário (" -"%(box.owner.first_name)s %(box.owner.last_name)s) de modo a resolver o " -"problema." +"href=\"mailto:%(email)s\" class=\"text-blue\">%(name)s) de modo a resolver o problema." #: boxes/templates/boxes/success.html:15 msgid "MESSAGE SENT WITH SUCCESS!" @@ -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" @@ -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"