From 7c85f219d80c65d51e41a5e14af374a4b01d2b1e Mon Sep 17 00:00:00 2001 From: Santiago Lamora Date: Thu, 23 Nov 2023 19:59:14 +0100 Subject: [PATCH] Set USER_SUPPORT_EMAIL --- .../project_template/project_name/settings.py | 2 + .../musician/locale/ca/LC_MESSAGES/django.mo | Bin 8610 -> 8322 bytes .../musician/locale/ca/LC_MESSAGES/django.po | 102 ++++++++++-------- .../musician/locale/es/LC_MESSAGES/django.mo | Bin 8568 -> 8286 bytes .../musician/locale/es/LC_MESSAGES/django.po | 94 ++++++++-------- .../templates/musician/dashboard.html | 4 +- orchestra/contrib/musician/views.py | 22 ++-- 7 files changed, 127 insertions(+), 97 deletions(-) diff --git a/orchestra/conf/project_template/project_name/settings.py b/orchestra/conf/project_template/project_name/settings.py index 80f95b58..76d3f7ab 100644 --- a/orchestra/conf/project_template/project_name/settings.py +++ b/orchestra/conf/project_template/project_name/settings.py @@ -235,6 +235,8 @@ LOGIN_URL = 'musician:login' LOGOUT_REDIRECT_URL = 'musician:login' +USER_SUPPORT_EMAIL = "support@example.com" + ################################# ## 3RD PARTY APPS CONFIGURATION ## ################################# diff --git a/orchestra/contrib/musician/locale/ca/LC_MESSAGES/django.mo b/orchestra/contrib/musician/locale/ca/LC_MESSAGES/django.mo index fc8133a5268cc64f02a3d4633d3d32b215309982..8e24539cf729a93e23dc2393986fc6634b29ba3d 100644 GIT binary patch delta 2461 zcmZwJYiL$=9KiAaE^Ru^UD{G>m#21D%dA}GE;)7T+G^9x%gn9K%QBZPS{W!k>cA|M zqGgfTg0Ws?48w;Y>WvU|K`IzlSYZ^sF=#IW?M-Cg@AI6%7yWsD=kq`3?0@^6|2aCg z{7`fJVnOEdKp7;8iIW*2c%e9(17&b}2wC_P=HYY5FTBX16Gw0v{)S7iIwy6%5A9+A zZ@?j(i$~D@#_;YC;^93ixm>u2ML31mVdjj~c@8>o3`=nlI)P5S8M~tMXVH!i;H~%q zR^usLfRk8>SFsi=XNHi&_@RS}4ZCm__F@4JBEK-q;d*=(o!BTc^DvH1`~uQvxP(sZ zGP;nfI3J5>Y$lo`TajB~4NhbH&>daq$0p8)(1r;t$Dh#&W-vQD%0VYmfSEW4`Gpb= zPGAB0cXepynvgC+M|6J+I)Q$Sdt-=-9UekEJc2enhOTThx_$~x?P+vklhOGV^ij+u z9XH})%*S@L|88^v16YGkqZvAxOaA9jIm3l%crLne9^Ev*N7w&BSCq}HsD@m0qGgd4 zILvu1y0QthzmL&@K1Db81+2y^k)`?M-<7Xqx(?8ecDxR~z6l+$2Wb=bpaUF;?jMV; zk6;zo$1%AO^zY8&4*Uh({j1qnW}*+x%+5F!-ng(AP2E0pz}Jvp7~>F23*kd_Lf?^= zO8g1wGo%-W@BkKK8}^{DYC$I&-N4^*FP(tsfY9l(}c68*p4O=J#R+*G$<3GPR-98RDMJA?Lr7M;)+7>`l;gUSM& zMJrQSk2YL|?4QtsHXK4%ydPcRFq(#ajiC6KxcHldphfW|n zmTFfKi>FpRFS<~N4%C3Id_B67UC3LQ{OUon^m6oTXlYB4%vwKn)7wXoh-BdjCCmLB z(}`|^f9Kr)seep-ZYv0%?@GdAimolLd?(>+_yG!u^yJBaOs-+~6huc3R%QcbicYpFvI zY#`2se_YiMS(KOML;|c$OzqB>&Um prd}SMKZsq#!^D=v#Pmd3VtmHA%*4UG@~p(n*=w>B@zU~)e*w41!5#nr delta 2734 zcmZYAe@s*ByFy_rQrW9LI z_fMmmIEQ!O2;Pm~qS}k&I%8tyCMOHHkdR>VIxm?usVl2Q?RL3srdx!8KcB6K~c#IRJWD=F4e=r5-Fa?5N&XPPnFQ607~O0MPzGA45ZYw;u8juWWuS;4gRd>?8+@8D95y~jy0Ctsl6 z@pasTzabw}!zl8w2{q6@)T=s*t#}rfU^)l2lZP6}4(!HeWLcRXP#xdEPP~m9wEtaN zE91fmtio%kAChI{M=5JSb?isY;1Du-^E|4fH&FvUWA9(UwbZZJ`)zNWO!vm-XK0&>j&u}w-g_N40kfwKhJs z^-Gwi{eM*_IDwksQkJH^xEl3fIcgyFsI{>d$-3EZjiLtd8ft)VVJVJUXRk=4+W3%< z>ES^3%?XTYW<#8)gG;D^e1i_&!c~~g@2yg}8TDWluEa)UeVG{Q`F_;Q2T&6@gUZMV zYO!9xm+&%b0@c~%Ujt~&PQJs#$e_&&Sc2~&uhER68n}V#=oed`Ky~;R>U-0jsY%Xe8>0T%whDoR}&b?TPla(yQ(G z-?G|PcB2NbOlr$%Eo~wmAXvMmgNSKCO()h6j}i66RPl52l&$DTC_Hrol^qqW50z(< zB#!LsL}|7vQz{P({OpA3VY5}n^%vRz_qMVp2 z`JC(`w78xoiV2s{Px3v){lr5=JE0xos8U9#6cQE00aa{y0;`F+M7F(lA2ty4RUht{ zGd#`b3x_<{?>XH;ug&q=0#3B6vojp=953K@I9}Lk4R}sVz;lD`QO6$+`2&$qFx2W) z@2+=TzdsO-mJDa7T}fT&Mx))~NQ=|e+2VSEmX*Ud7v#@ut%~|1!LHSzaMW>~GS_K~ z1P*SE_YQQ>o)<37FS6Y=1$3o28t)w}|KG*3HEy}n8HhMh_W(zKxFgYZOEBWN?HWnR f@Vv!4XJzh+_nvHXx#xAc?Ln`{^@i(KtWEhBHRv5L diff --git a/orchestra/contrib/musician/locale/ca/LC_MESSAGES/django.po b/orchestra/contrib/musician/locale/ca/LC_MESSAGES/django.po index baa33413..d41d6697 100644 --- a/orchestra/contrib/musician/locale/ca/LC_MESSAGES/django.po +++ b/orchestra/contrib/musician/locale/ca/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-11-24 11:04+0100\n" +"POT-Creation-Date: 2023-11-23 19:57+0100\n" "PO-Revision-Date: 2021-11-25 12:53+0100\n" "Last-Translator: \n" "Language-Team: \n" @@ -18,53 +18,53 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Poedit 3.0\n" -#: api.py:113 api.py:211 +#: api.py:127 api.py:226 msgid "No domain found matching the query" msgstr "No trobem cap domini que coincideixi amb la teva consulta" -#: api.py:125 +#: api.py:139 msgid "No object found matching the query" msgstr "No trobem cap objecte que coincideixi amb la teva consulta" -#: api.py:178 +#: api.py:192 msgid "No mailbox found matching the query" msgstr "No trobem cap bústia que coincideixi amb la teva consulta" -#: forms.py:65 forms.py:99 +#: forms.py:57 forms.py:88 msgid "The two password fields didn’t match." msgstr "Les contrasenyes introduïdes no coincideixen." -#: forms.py:68 forms.py:103 +#: forms.py:60 forms.py:92 msgid "Password" msgstr "Contrasenya" -#: forms.py:73 forms.py:108 +#: forms.py:65 forms.py:97 msgid "Password confirmation" msgstr "Confirma la contrasenya" -#: forms.py:76 forms.py:111 +#: forms.py:68 forms.py:100 msgid "Enter the same password as before, for verification." msgstr "Introdueix la mateixa contrasenya per verificar-la." -#: mixins.py:14 +#: mixins.py:17 msgid "Domains & websites" msgstr "Dominis i llocs web" -#: mixins.py:15 +#: mixins.py:18 msgid "Mails" msgstr "Correus" #. Translators: This message appears on the page title -#: mixins.py:16 views.py:296 +#: mixins.py:19 views.py:324 msgid "Mailing lists" msgstr "Llistes de correu" #. Translators: This message appears on the page title -#: mixins.py:17 models.py:147 views.py:480 +#: mixins.py:20 models.py:147 views.py:446 msgid "Databases" msgstr "Bases de dades" -#: mixins.py:18 +#: mixins.py:21 msgid "SaaS" msgstr "SaaS" @@ -73,7 +73,7 @@ msgid "Description details for databases page." msgstr "Consulta la configuració de les teves bases de dades." #. Translators: This message appears on the page title -#: models.py:235 views.py:185 +#: models.py:235 views.py:247 msgid "Mail addresses" msgstr "Adreces de correu" @@ -170,7 +170,7 @@ msgstr "Domini" #. Translators: This message appears on the page title #: templates/musician/addresses.html:17 templates/musician/mail_base.html:22 -#: views.py:325 +#: views.py:355 msgid "Mailboxes" msgstr "Bústies de correu" @@ -182,24 +182,28 @@ msgstr "Redirecció" msgid "New mail address" msgstr "Nova adreça de correu" -#: templates/musician/base.html:60 +#: templates/musician/base.html:63 msgid "Settings" msgstr "Configuració" -#: templates/musician/base.html:63 templates/musician/profile.html:6 +#: templates/musician/base.html:66 templates/musician/profile.html:6 msgid "Profile" msgstr "Perfil" #. Translators: This message appears on the page title -#: templates/musician/base.html:64 templates/musician/billing.html:6 -#: views.py:163 +#: templates/musician/base.html:67 templates/musician/billing.html:6 +#: views.py:205 msgid "Billing" msgstr "Factures" -#: templates/musician/base.html:72 +#: templates/musician/base.html:82 msgid "Log out" msgstr "Surt" +#: templates/musician/base.html:93 +msgid "Language" +msgstr "" + #: templates/musician/billing.html:7 msgid "Billing page description." msgstr "Consulta i descarrega les teves factures." @@ -285,7 +289,7 @@ msgid "Mail list" msgstr "Llista de correu" #. Translators: This message appears on the page title -#: templates/musician/dashboard.html:83 views.py:489 +#: templates/musician/dashboard.html:83 views.py:456 msgid "Software as a Service" msgstr "Software as a Service" @@ -293,7 +297,7 @@ msgstr "Software as a Service" msgid "Nothing installed" msgstr "No tens res instal·lat" -#: templates/musician/dashboard.html:90 views.py:57 +#: templates/musician/dashboard.html:90 views.py:70 msgid "Disk usage" msgstr "Ús del disc" @@ -305,26 +309,30 @@ msgstr "Detalls de configuració" msgid "FTP access:" msgstr "Accés FTP:" -#. Translators: domain configuration detail modal -#: templates/musician/dashboard.html:116 -msgid "Contact with the support team to get details concerning FTP access." +#: templates/musician/dashboard.html:117 +#, fuzzy, python-format +#| msgid "" +#| "Send an email to %(support_email)s including your username and we will provide instructions." +msgid "" +"E-mail us at %(support_email_anchor)s to get details concerning FTP access." msgstr "" -"Escriu-nos a %(support_email)s per " -"saber com accedir al FTP." +"Envia un correu a %(support_email)s " +"indicant el teu nom d’usuari/a i t’explicarem què fer." -#: templates/musician/dashboard.html:125 +#: templates/musician/dashboard.html:127 msgid "No website configured." msgstr "No hi ha cap web configurada." -#: templates/musician/dashboard.html:127 +#: templates/musician/dashboard.html:129 msgid "Root directory:" msgstr "Directori arrel:" -#: templates/musician/dashboard.html:128 +#: templates/musician/dashboard.html:130 msgid "Type:" msgstr "Tipus:" -#: templates/musician/dashboard.html:133 +#: templates/musician/dashboard.html:135 msgid "View DNS records" msgstr "Veure registres DNS" @@ -472,56 +480,60 @@ msgid "Open service admin panel" msgstr "Obre el panell d’administració del servei" #. Translators: This message appears on the page title -#: views.py:41 +#: views.py:54 msgid "Dashboard" msgstr "Panell de gestió" -#: views.py:66 +#: views.py:79 msgid "Traffic" msgstr "Tràfic" -#: views.py:97 +#: views.py:117 msgid "Mailbox usage" msgstr "Ús d’espai a la bústia de correu" #. Translators: This message appears on the page title -#: views.py:112 +#: views.py:132 msgid "User profile" msgstr "El teu perfil" #. Translators: This message appears on the page title -#: views.py:170 +#: views.py:219 msgid "Download bill" msgstr "Descarrega la factura" -#: views.py:283 +#: views.py:310 msgid "Address deleted!" msgstr "S’ha suprimit l’adreça de correu" -#: views.py:285 views.py:422 views.py:469 +#: views.py:312 views.py:412 msgid "Cannot process your request, please try again later." msgstr "" "Ara no podem processar la teva petició, torna a intentar-ho una mica més " "tard sisplau" -#: views.py:420 +#: views.py:410 msgid "Mailbox deleted!" msgstr "S’ha suprimit la bústia de correu" -#: views.py:467 -msgid "Password updated!" -msgstr "S’ha actualitzat la contrasenya" - #. Translators: This message appears on the page title -#: views.py:497 +#: views.py:464 msgid "Domain details" msgstr "Detalls del domini" #. Translators: This message appears on the page title -#: views.py:523 +#: views.py:478 msgid "Login" msgstr "Accés" +#~ msgid "Contact with the support team to get details concerning FTP access." +#~ msgstr "" +#~ "Escriu-nos a %(support_email)s per " +#~ "saber com accedir al FTP." + +#~ msgid "Password updated!" +#~ msgstr "S’ha actualitzat la contrasenya" + #~ msgid "mail address left" #~ msgstr "adreces de correu per activar" diff --git a/orchestra/contrib/musician/locale/es/LC_MESSAGES/django.mo b/orchestra/contrib/musician/locale/es/LC_MESSAGES/django.mo index 91a5e590e74bbb2b9ad358b4e95351a26abf4253..95b5f13c29e6fe9e437a0ebca12c190d0ba598fa 100644 GIT binary patch delta 2461 zcmZwITTE0(9LMoLf^xHhE2vmqjtC-(7Zh)(sI&+w0v3veRuDw-vMp<*TI0itM#ZEW zQeu2DnivwJ#u#0Vp?zqZrfE_hOpKcNP)rjZY&E{AO&`SX@9dcP;AH>jGiUaknK}P6 zv-@A!(3;3lAmOZ0!o*bKe7u<&rY3TrgpZ+mOyw30NjT`fcz{|o|GM@!s3%HfR#YtwHPLKm zE*|5&0QF?oQT_dh8t6CF;(mzJ+vs6usIk7{p34cLO*W1Xl0j=1kn zyY@buNqax~4}!Yx0q(@VQLDd_g{4fip)#{OLWLb?2T`dzj2iF<dE3W%r;^c*5MAUzyVYSC93Sn1wu)Rbv-!LzaO(MBO)x-{LbY!d7n9??fMNz(-iD{Xd-rpj0%VUO_uD zc?%(9S~n^q=TJ{{+4&RB=lmY(`VrJ(%^=TuVh^<_3vdONqh3ijYJz7lQ~Uoc72R;n zU2q$hasI3Ge_YA=BGRB6!>9=#bmzyN-=iknhnnye)S4MUrTkA+=ANT67hra2+W)y! zbYU?n1LdfJHX+wqJ(5N1MD6brI1hVqDgKOe@iqFtY%KL`&TEjQSSRY$^q~4bhxvFB zBOaAMsHlUds1#0|7JJt@sF{|aCRF9DbL~y2-4a4|ybsUdAtY&*#6r@*IjGDOAwyUN z&cXH|`S+;w(xB~j6ZICNWao;ELxSHrV%ta5?PdO^H)!2hA zsQaIy9%z&o(VqaFd9eXAkjYyX>c*w0nO7pa(Err~zqE4Huc3;zpbCrHItWdojZj}I zycxf&<~WLICN!?rpZ{mF1V1G->ve>R-tqfI8Q4vP3GIaCgcj5)LMvO_OzWkZ*hAD4 zT8P>m?-wmzW$Q~q!otS8C{t=_$aN+F?FqlLGb@Q8MzmUvf|xyoml zN~|CniEYGo;tN8BH5c*UM<*vr^M}eV8f%CG;wxeyp|Y0voY+b1AQllT3H`WeEvaag zSNXNrp#`=Ovx#it8$ExB%1ok?&^9X}RJ1_m6a4b}|61U$iE^wUw31ayi3NTww%U_j t{c9&{)ZZPSxbsceMAQ*mqt}z8anb(N!Gvgcdfu35VAAZwXnim@{w<G7^>23P>WTOdsyO{4lr|?tK`;Ke}zS zv}~?rC7eE;6~XGR>Il(1%NKi>+_R2I_lI19$~j;u%y&pW}@< zW9xsSI!I18rU=up41Kr;+i(?*Vg>!1V_Yx>GmUz22Cu=3n2o<7e$yQ3KqM zYUmJZATMGvzJ&alqkL!pr%>NJi^|*wNRwvTKK~A5i4N_9IaGs7nT{GvN4=PZnpu&( z??a`w3N^4cTi=ITiV4icw=oMpLv=ihn!vAEj=yJ;f2GKwmprUSWuggnza7;;2(^ix zu+LvW&1?c`%e;yj@EPk_9HssqYJv?kqIR26?RKCxdpL{ymvQkdH{>KL1K*%Jm_;>w z+1~#J)!`MSZL@?8q7HIV?-ir&S70gDqB?d_-`k5_IE*?CGchidk~vh0{>86y~uJST<8)twRmC6*aIfYrnnkp-#_J zsP+%yAv}z%jwvc2{~ACY!%~WNAcHk7R^sF6;OnU4^$BW8E}$Cz+TQ;bHKU8DhW|lj zB+r?DuLw2JaxB4GR6Dz!*nEn6xN(3RBd7)zaU?XO6{!CW#i$N_NHR~YJ9=M%&h}c9dlvP~p zBvOe-i3-9c^uxBASWDCseT4Rpqe>m2qN8^w(W#0p58yUJo3Oy%y9L__og5SIPmL!v zG=xK*>-U`DUa!aTdV)@LXkZ{5@fRi4NjeQ`GPm(_Vw;_1M!;t(#8J)OIHZZ diff --git a/orchestra/contrib/musician/locale/es/LC_MESSAGES/django.po b/orchestra/contrib/musician/locale/es/LC_MESSAGES/django.po index a2e06d4f..9d8c7960 100644 --- a/orchestra/contrib/musician/locale/es/LC_MESSAGES/django.po +++ b/orchestra/contrib/musician/locale/es/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-11-24 11:04+0100\n" +"POT-Creation-Date: 2023-11-23 19:57+0100\n" "PO-Revision-Date: 2021-11-25 12:53+0100\n" "Last-Translator: \n" "Language-Team: \n" @@ -18,53 +18,53 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Poedit 3.0\n" -#: api.py:113 api.py:211 +#: api.py:127 api.py:226 msgid "No domain found matching the query" msgstr "No hay dominios que coincidan con tu búsqueda" -#: api.py:125 +#: api.py:139 msgid "No object found matching the query" msgstr "No hay objetos que coincidan con tu búsqueda" -#: api.py:178 +#: api.py:192 msgid "No mailbox found matching the query" msgstr "No hay buzones de correo que coincidan con tu búsqueda" -#: forms.py:65 forms.py:99 +#: forms.py:57 forms.py:88 msgid "The two password fields didn’t match." msgstr "Las contraseñas introducidas no coinciden." -#: forms.py:68 forms.py:103 +#: forms.py:60 forms.py:92 msgid "Password" msgstr "Contraseña" -#: forms.py:73 forms.py:108 +#: forms.py:65 forms.py:97 msgid "Password confirmation" msgstr "Confirma la contraseña" -#: forms.py:76 forms.py:111 +#: forms.py:68 forms.py:100 msgid "Enter the same password as before, for verification." msgstr "Introduce la misma contraseña para verificarla" -#: mixins.py:14 +#: mixins.py:17 msgid "Domains & websites" msgstr "Dominios y sitios web" -#: mixins.py:15 +#: mixins.py:18 msgid "Mails" msgstr "Correos" #. Translators: This message appears on the page title -#: mixins.py:16 views.py:296 +#: mixins.py:19 views.py:324 msgid "Mailing lists" msgstr "Listas de correo" #. Translators: This message appears on the page title -#: mixins.py:17 models.py:147 views.py:480 +#: mixins.py:20 models.py:147 views.py:446 msgid "Databases" msgstr "Bases de datos" -#: mixins.py:18 +#: mixins.py:21 msgid "SaaS" msgstr "SaaS" @@ -73,7 +73,7 @@ msgid "Description details for databases page." msgstr "Consulta la configuración de tus bases de datos." #. Translators: This message appears on the page title -#: models.py:235 views.py:185 +#: models.py:235 views.py:247 msgid "Mail addresses" msgstr "Direcciones de correo" @@ -172,7 +172,7 @@ msgstr "Dominio" #. Translators: This message appears on the page title #: templates/musician/addresses.html:17 templates/musician/mail_base.html:22 -#: views.py:325 +#: views.py:355 msgid "Mailboxes" msgstr "Buzones de correo" @@ -184,24 +184,28 @@ msgstr "Redirección" msgid "New mail address" msgstr "Nueva dirección de correo" -#: templates/musician/base.html:60 +#: templates/musician/base.html:63 msgid "Settings" msgstr "Configuración" -#: templates/musician/base.html:63 templates/musician/profile.html:6 +#: templates/musician/base.html:66 templates/musician/profile.html:6 msgid "Profile" msgstr "Perfil" #. Translators: This message appears on the page title -#: templates/musician/base.html:64 templates/musician/billing.html:6 -#: views.py:163 +#: templates/musician/base.html:67 templates/musician/billing.html:6 +#: views.py:205 msgid "Billing" msgstr "Facturas" -#: templates/musician/base.html:72 +#: templates/musician/base.html:82 msgid "Log out" msgstr "Desconéctate" +#: templates/musician/base.html:93 +msgid "Language" +msgstr "" + #: templates/musician/billing.html:7 msgid "Billing page description." msgstr "Consulta y descarga tus facturas." @@ -287,7 +291,7 @@ msgid "Mail list" msgstr "Lista de correo" #. Translators: This message appears on the page title -#: templates/musician/dashboard.html:83 views.py:489 +#: templates/musician/dashboard.html:83 views.py:456 msgid "Software as a Service" msgstr "Software as a Service" @@ -295,7 +299,7 @@ msgstr "Software as a Service" msgid "Nothing installed" msgstr "No tienes nada instalado" -#: templates/musician/dashboard.html:90 views.py:57 +#: templates/musician/dashboard.html:90 views.py:70 msgid "Disk usage" msgstr "Uso del disco" @@ -307,26 +311,30 @@ msgstr "Detalles de configuración" msgid "FTP access:" msgstr "Acceso FTP:" -#. Translators: domain configuration detail modal -#: templates/musician/dashboard.html:116 -msgid "Contact with the support team to get details concerning FTP access." +#: templates/musician/dashboard.html:117 +#, fuzzy, python-format +#| msgid "" +#| "Send an email to %(support_email)s including your username and we will provide instructions." +msgid "" +"E-mail us at %(support_email_anchor)s to get details concerning FTP access." msgstr "" -"Escríbenos a %(support_email)s para " -"saber cómo acceder al FTP." +"Envía un correo a %(support_email)s " +"indicando tu nombre de usuaria/o y te explicaremos qué hacer." -#: templates/musician/dashboard.html:125 +#: templates/musician/dashboard.html:127 msgid "No website configured." msgstr "No hay ninguna web configurada." -#: templates/musician/dashboard.html:127 +#: templates/musician/dashboard.html:129 msgid "Root directory:" msgstr "Directorio raíz:" -#: templates/musician/dashboard.html:128 +#: templates/musician/dashboard.html:130 msgid "Type:" msgstr "Tipo:" -#: templates/musician/dashboard.html:133 +#: templates/musician/dashboard.html:135 msgid "View DNS records" msgstr "Ver registros DNS" @@ -474,53 +482,49 @@ msgid "Open service admin panel" msgstr "Abre el panel de administración del servicio" #. Translators: This message appears on the page title -#: views.py:41 +#: views.py:54 msgid "Dashboard" msgstr "Panel de gestión" -#: views.py:66 +#: views.py:79 msgid "Traffic" msgstr "Tráfico" -#: views.py:97 +#: views.py:117 msgid "Mailbox usage" msgstr "Uso de espacio en tu buzón de correo" #. Translators: This message appears on the page title -#: views.py:112 +#: views.py:132 msgid "User profile" msgstr "Tu perfil" #. Translators: This message appears on the page title -#: views.py:170 +#: views.py:219 msgid "Download bill" msgstr "Descarga la factura" -#: views.py:283 +#: views.py:310 msgid "Address deleted!" msgstr "Has eliminado la dirección de correo" -#: views.py:285 views.py:422 views.py:469 +#: views.py:312 views.py:412 msgid "Cannot process your request, please try again later." msgstr "" "Ahora no podemos procesar tu petición, inténtalo de nuevo un poco más tarde " "por favor." -#: views.py:420 +#: views.py:410 msgid "Mailbox deleted!" msgstr "Has eliminado el buzón de correo" -#: views.py:467 -msgid "Password updated!" -msgstr "Contraseña actualizada" - #. Translators: This message appears on the page title -#: views.py:497 +#: views.py:464 msgid "Domain details" msgstr "Detalles del dominio" #. Translators: This message appears on the page title -#: views.py:523 +#: views.py:478 msgid "Login" msgstr "Accede" diff --git a/orchestra/contrib/musician/templates/musician/dashboard.html b/orchestra/contrib/musician/templates/musician/dashboard.html index d359fcb5..bdcf97ba 100644 --- a/orchestra/contrib/musician/templates/musician/dashboard.html +++ b/orchestra/contrib/musician/templates/musician/dashboard.html @@ -113,7 +113,9 @@
{% trans "FTP access:" %}
{# Translators: domain configuration detail modal #} -

{% trans "Contact with the support team to get details concerning FTP access." %}

+

+ {% blocktrans %}E-mail us at {{ support_email_anchor }} to get details concerning FTP access.{% endblocktrans %} +

{% comment %} username
diff --git a/orchestra/contrib/musician/views.py b/orchestra/contrib/musician/views.py index ca9ccc2b..d1563444 100644 --- a/orchestra/contrib/musician/views.py +++ b/orchestra/contrib/musician/views.py @@ -87,10 +87,17 @@ class DashboardView(CustomContextMixin, UserTokenRequiredMixin, TemplateView): 'mailbox': self.get_mailbox_usage(profile_type), } + support_email = getattr(settings, "USER_SUPPORT_EMAIL", "suport@pangea.org") + support_email_anchor = format_html( + "{}", + support_email, + support_email, + ) context.update({ 'domains': domains, 'resource_usage': resource_usage, 'notifications': notifications, + "support_email_anchor": support_email_anchor, }) return context @@ -252,10 +259,11 @@ class MailView(ServiceListView): context = super().get_context_data(**kwargs) domain_id = self.request.GET.get('domain') if domain_id: + qs = Domain.objects.filter(account=self.request.user) context.update({ - 'active_domain': self.orchestra.retrieve_domain(domain_id) + 'active_domain': get_object_or_404(qs, pk=domain_id) }) - context['mailboxes'] = self.orchestra.retrieve_mailbox_list() + context['mailboxes'] = Mailbox.objects.filter(account=self.request.user) return context @@ -316,22 +324,24 @@ class MailingListsView(ServiceListView): 'title': _('Mailing lists'), } + def get_queryset(self): + return self.model.objects.filter(account=self.request.user).order_by("name") + def get_context_data(self, **kwargs): context = super().get_context_data(**kwargs) domain_id = self.request.GET.get('domain') if domain_id: + qs = Domain.objects.filter(account=self.request.user) context.update({ - 'active_domain': self.orchestra.retrieve_domain(domain_id) + 'active_domain': get_object_or_404(qs, pk=domain_id) }) return context def get_queryfilter(self): """Retrieve query params (if any) to filter queryset""" - # TODO(@slamora): this is not working because backend API - # doesn't support filtering by domain domain_id = self.request.GET.get('domain') if domain_id: - return {"domain": domain_id} + return {"address_domain_id": domain_id} return {}