From 9e8d4fc753821f9d1cd6ab3b2a14e0fb93e1975a Mon Sep 17 00:00:00 2001 From: mpeltriaux Date: Thu, 20 Jan 2022 12:26:22 +0100 Subject: [PATCH] # 70 Tab title EMA * adds ema tab titles * adds/updates translations --- ema/views.py | 13 +++++++++- locale/de/LC_MESSAGES/django.mo | Bin 34517 -> 34615 bytes locale/de/LC_MESSAGES/django.po | 44 +++++++++++++++++--------------- 3 files changed, 36 insertions(+), 21 deletions(-) diff --git a/ema/views.py b/ema/views.py index 0ae886e4..cc7bbc93 100644 --- a/ema/views.py +++ b/ema/views.py @@ -16,6 +16,7 @@ from konova.decorators import conservation_office_group_required, shared_access_ from ema.models import Ema, EmaDocument from konova.forms import RemoveModalForm, SimpleGeomForm, RecordModalForm from konova.settings import DEFAULT_GROUP, ZB_GROUP, ETS_GROUP +from konova.sub_settings.context_settings import TAB_TITLE_IDENTIFIER from konova.utils.documents import get_document, remove_document from konova.utils.generators import generate_qr_code from konova.utils.message_templates import IDENTIFIER_REPLACED, FORM_INVALID, DATA_UNSHARED, DATA_UNSHARED_EXPLANATION @@ -44,6 +45,7 @@ def index_view(request: HttpRequest): ) context = { "table": table, + TAB_TITLE_IDENTIFIER: _("EMAs - Overview"), } context = BaseContext(request, context).context return render(request, template, context) @@ -86,6 +88,7 @@ def new_view(request: HttpRequest): context = { "form": data_form, "geom_form": geom_form, + TAB_TITLE_IDENTIFIER: _("New EMA"), } context = BaseContext(request, context).context return render(request, template, context) @@ -155,6 +158,7 @@ def detail_view(request: HttpRequest, id: str): "is_zb_member": in_group(_user, ZB_GROUP), "is_ets_member": in_group(_user, ETS_GROUP), "LANIS_LINK": ema.get_LANIS_link(), + TAB_TITLE_IDENTIFIER: f"{ema.identifier} - {ema.title}", } context = BaseContext(request, context).context return render(request, template, context) @@ -219,6 +223,7 @@ def edit_view(request: HttpRequest, id: str): context = { "form": data_form, "geom_form": geom_form, + TAB_TITLE_IDENTIFIER: _("Edit {}").format(ema.identifier), } context = BaseContext(request, context).context return render(request, template, context) @@ -457,10 +462,15 @@ def report_view(request:HttpRequest, id: str): template = "ema/report/report.html" ema = get_object_or_404(Ema, id=id) + tab_title = _("Report {}").format(ema.identifier) # If intervention is not recorded (yet or currently) we need to render another template without any data if not ema.recorded: template = "report/unavailable.html" - return render(request, template, {}) + context = { + TAB_TITLE_IDENTIFIER: tab_title, + } + context = BaseContext(request, context).context + return render(request, template, context) # Prepare data for map viewer geom_form = SimpleGeomForm( @@ -490,6 +500,7 @@ def report_view(request:HttpRequest, id: str): "geom_form": geom_form, "parcels": parcels, "actions": actions, + TAB_TITLE_IDENTIFIER: tab_title, } context = BaseContext(request, context).context return render(request, template, context) diff --git a/locale/de/LC_MESSAGES/django.mo b/locale/de/LC_MESSAGES/django.mo index b80bbd8bbfa518373de989dea0adc5ff09c6e48b..87ac689b8766276b9b18c7238f66d14bfc9d74cf 100644 GIT binary patch delta 10128 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 V<)IaWhh}7sOdGLdWZLNJ{|B=DdWQf2 delta 10029 zcmZA62Y6Lgy2kMx5?Tr*G?PFeF|!c6r*J9dt5rNN4~JIuylMClyWqG4&l`qcU?w)G z=6N%4KI%~s)jh8SCSe#hab=&^fus->eK7WGgSk;*{58N!*F0JfG(sC(#40Vi~-RQTQ*6#HbqXe2Uo^HIfdc;kH`YPj(7M$JHjTFk$uxD6F*s2{3Y=W0gqq0~$;^KcNhc~a!faH}2BA7K9>Z}K zYKc~&8rpzua2wXeM>r3YQrwguzzE7`Pz~KcJ?}PZAdgTTDdDT_dKQhUh(k4yV5Xp^ zE*+buSL~HmI{cDu!Zmf)Y zP;JzWjj#%K!IC%y6LE=^k6?Sse?rY@{Bv#~RZ%mTjOu6;GYd=5zBhnGBYzz=@?6x& z=As%}j7@P9>H&AKAU;K17f{FDR|LyajzD#w25JB)sF`bsdVV|9YuW`1>HY6cq8oan z8XSO{;t8lJoMA3TP4QZM2H!_L@C530JCEwnkLDB9bG1QaL9Bd;QqCOw8V@CVd$ zV$xlEaq0H{SEWLmrv{G1Rv3*3Q8#>vn!0PKhVP*E!aq?X33%RhBox*07}SWXS$(RN zo1tc)J-&chJ`%0jDpUizurwY)U3dl6&{wDj-$gz65o+WC4cuNSfx531>N&5VmTo9& zNvEM^W;tpAn@}_4+d-lS9zk{F6l!zaL~WX1&4`BXd{yMl^D;02$D$fskLu|AR(}}P z&~2oz-UDonH5$44@yOEpys0EnoXA7%f%T}KZb3cxBl9@wftRfO6_%xZ8_Qu(hU-8a zY7Zr&-v2bzbDN_!bvx{UIXFu1|51`GDpDJJUT2(xn(7;<4&1f!W7LBRHgOLQMKu&@ zto$#bsEC_Px}mZY|SM4YtMV*d29a9%^deGT%eZ(0)_{ zr%(-FLv`>rYDs@U&Daz4?-h2OEP>jz@#xcoYubs1Sc!6b)aSw&)D+IP@|&m!Z^1y^ zg_?m6F$fQ%I`A2m$J3|*+(GT7->h7!nd^AfX3W3VK8*@(x-4@j>H&GE&9({Ek!z?2 z-9l~F-%-j8cj(VN4P-{8`wWf@^W^>rlFGxj<)h7bE?(PKwl^q%(oM( zP!C*#)p5Of7B#}hSQ{(x`B@XYp{}2e>^pBBssoo%-=5!FxdOHb-BB}})sgwv z8V;vIQ$G=taGhOn9z!VKLtXa>!>~Xnevu4dR`3Sp&Yk&C!sIMoNxX`0 zsO!6+mT(wque^nND|Vn>@7<_9G@>QEADbGE>8n1yO^1Zr3NPz}vO zb$BsqDK?<)+l%V>r>K#hMa|$P)J)ySaJ~NpUUm(X#Ar^`LcL~fP(ALBdeB%@$8yb8 zs0MeTKKVYw^7uVQV(2Tbqm{4_a^)N`Ki?e;`x^#A=ofJ9R`5;X(UQ5{)pZb41; zPE?2XTm4bgjGRJE=}pvik5Drf(8n!lC>9Lh6BRWB_4>LFH|xv%YYMwjp$7~`-I$B& z>3q~kH=-IkWaqD-8v3i%-$gA!fqrgD5;2)_L)7jcjstNz>iPFjd+C>cKKB|0^>+?1gGzC2Gkwpzhy;>cBD7OkP1oV@$*5*co%N4PL>*8276CwoAY!l(TRqu0Vaz#JuMIeV`SpJOb6RHCP0VxY9@|O6#Yb09hhgcLt2Dx%+)KVm(_DF`=31cbuGiRbkv>7#!9p-M-2=}3$e+V^0 zm(5$~|NH+}5;YVs*p0L_s;4oisjrC|L5kIR^~8P%b5OvDyg14m;`+<-}V5%swI}j6a7*4{KxEf23;!_KEV@Iqr+O6Ge z)O)@hOW=0YOdUZrbjHdzP&0hTe2f(+7arrjhJ95?^ngs%iQae)b5S$Veym&LuI3PI zMEz7OgGW&fe2HrKJM%G?rW`!Z)yJY{CepZ>Zbsd>2i5RtjK@1x4x8vc4-(NoGSqeb%^B$L2x{i`qMm;W{r~=Vi9`+k z1Iyx%sF4(#$egI?f4C?;-sHKUX?3N~GGV`xB zsze2|>eav$+>9&nD(bBmImQ2B=B>u6l!KWzSsP=qCsxPFR=*WnP`-q1F?y=|=eB`3 zgz|P&N1}4MK)bPAuG=J4P$Ni2ZN3Ip-xzg68`RWg+WBnM0D7SA>x-I+94qIdW^@5+ zNw%Uk;Yrj?p7)Wc1J_Y&bPM&s$EXJNe{5v^P&4xrrenG3 z?mh2{`oQs-GxE!GEO`S1xnQZ4SD+eRjq1=QRL^(V`Mu^RsBgo=7>LJF*PpcV1=Ij9 zqxQ--R{s#W&gVTQQP1?hg@I5I^}wR228&yL84RKvjoM5VP~QRVuoh0j`nbc&w@}ZE zoXN*6mcvNQL2d5Y7_0YxElC^|M=&05ng#RRnkHZ+>Yqb>+4R5)I1ly7w+*%S`>lKe z11RfQX^HO7KW0+5lvqXlMEl+oVke=$XkQ?7bijYQ)O(Tqg5?v)Pg$;gaLn?3Ew^`~G7iKmTsINaaSo!#Z|2ylT{aLbSH>7vyh}>-$5; zS<1DsIqE2c&snZ=E%NeK{v+N~`@G`*<3)Z(P^r)A4{b@ax+xYYX_wjq8bCQ{EApf{iBME(?)*gbnpf7AK%pKg^sOs@Bi=m*Df>i&v@ zunO@Kc{Wjud^XXad_O)Vlh3H4rCkj*NBXs1MXI;_%8&nQ;Sws)&D%kns`+uIN{{8X=Oa*rnbMavc*1egpR(3Dlh?h7hk2 z%ZU7A6nO-f*l z>STe$r^F`WSE3o$=O53LykmuI>O;x*5Z@5KL;U!j*iF1a)FT>k(J5jIc{2Wvi-;NI zHHZP^t%yqGbBVp=*N9Jub3|?GbbLv)Chu%z)s-dw@PB2W_Z}6WQBjBJNNgc)QuiGZ zNtC6We_SGIL3t?7C8m@2CDs!M2_3%?qlveOWkmk5j^tS)h!{jv=K3iCe8nvwDNn^w z;{MWz_>#VD)O4bhe;lU#$O;{Bh~>+v|Al-UF@t!Saw?w0@wkxqmUx#)CrVPUqYW0o zSFPO4U+ez;WT5*@uo`G;=~ynVYxz05QN<$U!!eKONjyurBC(77XW}LDX~h3Os#5X4 zR=E$qBL3tr`&{iXnC4Rd&$afD!IU;weS4fr{Vbvvd0U)Md`ir=Yr2tV65A-hfdNFW zom+}$i0;(oAB*))j3&xa^Etj?Xa0;`DYqvE5R)k95O0%bVE$2xvW^X=EAg8n<#3`8 kvGBjnEzt$RvHv-i&d&pLj^-+P2x!2kdN diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index 30a1c3c5..a56e6ff0 100644 --- a/locale/de/LC_MESSAGES/django.po +++ b/locale/de/LC_MESSAGES/django.po @@ -26,7 +26,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-01-20 12:22+0100\n" +"POT-Creation-Date: 2022-01-20 12:25+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1068,12 +1068,12 @@ msgid "Compensation {} edited" msgstr "Kompensation {} bearbeitet" #: compensation/views/compensation.py:156 compensation/views/eco_account.py:159 -#: intervention/views.py:309 +#: ema/views.py:226 intervention/views.py:309 msgid "Edit {}" msgstr "Bearbeite {}" #: compensation/views/compensation.py:235 compensation/views/eco_account.py:314 -#: ema/views.py:183 intervention/views.py:482 +#: ema/views.py:187 intervention/views.py:482 msgid "Log" msgstr "Log" @@ -1082,37 +1082,37 @@ msgid "Compensation removed" msgstr "Kompensation entfernt" #: compensation/views/compensation.py:279 compensation/views/eco_account.py:466 -#: ema/views.py:350 intervention/views.py:132 +#: ema/views.py:355 intervention/views.py:132 msgid "Document added" msgstr "Dokument hinzugefügt" #: compensation/views/compensation.py:348 compensation/views/eco_account.py:360 -#: ema/views.py:288 +#: ema/views.py:293 msgid "State added" msgstr "Zustand hinzugefügt" #: compensation/views/compensation.py:369 compensation/views/eco_account.py:381 -#: ema/views.py:309 +#: ema/views.py:314 msgid "Action added" msgstr "Maßnahme hinzugefügt" #: compensation/views/compensation.py:390 compensation/views/eco_account.py:446 -#: ema/views.py:330 +#: ema/views.py:335 msgid "Deadline added" msgstr "Frist/Termin hinzugefügt" #: compensation/views/compensation.py:412 compensation/views/eco_account.py:403 -#: ema/views.py:420 +#: ema/views.py:425 msgid "State removed" msgstr "Zustand gelöscht" #: compensation/views/compensation.py:434 compensation/views/eco_account.py:425 -#: ema/views.py:442 +#: ema/views.py:447 msgid "Action removed" msgstr "Maßnahme entfernt" #: compensation/views/compensation.py:452 compensation/views/eco_account.py:554 -#: intervention/views.py:546 +#: ema/views.py:465 intervention/views.py:546 msgid "Report {}" msgstr "Bericht {}" @@ -1136,12 +1136,12 @@ msgstr "Ökokonto entfernt" msgid "Deduction removed" msgstr "Abbuchung entfernt" -#: compensation/views/eco_account.py:335 ema/views.py:263 +#: compensation/views/eco_account.py:335 ema/views.py:268 #: intervention/views.py:524 msgid "{} unrecorded" msgstr "{} entzeichnet" -#: compensation/views/eco_account.py:335 ema/views.py:263 +#: compensation/views/eco_account.py:335 ema/views.py:268 #: intervention/views.py:524 msgid "{} recorded" msgstr "{} verzeichnet" @@ -1150,22 +1150,22 @@ msgstr "{} verzeichnet" msgid "Deduction added" msgstr "Abbuchung hinzugefügt" -#: compensation/views/eco_account.py:627 ema/views.py:520 +#: compensation/views/eco_account.py:627 ema/views.py:531 #: intervention/views.py:380 msgid "{} has already been shared with you" msgstr "{} wurde bereits für Sie freigegeben" -#: compensation/views/eco_account.py:632 ema/views.py:525 +#: compensation/views/eco_account.py:632 ema/views.py:536 #: intervention/views.py:385 msgid "{} has been shared with you" msgstr "{} ist nun für Sie freigegeben" -#: compensation/views/eco_account.py:639 ema/views.py:532 +#: compensation/views/eco_account.py:639 ema/views.py:543 #: intervention/views.py:392 msgid "Share link invalid" msgstr "Freigabelink ungültig" -#: compensation/views/eco_account.py:662 ema/views.py:555 +#: compensation/views/eco_account.py:662 ema/views.py:566 #: intervention/views.py:415 msgid "Share settings updated" msgstr "Freigabe Einstellungen aktualisiert" @@ -1178,7 +1178,7 @@ msgstr "Zahlung hinzugefügt" msgid "Payment removed" msgstr "Zahlung gelöscht" -#: ema/forms.py:40 +#: ema/forms.py:40 ema/views.py:91 msgid "New EMA" msgstr "Neue EMA hinzufügen" @@ -1206,15 +1206,19 @@ msgstr "" msgid "Payment funded compensation" msgstr "Ersatzzahlungsmaßnahme" -#: ema/views.py:79 +#: ema/views.py:48 +msgid "EMAs - Overview" +msgstr "EMAs - Übersicht" + +#: ema/views.py:81 msgid "EMA {} added" msgstr "EMA {} hinzugefügt" -#: ema/views.py:212 +#: ema/views.py:216 msgid "EMA {} edited" msgstr "EMA {} bearbeitet" -#: ema/views.py:244 +#: ema/views.py:249 msgid "EMA removed" msgstr "EMA entfernt"