From d03472a123ab2ba2d475afb722fab767e04007fc Mon Sep 17 00:00:00 2001 From: jorgepastorr Date: Tue, 3 Dec 2024 12:06:43 +0100 Subject: [PATCH] musician filters content with get_queryset --- orchestra/contrib/musician/lists/views.py | 6 +- .../musician/locale/ca/LC_MESSAGES/django.mo | Bin 15189 -> 15315 bytes .../musician/locale/ca/LC_MESSAGES/django.po | 206 ++++++++++-------- .../musician/locale/es/LC_MESSAGES/django.mo | Bin 15272 -> 15401 bytes .../musician/locale/es/LC_MESSAGES/django.po | 206 ++++++++++-------- orchestra/contrib/musician/saas/forms.py | 2 +- orchestra/contrib/musician/saas/views.py | 16 +- .../templates/musician/database_list.html | 10 + .../templates/musician/domain_list.html | 2 - .../templates/musician/mailinglist_list.html | 10 + .../musician/saas_nextcloud_list.html | 10 + .../musician/saas_wordpress_list.html | 10 + .../musician/webapps/webapp_list.html | 10 + .../musician/webapps/webappuser_list.html | 11 + .../musician/websites/website_list.html | 10 + orchestra/contrib/musician/views.py | 12 +- orchestra/contrib/musician/webapps/views.py | 6 +- orchestra/contrib/musician/websites/views.py | 7 +- 18 files changed, 337 insertions(+), 197 deletions(-) diff --git a/orchestra/contrib/musician/lists/views.py b/orchestra/contrib/musician/lists/views.py index dfd53fdb..7481ba30 100644 --- a/orchestra/contrib/musician/lists/views.py +++ b/orchestra/contrib/musician/lists/views.py @@ -23,7 +23,11 @@ class MailingListsView(CustomContextMixin, UserTokenRequiredMixin, ListView): } def get_queryset(self): - return self.model.objects.filter(account=self.request.user) + qs = self.model.objects.filter(account=self.request.user) + name = self.request.GET.get('name') + if name: + qs = qs.filter(name__icontains=name) + return qs def get_context_data(self, **kwargs): context = super().get_context_data(**kwargs) diff --git a/orchestra/contrib/musician/locale/ca/LC_MESSAGES/django.mo b/orchestra/contrib/musician/locale/ca/LC_MESSAGES/django.mo index 1bb86681c3236bc815d8d3258f7ae695a3dd00b4..21afe8c9b18556832595c2e36a6ebe122fb29149 100644 GIT binary patch delta 4004 zcmY+{c~DhV0LSrz;sPQFDzcb9abXb=L~%hy4K)!7mrUG65HU7!i_l(*iVLJkTJHN+ z<`T}7r8AaUjioIPHe>2EjWem)Vve~?fAsymdl>7Ezxz4ozPp_5UaD^4yJ)GQ(9h)n_7&msnL@#4@V|VIxEsU9ljRK8XkGZ%E|Hcw53o@n&-oeKB z7dFSo$SI~tOJn?X>rkg)qEILF#(_8#b%W*TgH@3bZ2|>`!X)berdh|K8Zs3lFc%|n6~^Lm?2Okj8XLA@ z6tElWx<07;rl3YL1J&^HsF9wD?kN=J+8@3__3#?@#Gg?k&?dy`NhI>mB(hUa(oqeb zf^^R0p@w`3>Vb!?Cr}SQg|yXtj;VM(gz-$O=&>E<~+?3VZxh)Q!Kwj`$GO z!|*WYK@q5i$DlXHqk7&8)xcErjDW3=M?GhH7~`*@DCB@{P;O6HiW@_9sFC;uHP?^qaqn>F!Oc;ty$xy#qfs45xAhV?1r13J>cn?YJv)t2cn&qRcac#u z4R}Xg7>?>ef7D_cffYC#)xf)`>mHy+pxHA{2U?>RZ5V1q+;J2%$4RIYhoO3&Y3q|v zJ8$Cfar~$1}0|HR>5L81tBW*FssOu&m&vBb+6f{?J@FJFBBo1%y ztmjH6?1!qSScjsfW+ZClCZnckfpsYc=>4yzpcA*F8gkUu z&!Bp63Du(?Q4hFjy@R^$PwawT9h~!`kdK^6Kn-;&a*CONx?dR<;7Xju^UZzx!$eky zh9(bn<090QxUnIwMy-`<)RgT*J?JF5yo~t*_fo&rk$0bZRVU{yI^UTE&T(&A`2m(< zHO4T^?h*Nhl1-ZoBL(OS;SEr$oNT5KBu^(2WAAaekpqAF5dU_4@I{krq;6v0D_{15LgY8idUXD7y z1{3iB>inzN4DX_P`UrJiV0Y)fozO)+76+qy6a`(d4%LvYs2lCU4tNsB;uU-jW8$3~ z&BNx@%TZs*)u`*wVKQF8RBW8!jLb;%ralgJUY4WVOs5dYfjn%1WwyQs)$(oj_%VC@ zENXAAt zIP;M+`KYx~iE7AB)S^3xF8msqcJrG(9>!7+q@IFWOQUf)mSZ!$|E8C7LqAkYJE4Xu z9$V>W)R3j28aNttUN&kG71??@>bgqQYg~mZaRX{`hO#1cp9s`QM59}CIEaE;n1QWv zI_mXXh`Lb?>h0K!{n`hoK8(Lw zbc6%JSc@9s3#gvn!XSK%x}hKQ!XHA@1vOXgPKb(CSF6^1uHQT*W$;hkr~bs*Nt;f51fOVl5%^z5<{t1qo(j6 z>i(zE3$<<0&NKhWqV=?l-_3Edk-STCiMFle4e|ov^KM=yFA;4eWEh!C^vb?R=8^hM z4Qo%v5_PJEyhx&m`&o9{)|1s_8`(qD`ck5mTECs3p!wF&78AW@o?*q!NY9I~sv|C&2(8cJ;w$y&0Gu*UwkX@LgXBl;i>Cxgf&Qcmi(Y+D$Q zwWN&9BrAxvG%{M_&)PEYliehRXnwV*v>hSUB!es@2gwA&t83mQ2gp*QZ48O`l=#DC z&9@4ztNvt~Dr~(-Kc4UTDCqsv7D)=p9I}|KBB|tU@;aG8(#cyy+Yq9a>`%H9ZOa@y z`+e;Dl9Be6uT6gNGsn*Edy+xlymMGo0| zJuwv8kzjjZFY=jC|M{<8GK!2Ki%1(Xg@lt=NFs60biNNesShUe$r7@L6p;$@Dj7$# zRXKRRF)B8&bGv<0ih`v8 delta 3883 zcmZA4dvwor9LMpGn$6E<7rPiUe#35tnai-D#t>WXg%Cv}*SY7CUu-egL_@BLv2ty4 z==KL)PO3?ETsmsbSx!P7qMfLy=j;3Z)Tusa@89F|`TV|@&*%O5e7`>`=A51FtE}r+ zY$#7~unIe1e1z*r zOrc$jt?)Q z=)woE79K+l__(zkNtXE<8{swdD77A@K`Kl*>HkV$0pbX6LB=Qz#@#tBbbaA zu{PGM=bjgex^6vGCKFHtZ-rWlO!SSU(%XKq2Q|aDu^qmP%D@fOO#Va-FfiJkaU?3m zDX1F^v5rFBXdE&oGZV9M1@^(ys0_u_C;vLI8F|;5r=h;cM_qU>HpLQDCQhPmbQ(3# z3+RWHsF{9;8sII|aevshUjuhQ!Kj(Xpw3TjK>l??DjiB)C+vjTs0%Md4XD7n619fK zsEq8k{bi`@yocJ|AETD+JZb{J*>+eyd54)xs8ruV{)~T|d%Z-QM7tg4;SSqhiw)w>{Y@klUAQ4? zOHzk^_mNdF0jy^ZCZgUa zGcX-XZTnI(`Bz6ob9b}kpk_E8YvFv<9wqZO4|&a- zc+_6VKo1VGj>Ouu$EA>et@(61c)1xL>P8z-Gd_;aZboJ3s`UE35HYM=$Ei7xk1381nSb;AS z>+D7^9>6U8(taP7>fSgObzU=!Lti?TK~#p~Be)NBp=zvy_fT)dz}D^sdSE8)T+GHI zR3^&N56_`yc+pygy5Us}#oui^D9xFW&orWX1Zse%F%qj#ujV`GJpYkwU8O1pgE0Xsu|2YX zOhgCw*Q`4Zpq+>H@fh~TGpP4S!;Y>^tVyT=wZbTDkIHZ^YN8W5lK;9?=F_1Iu10>? zOeyMl{RpG+6lx|{P$yQSmd2lj)Qy8N93wCRlThdPLtTFuY5bxhiaUIc>*h{EPBc3CkCrSuS z@F1bGo?tr}Ult$R36+h+FhYY;dWIAKFFojZh1f)NBb1#Xgi0x~&8fNnH(-^VcZxEj zGKGjI2B|@ru3Kq?spz%2*r~A}a0b!Kw&z*-!TV2XKr5H%NkkKG5M2oNqj{K6*-aD? zbBGB9EA&qppsDhLbJkif7nKD>j#D#cHac7jQw$T?S z65WZHY+smC9Z2Xgd5Y*y3?&8<+E}BBLqtBYk5F0d;{2;Ak9s{~rtK5X4#y{n6k-IC zO#HjV(3nK{%J}GQzuAG~h(5#t;zdGb7E#x!xgTRdFC3NT#8e_&4a&aoB{{|{+h+?9UPA(2i*661-#OJgbt#2(wBM|TUcgwW&pD$$hK uN(2+H5sQdjgi4Zzokk_jY4T4i^gA3I($I5wO!Sthb-Af=hjUYx2K@!Q1!XY+ diff --git a/orchestra/contrib/musician/locale/ca/LC_MESSAGES/django.po b/orchestra/contrib/musician/locale/ca/LC_MESSAGES/django.po index aca26dcc..c06a69ae 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: 2024-11-20 10:36+0000\n" +"POT-Creation-Date: 2024-12-03 11:03+0000\n" "PO-Revision-Date: 2021-11-25 12:53+0100\n" "Last-Translator: \n" "Language-Team: \n" @@ -30,19 +30,19 @@ msgstr "No trobem cap objecte que coincideixi amb la teva consulta" msgid "No mailbox found matching the query" msgstr "No trobem cap bústia que coincideixi amb la teva consulta" -#: forms.py:42 forms.py:111 saas/forms.py:100 +#: forms.py:42 forms.py:111 saas/forms.py:101 msgid "The two password fields didn’t match." msgstr "Les contrasenyes introduïdes no coincideixen." -#: forms.py:45 forms.py:115 saas/forms.py:103 +#: forms.py:45 forms.py:115 saas/forms.py:104 msgid "Password" msgstr "Contrasenya" -#: forms.py:50 forms.py:120 saas/forms.py:108 +#: forms.py:50 forms.py:120 saas/forms.py:109 msgid "Password confirmation" msgstr "Confirma la contrasenya" -#: forms.py:53 forms.py:123 saas/forms.py:111 +#: forms.py:53 forms.py:123 saas/forms.py:112 msgid "Enter the same password as before, for verification." msgstr "Introdueix la mateixa contrasenya per verificar-la." @@ -72,7 +72,7 @@ msgid "Mails" msgstr "Correus" #. Translators: This message appears on the page title -#: mixins.py:22 models.py:146 views.py:599 +#: mixins.py:22 models.py:146 views.py:598 msgid "Databases" msgstr "Bases de dades" @@ -89,7 +89,7 @@ msgid "Community WP" msgstr "WP Comunitari" #. Translators: This message appears on the page title -#: mixins.py:26 websites/views.py:24 +#: mixins.py:26 websites/views.py:25 msgid "Websites" msgstr "" @@ -107,7 +107,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:234 views.py:399 +#: models.py:234 views.py:398 msgid "Mail addresses" msgstr "Adreces de correu" @@ -164,13 +164,13 @@ msgstr "" "base de dades.
El nom d'usuari i la contrasenya s'enviaran a aquesta " "adreça de correu electrònic." -#: saas/forms.py:90 saas/forms.py:124 +#: saas/forms.py:90 saas/forms.py:125 #, python-format msgid "Suggestion: %s" msgstr "Suggerimet: %s" #. Translators: This message appears on the page title -#: saas/views.py:28 saas/views.py:51 templates/musician/domain_list.html:51 +#: saas/views.py:28 saas/views.py:55 templates/musician/domain_list.html:49 msgid "Software as a Service" msgstr "Software as a Service" @@ -184,11 +184,11 @@ msgstr "" "Els socis/ies poden gestionar els seus usuaris de Nextcloud en aquesta " "secció." -#: saas/views.py:52 +#: saas/views.py:56 msgid "Community WordPress" msgstr "WordPress comunitari" -#: saas/views.py:53 +#: saas/views.py:57 msgid "" "Pangea's multisite WordPress service. Members can have their WordPress on " "this community WordPress hosted and maintained by Pangea." @@ -292,12 +292,17 @@ msgid "Save" msgstr "Desar" #: templates/musician/address_list.html:7 -#, fuzzy -#| msgid "Filtering" msgid "Filter by domain" -msgstr "Filtrat" +msgstr "Filtrat per domini" #: templates/musician/address_list.html:10 +#: templates/musician/database_list.html:15 +#: templates/musician/mailinglist_list.html:18 +#: templates/musician/saas_nextcloud_list.html:15 +#: templates/musician/saas_wordpress_list.html:15 +#: templates/musician/webapps/webapp_list.html:19 +#: templates/musician/webapps/webappuser_list.html:12 +#: templates/musician/websites/website_list.html:15 msgid "Search" msgstr "" @@ -307,7 +312,7 @@ msgstr "Domini" #. Translators: This message appears on the page title #: templates/musician/address_list.html:27 templates/musician/mail_base.html:22 -#: views.py:485 +#: views.py:484 msgid "Mailboxes" msgstr "Bústies de correu" @@ -329,7 +334,7 @@ msgstr "Perfil" #. Translators: This message appears on the page title #: templates/musician/base.html:71 templates/musician/billing.html:6 -#: views.py:357 +#: views.py:356 msgid "Billing" msgstr "Factures" @@ -353,12 +358,12 @@ msgstr "Número" msgid "Bill date" msgstr "Data de la factura" -#: templates/musician/billing.html:21 templates/musician/database_list.html:22 +#: templates/musician/billing.html:21 templates/musician/database_list.html:32 #: templates/musician/domain_detail.html:38 #: templates/musician/webapps/webapp_detail.html:17 #: templates/musician/webapps/webapp_detail.html:96 -#: templates/musician/webapps/webapp_list.html:26 -#: templates/musician/websites/website_list.html:72 +#: templates/musician/webapps/webapp_list.html:36 +#: templates/musician/websites/website_list.html:82 msgid "Type" msgstr "Tipus" @@ -391,39 +396,44 @@ msgstr "L'espai en disc dels recursos es va actualitzant setmanalment." msgid "Show history" msgstr "Mostrar historial" -#: templates/musician/database_list.html:21 +#: templates/musician/database_list.html:13 +#: templates/musician/database_list.html:31 #: templates/musician/mailbox_list.html:30 -#: templates/musician/mailinglist_list.html:24 +#: templates/musician/mailinglist_list.html:16 +#: templates/musician/mailinglist_list.html:34 #: templates/musician/saas_list.html:19 #: templates/musician/saas_nextcloud_list.html:13 +#: templates/musician/saas_nextcloud_list.html:23 #: templates/musician/saas_wordpress_list.html:13 -#: templates/musician/webapps/webapp_list.html:25 +#: templates/musician/saas_wordpress_list.html:23 +#: templates/musician/webapps/webapp_list.html:17 +#: templates/musician/webapps/webapp_list.html:35 #: templates/musician/websites/website_detail.html:77 -#: templates/musician/websites/website_list.html:20 +#: templates/musician/websites/website_list.html:30 msgid "Name" msgstr "Nom" -#: templates/musician/database_list.html:23 +#: templates/musician/database_list.html:33 msgid "Database users" msgstr "Usuaris Base de dades" -#: templates/musician/database_list.html:24 -#: templates/musician/domain_list.html:71 -#: templates/musician/saas_nextcloud_list.html:16 +#: templates/musician/database_list.html:34 +#: templates/musician/domain_list.html:69 +#: templates/musician/saas_nextcloud_list.html:26 msgid "Disk usage" msgstr "Ús del disc" -#: templates/musician/database_list.html:33 -#: templates/musician/database_list.html:35 +#: templates/musician/database_list.html:43 +#: templates/musician/database_list.html:45 msgid "Open database manager" msgstr "Obre el gestor de bases de dades" #. Translators: database page when there isn't any database. #. Translators: saas page when there isn't any saas. -#: templates/musician/database_list.html:58 +#: templates/musician/database_list.html:68 #: templates/musician/saas_list.html:60 -#: templates/musician/saas_nextcloud_list.html:60 -#: templates/musician/saas_wordpress_list.html:48 +#: templates/musician/saas_nextcloud_list.html:70 +#: templates/musician/saas_wordpress_list.html:58 msgid "Ooops! Looks like there is nothing here!" msgstr "Mmmh, sembla que aquí no hi ha res!" @@ -488,56 +498,56 @@ msgstr "SubDominis" msgid "Any related subdomain." msgstr "Qualsevol subdomini relacionat." -#: templates/musician/domain_list.html:7 +#: templates/musician/domain_list.html:6 msgid "Your domains" msgstr "Els teus dominis i llocs web" -#: templates/musician/domain_list.html:20 -#: templates/musician/domain_list.html:117 +#: templates/musician/domain_list.html:18 +#: templates/musician/domain_list.html:115 msgid "View DNS records" msgstr "Veure registres DNS" -#: templates/musician/domain_list.html:24 +#: templates/musician/domain_list.html:22 msgid "view configuration" msgstr "veure la configuració" -#: templates/musician/domain_list.html:31 +#: templates/musician/domain_list.html:29 msgid "Expiration date" msgstr "Data de venciment" -#: templates/musician/domain_list.html:38 +#: templates/musician/domain_list.html:36 msgid "Mail" msgstr "Correu" -#: templates/musician/domain_list.html:41 +#: templates/musician/domain_list.html:39 msgid "mail addresses created" msgstr "adreces de correu creades" -#: templates/musician/domain_list.html:46 +#: templates/musician/domain_list.html:44 msgid "Mail list" msgstr "Llista de correu" -#: templates/musician/domain_list.html:53 +#: templates/musician/domain_list.html:51 msgid "Nothing installed" msgstr "No tens res instal·lat" -#: templates/musician/domain_list.html:57 +#: templates/musician/domain_list.html:55 msgid "Website" msgstr "" -#: templates/musician/domain_list.html:60 +#: templates/musician/domain_list.html:58 msgid "assigned website" msgstr "website assignat" -#: templates/musician/domain_list.html:89 +#: templates/musician/domain_list.html:87 msgid "Configuration details" msgstr "Detalls de configuració" -#: templates/musician/domain_list.html:96 +#: templates/musician/domain_list.html:94 msgid "FTP access:" msgstr "Accés FTP:" -#: templates/musician/domain_list.html:99 +#: templates/musician/domain_list.html:97 #, fuzzy, python-format #| msgid "" #| "Send an email to %(support_email)s%(support_email)s " "indicant el teu nom d’usuari/a i t’explicarem què fer." -#: templates/musician/domain_list.html:109 +#: templates/musician/domain_list.html:107 msgid "No website configured." msgstr "No hi ha cap web configurada." -#: templates/musician/domain_list.html:111 +#: templates/musician/domain_list.html:109 msgid "Root directory:" msgstr "Directori arrel:" -#: templates/musician/domain_list.html:112 +#: templates/musician/domain_list.html:110 msgid "Type:" msgstr "Tipus:" @@ -621,9 +631,9 @@ msgstr "Filtrat" #: templates/musician/systemuser_list.html:32 #: templates/musician/webapps/webapp_detail.html:33 #: templates/musician/webapps/webapp_detail.html:41 -#: templates/musician/webapps/webappuser_list.html:30 -#: templates/musician/websites/website_list.html:86 -#: templates/musician/websites/website_list.html:93 +#: templates/musician/webapps/webappuser_list.html:41 +#: templates/musician/websites/website_list.html:96 +#: templates/musician/websites/website_list.html:103 msgid "Update password" msgstr "Actualitza la contrasenya" @@ -643,35 +653,35 @@ msgstr "Actualitzar llista" msgid "Create list" msgstr "Crear llista" -#: templates/musician/mailinglist_list.html:25 +#: templates/musician/mailinglist_list.html:35 #: templates/musician/saas_list.html:20 -#: templates/musician/saas_nextcloud_list.html:14 -#: templates/musician/saas_wordpress_list.html:14 -#: templates/musician/websites/website_list.html:23 +#: templates/musician/saas_nextcloud_list.html:24 +#: templates/musician/saas_wordpress_list.html:24 +#: templates/musician/websites/website_list.html:33 msgid "Status" msgstr "Estat" -#: templates/musician/mailinglist_list.html:26 +#: templates/musician/mailinglist_list.html:36 msgid "Address" msgstr "Direcció de correu" -#: templates/musician/mailinglist_list.html:27 +#: templates/musician/mailinglist_list.html:37 msgid "Admin email" msgstr "Administrador" -#: templates/musician/mailinglist_list.html:28 +#: templates/musician/mailinglist_list.html:38 msgid "Configure" msgstr "Configura" -#: templates/musician/mailinglist_list.html:37 +#: templates/musician/mailinglist_list.html:47 msgid "Active" msgstr "Actiu" -#: templates/musician/mailinglist_list.html:39 +#: templates/musician/mailinglist_list.html:49 msgid "Inactive" msgstr "Inactiu" -#: templates/musician/mailinglist_list.html:61 +#: templates/musician/mailinglist_list.html:71 msgid "New list" msgstr "Nova llista" @@ -718,8 +728,8 @@ msgid "Are you sure that you want remove the SaaS:" msgstr "Estàs segur/a que vols esborrar la següent llista:" #: templates/musician/saas_list.html:21 -#: templates/musician/saas_nextcloud_list.html:15 -#: templates/musician/saas_wordpress_list.html:15 +#: templates/musician/saas_nextcloud_list.html:25 +#: templates/musician/saas_wordpress_list.html:25 msgid "Service" msgstr "Servei" @@ -728,16 +738,16 @@ msgid "Service info" msgstr "Informació del servei" #: templates/musician/saas_list.html:31 -#: templates/musician/saas_nextcloud_list.html:25 -#: templates/musician/saas_wordpress_list.html:24 +#: templates/musician/saas_nextcloud_list.html:35 +#: templates/musician/saas_wordpress_list.html:34 msgid "Installed on" msgstr "Instal·lat a" #: templates/musician/saas_list.html:38 templates/musician/saas_list.html:40 -#: templates/musician/saas_nextcloud_list.html:32 -#: templates/musician/saas_nextcloud_list.html:34 -#: templates/musician/saas_wordpress_list.html:31 -#: templates/musician/saas_wordpress_list.html:33 +#: templates/musician/saas_nextcloud_list.html:42 +#: templates/musician/saas_nextcloud_list.html:44 +#: templates/musician/saas_wordpress_list.html:41 +#: templates/musician/saas_wordpress_list.html:43 msgid "Open service admin panel" msgstr "Obre el panell d’administració del servei" @@ -763,7 +773,7 @@ msgstr "" "Has assolit el límit d'usuaris Nextcloud de la teva subscripció, els nous " "usuaris poden implicar costos addicionals." -#: templates/musician/saas_nextcloud_list.html:69 +#: templates/musician/saas_nextcloud_list.html:79 msgid "New user" msgstr "Nou usuari" @@ -783,13 +793,13 @@ msgstr "" "Aquest usuari només té permisos d'escriptura en el seu propi directori." #: templates/musician/systemuser_list.html:18 -#: templates/musician/webapps/webappuser_list.html:15 +#: templates/musician/webapps/webappuser_list.html:26 msgid "Username" msgstr "Nom d’usuari/a" #: templates/musician/systemuser_list.html:19 #: templates/musician/webapps/webapp_detail.html:47 -#: templates/musician/webapps/webappuser_list.html:16 +#: templates/musician/webapps/webappuser_list.html:27 #: templates/musician/websites/website_detail.html:49 msgid "Path" msgstr "Ruta" @@ -807,15 +817,15 @@ msgid "WebApp Options for" msgstr "Opcions WebApp per" #: templates/musician/webapps/webapp_detail.html:13 -#: templates/musician/webapps/webapp_list.html:29 -#: templates/musician/webapps/webappuser_list.html:17 +#: templates/musician/webapps/webapp_list.html:39 +#: templates/musician/webapps/webappuser_list.html:28 #: templates/musician/websites/website_detail.html:13 -#: templates/musician/websites/website_list.html:22 +#: templates/musician/websites/website_list.html:32 msgid "Server" msgstr "Servidor" #: templates/musician/webapps/webapp_detail.html:27 -#: templates/musician/websites/website_list.html:82 +#: templates/musician/websites/website_list.html:92 msgid "SFTP user" msgstr "Usuari SFTP" @@ -862,11 +872,11 @@ msgstr "" msgid "Add new option" msgstr "Afegir nova Opcio" -#: templates/musician/webapps/webapp_list.html:27 +#: templates/musician/webapps/webapp_list.html:37 msgid "Version" msgstr "" -#: templates/musician/webapps/webapp_list.html:28 +#: templates/musician/webapps/webapp_list.html:38 msgid "SFTP User" msgstr "Usuari SFTP" @@ -884,6 +894,12 @@ msgstr "Afegir Opcio a" msgid "Are you sure that you want remove the following option?" msgstr "Estàs segur/a que vols esborrar la següent opció?" +#: templates/musician/webapps/webappuser_list.html:10 +#, fuzzy +#| msgid "Users" +msgid "User" +msgstr "Usuaris" + #: templates/musician/websites/website_detail.html:7 msgid "WebSite Options for" msgstr "Opcions de WebSite per" @@ -938,11 +954,15 @@ msgstr "Afegir nova directiva" msgid "Update Option of Website" msgstr "Actualitzar Opció de WebSite" -#: templates/musician/websites/website_list.html:21 +#: templates/musician/websites/website_list.html:13 +msgid "Filter by Name or Domain" +msgstr "Filtrat per Nom o Domini" + +#: templates/musician/websites/website_list.html:31 msgid "Url" msgstr "" -#: templates/musician/websites/website_list.html:89 +#: templates/musician/websites/website_list.html:99 #, fuzzy #| msgid "SFTP user" msgid "FTP user" @@ -966,32 +986,32 @@ msgid "Account" msgstr "Compte" #. Translators: This message appears on the page title -#: views.py:284 +#: views.py:283 msgid "User profile" msgstr "El teu perfil" #. Translators: This message appears on the page title -#: views.py:371 +#: views.py:370 msgid "Download bill" msgstr "Descarrega la factura" #. Translators: This message appears on the page title -#: views.py:620 +#: views.py:623 msgid "Domain details" msgstr "Detalls del domini" #. Translators: This message appears on the page title -#: views.py:676 +#: views.py:679 msgid "Login" msgstr "Accés" #. Translators: This message appears on the page title -#: views.py:747 +#: views.py:750 msgid "Webapp users" msgstr "" #. Translators: This message appears on the page title -#: views.py:765 +#: views.py:775 msgid "Main users" msgstr "Usuari principal" @@ -999,7 +1019,7 @@ msgstr "Usuari principal" msgid "This option already exist." msgstr "Aquesta opcio ja existeix" -#: webapps/views.py:34 +#: webapps/views.py:38 msgid "" "A web app is the directory where your website is stored. Through SFTP, you " "can access this directory and upload/edit/delete files." @@ -1007,7 +1027,7 @@ msgstr "" "Una WebApp és el directori on es desa el teu WebSite. A través de SFTP, pots " "accedir a aquest directori i pujar, editar o eliminar fitxers." -#: webapps/views.py:35 +#: webapps/views.py:39 msgid "" "Each Webapp has its own SFTP user, which is created automatically when the " "Webapp is created." @@ -1016,7 +1036,7 @@ msgstr "" "crea l'aplicació web." #. Translators: This message appears on the page title -#: webapps/views.py:44 +#: webapps/views.py:48 #, fuzzy #| msgid "Type details" msgid "webapp details" @@ -1033,7 +1053,7 @@ msgstr "" msgid "This Path already exists on this Website." msgstr "Aquesta ruta ja existeix en aquest" -#: websites/views.py:33 +#: websites/views.py:38 msgid "" "A website is the place where a domain is associated with the directory where " "the web files are located. (WebApp)" @@ -1042,7 +1062,7 @@ msgstr "" "troben els fitxers web. (Aplicació web)" #. Translators: This message appears on the page title -#: websites/views.py:42 +#: websites/views.py:47 #, fuzzy #| msgid "Type details" msgid "website details" diff --git a/orchestra/contrib/musician/locale/es/LC_MESSAGES/django.mo b/orchestra/contrib/musician/locale/es/LC_MESSAGES/django.mo index 7356ca5da787c0353bc2ed79aa5abadb78ed34e6..ff29ea9a8d88384b225826867cb294e844ba2607 100644 GIT binary patch delta 3995 zcmY+{32;qU0LJn2EFnT75m}Jtkw`)!h+2}iNs%bAR)Q9xmLOykG*s(_P+O={`%Wbk zMQEp;V%nK%2UF8QTeQ^{HA8hlnd)Nt|K2?&?H%9yoqO(m_nz(E7rRUM%=BCisR}sx`D>5z+9Y%_pumf1sPKhZ=w(0 z!AAH1ImOg#VvN5o9qtrN9O{Iwn2H&w3(QAftU$GC4GzK`7=m}P2Q~=iyV&2l0OQ#| zhKYCsIn{(Ub*`6y_0+X46m%dJ!*MXG#ra5Q%{1hnDd&U1G3&7*Zbf}>AM($9$cGyG zCDzC9Q4PLfy@w2%anb6>FbI7$v>hoh6y^z4U?!>o+1Lt4U@XqT1gyl?cn;g(18jg% zq0aXbQP=B?8o_i_gZrUI_<791iRjUR6BN|5v-mh(K=r&)nA3v@DiSUBUap&G}y>%@H2+|NSQzlXZ;M;L`aqedpM znRBBsRKwj^2V+n@k4H5y1-&C+_xqvlGZZxvLMdt}=VCHepf3CgszIl% z=TRf^EozQ`vGsqVZd|*$v&tKxrZ5uKfgW~$0%}ASdno8}*oNv^HOArlsG+@rjF$NW z-5AI-svabv7Ev0O<0w=Eub{s76RIJu2&V&nsKweCH6qcd^F0X^G}oO`U&ug>z(Bh{ z95n*tt$C;$7NQz_2X(;*sD`;{l`ia$+7CrFC>m*#NkM&Y7;+zv8AU;JmWQ9=OpL`| zkED+)D&f+MsNgbs-|1ZFhI|L1qC%=6Y2|l zQ7u1;>d8seh0j_qpw7FDG59O$ypWbW(-?^w>Llcl>4m!9M9jzOI01i9J@+@gSs@yd zA*c(FL`_8j*2YrQVwsJas+Fi4?Xdgrpxeb`jFr@1XQlOJe_6CKPqBZoH47X=Y3(Uo zjGHiy))EsWK9zr$XQ|yD6khiOeZsVMnjC#BVVqeTb zI&1b|7M?~mEV3=*pQaPq^7g~csJXp}x?o7WGnDaIpZzpcLwchwILg+S+4{xE@-bUc z9XgJh+7tHpdDI%ZiN07jf$>)%Ai-Jn;poSHG^*zvkkK=}Q6o}_nu;>ih1a5PREaZi zKX$~ZcFv+5f|=~EL%mtAVj~Pobe@_R4+Zr!5!J(0caE)Jh#Kjg*bqJ6QBV(Vp@#M@Mxt*AekiaFst4t$3!OoI z@hj|x*HGV&pxfGyMonQ3s(u5i$J_1x0qeWS{XFIvg#b=ChmG+n2IB9w-Y3ba4?(?X zVo}H2qk7&Q``}R24Yy$ftU`@QHEPa}qo(d6szJY@ub%&h6oROz-^uwyp*ePCKNFcQ zGY>T)2T?DQ&ruDzfjl_oHo7sK3D)^3$dhO$p{~0WwT8Cfa{L(8u&mCkG45|hQ&2@I z>Q!5g>fs{v4k2ohZnyP&QB!aX)ss_p{{rg!KcX6V6LrHosHvOV#c>JpLuyu`$DhJ} z3cBG@Y>H>F1ztlnz{PN=f%Q@62je#wh4H9~=bd8`a4-(SP~3@W_yOt-`WLE!E`D02 zPcq}L1AbHlV<1Lg3~EiJqt-+=hG8zM0dp`Mm!U?c3Y*{|R8LQ!u6qX6vGW*>*X?n? z6sLi~DU81^oIr&eGf+32fJ?9x7hx@)nQ&Z+8j)S7^Y)=e<`}9+Cs7?ZV~^iLjp#qt zCOjH0_O)%$hvr{f2NFZLpE*EQlefrtqHQC2on#XYbt#!lv=xyIQcUz#+($~tqfHHr zB$^tnn^j~ei6fpKd}v$Y;Qe9PPFcO3O6J>oagZbuEv`bMA14j_O0u3DCfXJf4gUx- zfVjzGl1nBKZR5z+NB!3-*4Eg;`{G$j`8C4g{okhH)SPO2hV&w7WH@<=Jle+C!Vs(` zGs#%8fN0Y@W01z5MQjd{Z6uXw?W=@^>HW_|1KdpZ6K(BCfVWih(Tw7nnqBiI<=u9_44)%a zcK;D=Dd?v;#8&J;UN7oDe;AN{q&Inygp!e@IhjS0h|WAh^muI{Pm^in6|#gBka9AI zWD#u@5oB#<`0*VL(yA*b+|FnR$hIMcz|O#(0l$ MuBs0Iow%>zzX^zc^#A|> delta 3879 zcmZA2d2o$a7{~D^1WANQ2uXxQNRW_F)euo?tI*iD6s7j9woszD5ld_(wl;`TJF)wx zri*IPsZMmH`iG9HE{5sU6xEDs&Gh@b@5xN3XY$<7dCz_CdCz&yc~6ckJiNenD)jBBFLFa8R0pFl7$=~{G!qBlBCL;JVK@8<(=oB0=V(mf zdK;$V1>_ccfa)(WQvEZv+EnyKeT>Fr)QEc^leNCcpN-^$)m=AS) z0)y}a)POHI%aCN*4Q!0RVz5#h%rr=a)kSrXfEqw6Ou%;79EV{mT#AWUiY@UPhTz|* z-&Jqm^;Zj(!C2IQo1vDVEsn-6=+hUwsAy(K@p(Ljn)w~n4E{t7EFj98X-!mWo1h+$ z?Hr2gZ!|I%n}$7b8TP@;sLX_uX5AMPP5!mk&1ujVlTaPc!lt+rHKX&W2VF)D^eP78 zbyVhVpayskb>Aa*{S@_}z!-1l;i%uoq3%zNA^%EU8VwyW1J&_7)PVAw1*o-KhssEa zYd?(Y=rn3qe~4PLGSmbfxa)ciy^N%z?(2t|*jOKx7E~r9`@xEkEZISf$MdKe+(vDh z`?wrKc~>>SBGm7;qXu#kHGy-e&G`u`Bju?3ze6qU!-e^5~dp1FpgMqURI&IYIl z#-c{N2i4&r)WA-nI{wIAUqTJ29O=^Tp?+75(d#*(s3mKFWjb1ts5GbHF}B3mIPZP# zg=EjxU?%QIt=*5P8Qyi*zd0YFmgos8gTe9MQYAQ3Q8Uj#4WJL!(fgl6MKhU(n#lsx zgYuoLP#v$wB;19%?;>(`Ss5zTw~;@4%!m4mY+^P86L1o4M739-GE$X|QitbT2oNxP4U`OQSIr-wy|u~L}sAYHrIV$ zfZ9XF7>s9~A7cpDU!;)#npDbZ(9CZkS+fdMMq*oeOOcA|xF_mCLvTKh#I|@1yJ6MV z-bvRBb&_sEW#%&0!0V`q-b79Cp^u8z_$g}UA*p6lu`#NBHLATB)9@JjJ3tNmA*!Qi z$kAZcxk;%_z)*Y*HQ?!}jLpS3T#Y&CJ4~eyl`3t#j=p2?z#eXa8+sVO|S-5=lK>*MI()OUnHZJAQLr{ zEO$K|)xiYR0H>lJI0v-{>;=zYGwp$TU^Z%IgOS6}Cc5v}q6WAH)o&@r<3-f-?%-Oi=t%xo zQ(2bbJurlKN1Ln}>c$jQW-?JT>y4U0w)=iMDy55^n=ydvctT|e!Lw{H@iw93U4^aS zKN-Wc{@PS3I>}VDwhIZ8;C~nxo7I0}ZN~Qq&Kp}#@KV@#LS+k~WA>;nD6@$L#1djZ zv5q)FsJuh4f6dpGkIJ%$$_PS((gu8$_;R!9 zev_C=WDu2QfTr4=D{ZEJu5~f$L{yni#2P|n6fwbH^Iln3_4A6m z$i`_zH)5k}3s sB}$0e#BO34v5!z`p<%b7(!_sh_BsZhZ4?#}d^RWQpZaH4q#X$T7hnurEl nombre de usuario y la contraseña se " "enviarán a esta dirección de correo electrónico." -#: saas/forms.py:90 saas/forms.py:124 +#: saas/forms.py:90 saas/forms.py:125 #, python-format msgid "Suggestion: %s" msgstr "Sugerencia: %s" #. Translators: This message appears on the page title -#: saas/views.py:28 saas/views.py:51 templates/musician/domain_list.html:51 +#: saas/views.py:28 saas/views.py:55 templates/musician/domain_list.html:49 msgid "Software as a Service" msgstr "Software as a Service" @@ -185,11 +185,11 @@ msgid "Members can manage their Nextcloud users in this section." msgstr "" "Los miembros pueden gestionar sus usuarios de Nextcloud en esta sección." -#: saas/views.py:52 +#: saas/views.py:56 msgid "Community WordPress" msgstr "WordPress Comunitario" -#: saas/views.py:53 +#: saas/views.py:57 msgid "" "Pangea's multisite WordPress service. Members can have their WordPress on " "this community WordPress hosted and maintained by Pangea." @@ -294,12 +294,17 @@ msgid "Save" msgstr "Guardar" #: templates/musician/address_list.html:7 -#, fuzzy -#| msgid "Filtering" msgid "Filter by domain" -msgstr "Filtrado" +msgstr "Filtra por dominio" #: templates/musician/address_list.html:10 +#: templates/musician/database_list.html:15 +#: templates/musician/mailinglist_list.html:18 +#: templates/musician/saas_nextcloud_list.html:15 +#: templates/musician/saas_wordpress_list.html:15 +#: templates/musician/webapps/webapp_list.html:19 +#: templates/musician/webapps/webappuser_list.html:12 +#: templates/musician/websites/website_list.html:15 msgid "Search" msgstr "" @@ -309,7 +314,7 @@ msgstr "Dominio" #. Translators: This message appears on the page title #: templates/musician/address_list.html:27 templates/musician/mail_base.html:22 -#: views.py:485 +#: views.py:484 msgid "Mailboxes" msgstr "Buzones de correo" @@ -331,7 +336,7 @@ msgstr "Perfil" #. Translators: This message appears on the page title #: templates/musician/base.html:71 templates/musician/billing.html:6 -#: views.py:357 +#: views.py:356 msgid "Billing" msgstr "Facturas" @@ -355,12 +360,12 @@ msgstr "Número" msgid "Bill date" msgstr "Fecha de la factura" -#: templates/musician/billing.html:21 templates/musician/database_list.html:22 +#: templates/musician/billing.html:21 templates/musician/database_list.html:32 #: templates/musician/domain_detail.html:38 #: templates/musician/webapps/webapp_detail.html:17 #: templates/musician/webapps/webapp_detail.html:96 -#: templates/musician/webapps/webapp_list.html:26 -#: templates/musician/websites/website_list.html:72 +#: templates/musician/webapps/webapp_list.html:36 +#: templates/musician/websites/website_list.html:82 msgid "Type" msgstr "Tipo" @@ -393,39 +398,44 @@ msgstr "El espacio en disco de los recursos se actualiza semanalmente" msgid "Show history" msgstr "Mostrar historial" -#: templates/musician/database_list.html:21 +#: templates/musician/database_list.html:13 +#: templates/musician/database_list.html:31 #: templates/musician/mailbox_list.html:30 -#: templates/musician/mailinglist_list.html:24 +#: templates/musician/mailinglist_list.html:16 +#: templates/musician/mailinglist_list.html:34 #: templates/musician/saas_list.html:19 #: templates/musician/saas_nextcloud_list.html:13 +#: templates/musician/saas_nextcloud_list.html:23 #: templates/musician/saas_wordpress_list.html:13 -#: templates/musician/webapps/webapp_list.html:25 +#: templates/musician/saas_wordpress_list.html:23 +#: templates/musician/webapps/webapp_list.html:17 +#: templates/musician/webapps/webapp_list.html:35 #: templates/musician/websites/website_detail.html:77 -#: templates/musician/websites/website_list.html:20 +#: templates/musician/websites/website_list.html:30 msgid "Name" msgstr "Nombre" -#: templates/musician/database_list.html:23 +#: templates/musician/database_list.html:33 msgid "Database users" msgstr "Usuarios Base de datos" -#: templates/musician/database_list.html:24 -#: templates/musician/domain_list.html:71 -#: templates/musician/saas_nextcloud_list.html:16 +#: templates/musician/database_list.html:34 +#: templates/musician/domain_list.html:69 +#: templates/musician/saas_nextcloud_list.html:26 msgid "Disk usage" msgstr "Uso del disco" -#: templates/musician/database_list.html:33 -#: templates/musician/database_list.html:35 +#: templates/musician/database_list.html:43 +#: templates/musician/database_list.html:45 msgid "Open database manager" msgstr "Abre el gestor de bases de datos" #. Translators: database page when there isn't any database. #. Translators: saas page when there isn't any saas. -#: templates/musician/database_list.html:58 +#: templates/musician/database_list.html:68 #: templates/musician/saas_list.html:60 -#: templates/musician/saas_nextcloud_list.html:60 -#: templates/musician/saas_wordpress_list.html:48 +#: templates/musician/saas_nextcloud_list.html:70 +#: templates/musician/saas_wordpress_list.html:58 msgid "Ooops! Looks like there is nothing here!" msgstr "Mmmh… ¡parece que aquí no hay nada!" @@ -491,56 +501,56 @@ msgstr "SubDominios" msgid "Any related subdomain." msgstr "Cualquier subdominio relacionado." -#: templates/musician/domain_list.html:7 +#: templates/musician/domain_list.html:6 msgid "Your domains" msgstr "Tus dominios y sitios web" -#: templates/musician/domain_list.html:20 -#: templates/musician/domain_list.html:117 +#: templates/musician/domain_list.html:18 +#: templates/musician/domain_list.html:115 msgid "View DNS records" msgstr "Ver registros DNS" -#: templates/musician/domain_list.html:24 +#: templates/musician/domain_list.html:22 msgid "view configuration" msgstr "ver la configuración" -#: templates/musician/domain_list.html:31 +#: templates/musician/domain_list.html:29 msgid "Expiration date" msgstr "Fecha de vencimiento" -#: templates/musician/domain_list.html:38 +#: templates/musician/domain_list.html:36 msgid "Mail" msgstr "Correo" -#: templates/musician/domain_list.html:41 +#: templates/musician/domain_list.html:39 msgid "mail addresses created" msgstr "direcciones de correo creadas" -#: templates/musician/domain_list.html:46 +#: templates/musician/domain_list.html:44 msgid "Mail list" msgstr "Lista de correo" -#: templates/musician/domain_list.html:53 +#: templates/musician/domain_list.html:51 msgid "Nothing installed" msgstr "No tienes nada instalado" -#: templates/musician/domain_list.html:57 +#: templates/musician/domain_list.html:55 msgid "Website" msgstr "" -#: templates/musician/domain_list.html:60 +#: templates/musician/domain_list.html:58 msgid "assigned website" msgstr "website asignado" -#: templates/musician/domain_list.html:89 +#: templates/musician/domain_list.html:87 msgid "Configuration details" msgstr "Detalles de configuración" -#: templates/musician/domain_list.html:96 +#: templates/musician/domain_list.html:94 msgid "FTP access:" msgstr "Acceso FTP:" -#: templates/musician/domain_list.html:99 +#: templates/musician/domain_list.html:97 #, fuzzy, python-format #| msgid "" #| "Send an email to %(support_email)s%(support_email)s " "indicando tu nombre de usuaria/o y te explicaremos qué hacer." -#: templates/musician/domain_list.html:109 +#: templates/musician/domain_list.html:107 msgid "No website configured." msgstr "No hay ninguna web configurada." -#: templates/musician/domain_list.html:111 +#: templates/musician/domain_list.html:109 msgid "Root directory:" msgstr "Directorio raíz:" -#: templates/musician/domain_list.html:112 +#: templates/musician/domain_list.html:110 msgid "Type:" msgstr "Tipo:" @@ -624,9 +634,9 @@ msgstr "Filtrado" #: templates/musician/systemuser_list.html:32 #: templates/musician/webapps/webapp_detail.html:33 #: templates/musician/webapps/webapp_detail.html:41 -#: templates/musician/webapps/webappuser_list.html:30 -#: templates/musician/websites/website_list.html:86 -#: templates/musician/websites/website_list.html:93 +#: templates/musician/webapps/webappuser_list.html:41 +#: templates/musician/websites/website_list.html:96 +#: templates/musician/websites/website_list.html:103 msgid "Update password" msgstr "Actualiza la contraseña" @@ -646,35 +656,35 @@ msgstr "Actualizar lista" msgid "Create list" msgstr "Crear lista" -#: templates/musician/mailinglist_list.html:25 +#: templates/musician/mailinglist_list.html:35 #: templates/musician/saas_list.html:20 -#: templates/musician/saas_nextcloud_list.html:14 -#: templates/musician/saas_wordpress_list.html:14 -#: templates/musician/websites/website_list.html:23 +#: templates/musician/saas_nextcloud_list.html:24 +#: templates/musician/saas_wordpress_list.html:24 +#: templates/musician/websites/website_list.html:33 msgid "Status" msgstr "Estado" -#: templates/musician/mailinglist_list.html:26 +#: templates/musician/mailinglist_list.html:36 msgid "Address" msgstr "Dirección de correo" -#: templates/musician/mailinglist_list.html:27 +#: templates/musician/mailinglist_list.html:37 msgid "Admin email" msgstr "Administrador" -#: templates/musician/mailinglist_list.html:28 +#: templates/musician/mailinglist_list.html:38 msgid "Configure" msgstr "Configura" -#: templates/musician/mailinglist_list.html:37 +#: templates/musician/mailinglist_list.html:47 msgid "Active" msgstr "Activo" -#: templates/musician/mailinglist_list.html:39 +#: templates/musician/mailinglist_list.html:49 msgid "Inactive" msgstr "Inactivo" -#: templates/musician/mailinglist_list.html:61 +#: templates/musician/mailinglist_list.html:71 msgid "New list" msgstr "Nueva Lista" @@ -723,8 +733,8 @@ msgid "Are you sure that you want remove the SaaS:" msgstr "¿Estás seguro/a de que quieres borrar la siguiente lista:" #: templates/musician/saas_list.html:21 -#: templates/musician/saas_nextcloud_list.html:15 -#: templates/musician/saas_wordpress_list.html:15 +#: templates/musician/saas_nextcloud_list.html:25 +#: templates/musician/saas_wordpress_list.html:25 msgid "Service" msgstr "Servicio" @@ -733,16 +743,16 @@ msgid "Service info" msgstr "Información del servicio" #: templates/musician/saas_list.html:31 -#: templates/musician/saas_nextcloud_list.html:25 -#: templates/musician/saas_wordpress_list.html:24 +#: templates/musician/saas_nextcloud_list.html:35 +#: templates/musician/saas_wordpress_list.html:34 msgid "Installed on" msgstr "Instalado en" #: templates/musician/saas_list.html:38 templates/musician/saas_list.html:40 -#: templates/musician/saas_nextcloud_list.html:32 -#: templates/musician/saas_nextcloud_list.html:34 -#: templates/musician/saas_wordpress_list.html:31 -#: templates/musician/saas_wordpress_list.html:33 +#: templates/musician/saas_nextcloud_list.html:42 +#: templates/musician/saas_nextcloud_list.html:44 +#: templates/musician/saas_wordpress_list.html:41 +#: templates/musician/saas_wordpress_list.html:43 msgid "Open service admin panel" msgstr "Abre el panel de administración del servicio" @@ -768,7 +778,7 @@ msgstr "" "Has alcanzado el límite de usuarios Nextcloud de tu suscripción, los nuevos " "usuarios pueden suponer costes adicionales." -#: templates/musician/saas_nextcloud_list.html:69 +#: templates/musician/saas_nextcloud_list.html:79 msgid "New user" msgstr "Nuevo usuario" @@ -787,13 +797,13 @@ msgid "This user only has write permissions in their own directory." msgstr "Este usuario solo tiene permisos de escritura en su directorio." #: templates/musician/systemuser_list.html:18 -#: templates/musician/webapps/webappuser_list.html:15 +#: templates/musician/webapps/webappuser_list.html:26 msgid "Username" msgstr "Nombre de usuario/a" #: templates/musician/systemuser_list.html:19 #: templates/musician/webapps/webapp_detail.html:47 -#: templates/musician/webapps/webappuser_list.html:16 +#: templates/musician/webapps/webappuser_list.html:27 #: templates/musician/websites/website_detail.html:49 msgid "Path" msgstr "Ruta" @@ -811,15 +821,15 @@ msgid "WebApp Options for" msgstr "Opciones de WebApp para" #: templates/musician/webapps/webapp_detail.html:13 -#: templates/musician/webapps/webapp_list.html:29 -#: templates/musician/webapps/webappuser_list.html:17 +#: templates/musician/webapps/webapp_list.html:39 +#: templates/musician/webapps/webappuser_list.html:28 #: templates/musician/websites/website_detail.html:13 -#: templates/musician/websites/website_list.html:22 +#: templates/musician/websites/website_list.html:32 msgid "Server" msgstr "Servidor" #: templates/musician/webapps/webapp_detail.html:27 -#: templates/musician/websites/website_list.html:82 +#: templates/musician/websites/website_list.html:92 msgid "SFTP user" msgstr "Usuario SFTP" @@ -868,11 +878,11 @@ msgstr "" msgid "Add new option" msgstr "Añadir nueva opción" -#: templates/musician/webapps/webapp_list.html:27 +#: templates/musician/webapps/webapp_list.html:37 msgid "Version" msgstr "" -#: templates/musician/webapps/webapp_list.html:28 +#: templates/musician/webapps/webapp_list.html:38 msgid "SFTP User" msgstr "Usuario SFTP" @@ -890,6 +900,12 @@ msgstr "Añadir Opción a" msgid "Are you sure that you want remove the following option?" msgstr "¿Estás seguro/a de que quieres borrar la siguiente opción?" +#: templates/musician/webapps/webappuser_list.html:10 +#, fuzzy +#| msgid "Users" +msgid "User" +msgstr "Usuarios" + #: templates/musician/websites/website_detail.html:7 msgid "WebSite Options for" msgstr "Opciones de Website para" @@ -944,11 +960,15 @@ msgstr "Añadir nueva directiva" msgid "Update Option of Website" msgstr "Actualizar Opción de WebSite" -#: templates/musician/websites/website_list.html:21 +#: templates/musician/websites/website_list.html:13 +msgid "Filter by Name or Domain" +msgstr "Filtra por Nombre o Dominio" + +#: templates/musician/websites/website_list.html:31 msgid "Url" msgstr "" -#: templates/musician/websites/website_list.html:89 +#: templates/musician/websites/website_list.html:99 #, fuzzy #| msgid "SFTP user" msgid "FTP user" @@ -972,32 +992,32 @@ msgid "Account" msgstr "Cuenta" #. Translators: This message appears on the page title -#: views.py:284 +#: views.py:283 msgid "User profile" msgstr "Tu perfil" #. Translators: This message appears on the page title -#: views.py:371 +#: views.py:370 msgid "Download bill" msgstr "Descarga la factura" #. Translators: This message appears on the page title -#: views.py:620 +#: views.py:623 msgid "Domain details" msgstr "Detalles del dominio" #. Translators: This message appears on the page title -#: views.py:676 +#: views.py:679 msgid "Login" msgstr "Accede" #. Translators: This message appears on the page title -#: views.py:747 +#: views.py:750 msgid "Webapp users" msgstr "" #. Translators: This message appears on the page title -#: views.py:765 +#: views.py:775 msgid "Main users" msgstr "Usuarios principales" @@ -1005,7 +1025,7 @@ msgstr "Usuarios principales" msgid "This option already exist." msgstr "Esta opción ya existe." -#: webapps/views.py:34 +#: webapps/views.py:38 msgid "" "A web app is the directory where your website is stored. Through SFTP, you " "can access this directory and upload/edit/delete files." @@ -1013,7 +1033,7 @@ msgstr "" "Una aplicación web es el directorio donde se almacena su sitio web. A través " "de SFTP, puede acceder a este directorio y subir, editar o eliminar archivos." -#: webapps/views.py:35 +#: webapps/views.py:39 msgid "" "Each Webapp has its own SFTP user, which is created automatically when the " "Webapp is created." @@ -1022,7 +1042,7 @@ msgstr "" "se crea la aplicación web." #. Translators: This message appears on the page title -#: webapps/views.py:44 +#: webapps/views.py:48 #, fuzzy #| msgid "Type details" msgid "webapp details" @@ -1039,7 +1059,7 @@ msgstr "" msgid "This Path already exists on this Website." msgstr "Esta ruta ya existe en este WebSite" -#: websites/views.py:33 +#: websites/views.py:38 msgid "" "A website is the place where a domain is associated with the directory where " "the web files are located. (WebApp)" @@ -1048,7 +1068,7 @@ msgstr "" "encuentran los archivos web. (WebApp)" #. Translators: This message appears on the page title -#: websites/views.py:42 +#: websites/views.py:47 msgid "website details" msgstr "Detalles de cada tipo" diff --git a/orchestra/contrib/musician/saas/forms.py b/orchestra/contrib/musician/saas/forms.py index d6ab5b76..fee281dc 100644 --- a/orchestra/contrib/musician/saas/forms.py +++ b/orchestra/contrib/musician/saas/forms.py @@ -140,4 +140,4 @@ class NextcloudCreateForm(forms.ModelForm): password = self.cleaned_data.get("password") self.fields['password'] = password self.instance.set_password(password) - + \ No newline at end of file diff --git a/orchestra/contrib/musician/saas/views.py b/orchestra/contrib/musician/saas/views.py index 768b397b..934b3d6d 100644 --- a/orchestra/contrib/musician/saas/views.py +++ b/orchestra/contrib/musician/saas/views.py @@ -17,7 +17,7 @@ from orchestra.contrib.musician.mixins import (CustomContextMixin, ExtendedPagin UserTokenRequiredMixin) from .forms import ( NextcloudChangePasswordForm, SaasNextcloudUpdateForm, - SaasWordpressUpdateForm, NextcloudCreateForm ) + SaasWordpressUpdateForm, NextcloudCreateForm) class SaasNextcloudListView(CustomContextMixin, UserTokenRequiredMixin, ListView): @@ -31,9 +31,13 @@ class SaasNextcloudListView(CustomContextMixin, UserTokenRequiredMixin, ListView } def get_queryset(self): - # return self.model.objects.filter(account=self.request.user, service='nextcloud') qs = self.model.objects.filter(account=self.request.user, service='nextcloud') disk_resource = Resource.objects.get(name='nextcloud-disk') + + name = self.request.GET.get('name') + if name: + qs = qs.filter(name__icontains=name) + for Nuser in qs: try: Nuser.usage = Nuser.resource_set.get(resource=disk_resource) @@ -41,7 +45,7 @@ class SaasNextcloudListView(CustomContextMixin, UserTokenRequiredMixin, ListView Nuser.usage = ResourceData(resource=disk_resource) Nuser.percent = get_bootstraped_percent_exact(Nuser.usage.used, Nuser.usage.allocated) return qs - + class SaasWordpressListView(CustomContextMixin, UserTokenRequiredMixin, ListView): model = SaaS @@ -54,7 +58,11 @@ class SaasWordpressListView(CustomContextMixin, UserTokenRequiredMixin, ListView } def get_queryset(self): - return self.model.objects.filter(account=self.request.user, service='wordpress') + qs = self.model.objects.filter(account=self.request.user, service='wordpress') + name = self.request.GET.get('name') + if name: + qs = qs.filter(name__icontains=name) + return qs class SaasWordpressUpdateView(CustomContextMixin, UserTokenRequiredMixin, UpdateView): diff --git a/orchestra/contrib/musician/templates/musician/database_list.html b/orchestra/contrib/musician/templates/musician/database_list.html index f250ff26..708bad7a 100644 --- a/orchestra/contrib/musician/templates/musician/database_list.html +++ b/orchestra/contrib/musician/templates/musician/database_list.html @@ -6,6 +6,16 @@

{{ service.verbose_name }}

{{ service.description }}

+
+
+
+ + +
+ +
+
+ {% if object_list %}
diff --git a/orchestra/contrib/musician/templates/musician/domain_list.html b/orchestra/contrib/musician/templates/musician/domain_list.html index 3fafb81c..afc0c77b 100644 --- a/orchestra/contrib/musician/templates/musician/domain_list.html +++ b/orchestra/contrib/musician/templates/musician/domain_list.html @@ -3,10 +3,8 @@ {% block content %} -

{% trans "Your domains" %}

- {% for domain in domains %}
diff --git a/orchestra/contrib/musician/templates/musician/mailinglist_list.html b/orchestra/contrib/musician/templates/musician/mailinglist_list.html index 3d3a5b18..09b7fa76 100644 --- a/orchestra/contrib/musician/templates/musician/mailinglist_list.html +++ b/orchestra/contrib/musician/templates/musician/mailinglist_list.html @@ -9,6 +9,16 @@

{{ service.verbose_name }}{% if active_domain %} {% trans "for" %} {{ active_domain.name }}{% endif %}

{{ service.description }}

+
+
+
+ + +
+ +
+
+