From 77e9c989aa305ff13eea2b57eab9f0fcee1aeb4f Mon Sep 17 00:00:00 2001 From: mpeltriaux <michel.peltriaux@sgdnord.rlp.de> Date: Thu, 20 Jan 2022 12:12:04 +0100 Subject: [PATCH 1/5] # 70 Tab titles interventions * adds content related tab title * adds/updates translations --- intervention/views.py | 19 ++++++-- konova/contexts.py | 4 +- konova/sub_settings/context_settings.py | 1 + locale/de/LC_MESSAGES/django.mo | Bin 34223 -> 34377 bytes locale/de/LC_MESSAGES/django.po | 62 +++++++++++++----------- templates/base.html | 2 +- templates/public_base.html | 2 +- 7 files changed, 53 insertions(+), 37 deletions(-) diff --git a/intervention/views.py b/intervention/views.py index fc1625da..ad046155 100644 --- a/intervention/views.py +++ b/intervention/views.py @@ -10,11 +10,12 @@ from intervention.models import Intervention, Revocation, InterventionDocument, from intervention.tables import InterventionTable from konova.contexts import BaseContext from konova.decorators import * -from konova.forms import SimpleGeomForm, NewDocumentForm, RemoveModalForm, RecordModalForm +from konova.forms import SimpleGeomForm, RemoveModalForm, RecordModalForm +from konova.sub_settings.context_settings import TAB_TITLE_IDENTIFIER from konova.utils.documents import remove_document, get_document from konova.utils.generators import generate_qr_code from konova.utils.message_templates import INTERVENTION_INVALID, FORM_INVALID, IDENTIFIER_REPLACED, \ - DATA_UNSHARED_EXPLANATION, CHECKED_RECORDED_RESET + CHECKED_RECORDED_RESET from konova.utils.user_checks import in_group @@ -44,6 +45,7 @@ def index_view(request: HttpRequest): ) context = { "table": table, + TAB_TITLE_IDENTIFIER: _("Interventions - 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 intervention"), } context = BaseContext(request, context).context return render(request, template, context) @@ -255,7 +258,8 @@ def detail_view(request: HttpRequest, id: str): "is_default_member": in_group(_user, DEFAULT_GROUP), "is_zb_member": in_group(_user, ZB_GROUP), "is_ets_member": in_group(_user, ETS_GROUP), - "LANIS_LINK": intervention.get_LANIS_link() + "LANIS_LINK": intervention.get_LANIS_link(), + TAB_TITLE_IDENTIFIER: f"{intervention.identifier} - {intervention.title}", } request = intervention.set_status_messages(request) @@ -302,6 +306,7 @@ def edit_view(request: HttpRequest, id: str): context = { "form": data_form, "geom_form": geom_form, + TAB_TITLE_IDENTIFIER: _("Edit {}").format(intervention.identifier), } context = BaseContext(request, context).context return render(request, template, context) @@ -538,10 +543,15 @@ def report_view(request:HttpRequest, id: str): template = "intervention/report/report.html" intervention = get_object_or_404(Intervention, id=id) + tab_title = _("Report {}").format(intervention.identifier) # If intervention is not recorded (yet or currently) we need to render another template without any data if not intervention.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( @@ -567,6 +577,7 @@ def report_view(request:HttpRequest, id: str): "qrcode_lanis": qrcode_img_lanis, "geom_form": geom_form, "parcels": parcels, + TAB_TITLE_IDENTIFIER: tab_title, } context = BaseContext(request, context).context return render(request, template, context) diff --git a/konova/contexts.py b/konova/contexts.py index 751e355b..49357312 100644 --- a/konova/contexts.py +++ b/konova/contexts.py @@ -7,7 +7,7 @@ Created on: 16.11.20 """ from django.http import HttpRequest -from konova.sub_settings.context_settings import BASE_TITLE, HELP_LINK, BASE_FRONTEND_TITLE +from konova.sub_settings.context_settings import BASE_TITLE, HELP_LINK, BASE_FRONTEND_TITLE, TAB_TITLE_IDENTIFIER from konova.sub_settings.django_settings import EMAIL_REPLY_TO @@ -20,7 +20,7 @@ class BaseContext: def __init__(self, request: HttpRequest, additional_context: dict = {}): self.context = { "base_title": BASE_TITLE, - "base_frontend_title": BASE_FRONTEND_TITLE, + TAB_TITLE_IDENTIFIER: BASE_FRONTEND_TITLE, "language": request.LANGUAGE_CODE, "user": request.user, "current_role": None, diff --git a/konova/sub_settings/context_settings.py b/konova/sub_settings/context_settings.py index 53177c75..c28b744c 100644 --- a/konova/sub_settings/context_settings.py +++ b/konova/sub_settings/context_settings.py @@ -9,4 +9,5 @@ Created on: 16.11.20 BASE_TITLE_SHORT = "KSP" BASE_TITLE = "KSP - Kompensationsverzeichnis Service Portal" BASE_FRONTEND_TITLE = "Kompensationsverzeichnis Service Portal" +TAB_TITLE_IDENTIFIER = "tab_title" HELP_LINK = "https://dienste.naturschutz.rlp.de/doku/doku.php?id=ksp:start" diff --git a/locale/de/LC_MESSAGES/django.mo b/locale/de/LC_MESSAGES/django.mo index 4985688af6ab414f3f80c32c199aa4bcf56083bd..f32cd700492732b4f8862fe17daddafb41c590e7 100644 GIT binary patch delta 10075 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 delta 9940 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 diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index 12a577fb..aa8c41b2 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-12 16:43+0100\n" +"POT-Creation-Date: 2022-01-20 12:07+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -1064,7 +1064,7 @@ msgid "Compensation {} edited" msgstr "Kompensation {} bearbeitet" #: compensation/views/compensation.py:230 compensation/views/eco_account.py:309 -#: ema/views.py:183 intervention/views.py:478 +#: ema/views.py:183 intervention/views.py:482 msgid "Log" msgstr "Log" @@ -1073,7 +1073,7 @@ msgid "Compensation removed" msgstr "Kompensation entfernt" #: compensation/views/compensation.py:274 compensation/views/eco_account.py:461 -#: ema/views.py:350 intervention/views.py:129 +#: ema/views.py:350 intervention/views.py:132 msgid "Document added" msgstr "Dokument hinzugefügt" @@ -1119,36 +1119,36 @@ msgid "Deduction removed" msgstr "Abbuchung entfernt" #: compensation/views/eco_account.py:330 ema/views.py:263 -#: intervention/views.py:520 +#: intervention/views.py:524 msgid "{} unrecorded" msgstr "{} entzeichnet" #: compensation/views/eco_account.py:330 ema/views.py:263 -#: intervention/views.py:520 +#: intervention/views.py:524 msgid "{} recorded" msgstr "{} verzeichnet" -#: compensation/views/eco_account.py:531 intervention/views.py:501 +#: compensation/views/eco_account.py:531 intervention/views.py:505 msgid "Deduction added" msgstr "Abbuchung hinzugefügt" #: compensation/views/eco_account.py:616 ema/views.py:520 -#: intervention/views.py:376 +#: intervention/views.py:380 msgid "{} has already been shared with you" msgstr "{} wurde bereits für Sie freigegeben" #: compensation/views/eco_account.py:621 ema/views.py:525 -#: intervention/views.py:381 +#: intervention/views.py:385 msgid "{} has been shared with you" msgstr "{} ist nun für Sie freigegeben" #: compensation/views/eco_account.py:628 ema/views.py:532 -#: intervention/views.py:388 +#: intervention/views.py:392 msgid "Share link invalid" msgstr "Freigabelink ungültig" #: compensation/views/eco_account.py:651 ema/views.py:555 -#: intervention/views.py:411 +#: intervention/views.py:415 msgid "Share settings updated" msgstr "Freigabe Einstellungen aktualisiert" @@ -1257,7 +1257,7 @@ msgstr "Datum Zulassung bzw. Satzungsbeschluss" msgid "Binding on" msgstr "Datum Bestandskraft" -#: intervention/forms/forms.py:191 +#: intervention/forms/forms.py:191 intervention/views.py:91 msgid "New intervention" msgstr "Neuer Eingriff" @@ -1459,38 +1459,50 @@ msgstr "" "Kein Ausgleich jeglicher Art gefunden (Kompensation, Ersatzzahlung, " "Abbuchung)" -#: intervention/views.py:79 +#: intervention/views.py:48 +msgid "Interventions - Overview" +msgstr "Eingriffe - Übersicht" + +#: intervention/views.py:81 msgid "Intervention {} added" msgstr "Eingriff {} hinzugefügt" -#: intervention/views.py:246 +#: intervention/views.py:248 msgid "This intervention has {} revocations" msgstr "Dem Eingriff liegen {} Widersprüche vor" -#: intervention/views.py:294 +#: intervention/views.py:297 msgid "Intervention {} edited" msgstr "Eingriff {} bearbeitet" -#: intervention/views.py:329 +#: intervention/views.py:309 +msgid "Edit {}" +msgstr "Bearbeite {}" + +#: intervention/views.py:333 msgid "{} removed" msgstr "{} entfernt" -#: intervention/views.py:350 +#: intervention/views.py:354 msgid "Revocation removed" msgstr "Widerspruch entfernt" -#: intervention/views.py:432 +#: intervention/views.py:436 msgid "Check performed" msgstr "Prüfung durchgeführt" -#: intervention/views.py:454 +#: intervention/views.py:458 msgid "Revocation added" msgstr "Widerspruch hinzugefügt" -#: intervention/views.py:525 +#: intervention/views.py:529 msgid "There are errors on this intervention:" msgstr "Es liegen Fehler in diesem Eingriff vor:" +#: intervention/views.py:546 +msgid "Report {}" +msgstr "Bericht {}" + #: konova/decorators.py:30 msgid "You need to be staff to perform this action!" msgstr "Hierfür müssen Sie Mitarbeiter sein!" @@ -2165,22 +2177,14 @@ msgid "More" msgstr "Mehr" #: templates/navbars/navbar.html:44 -msgid "Import..." -msgstr "" - -#: templates/navbars/navbar.html:45 -msgid "Export..." -msgstr "" - -#: templates/navbars/navbar.html:46 msgid "Reports" msgstr "Berichte" -#: templates/navbars/navbar.html:58 user/templates/user/index.html:31 +#: templates/navbars/navbar.html:56 user/templates/user/index.html:31 msgid "Settings" msgstr "Einstellungen" -#: templates/navbars/navbar.html:59 +#: templates/navbars/navbar.html:57 msgid "Logout" msgstr "Abmelden" diff --git a/templates/base.html b/templates/base.html index e728405a..2f5e5b24 100644 --- a/templates/base.html +++ b/templates/base.html @@ -4,7 +4,7 @@ <head> <meta charset="UTF-8"> <meta name="viewport" content="width=device-width, initial-scale=1"> - <title>{{ base_frontend_title }}</title> + <title>{{ tab_title }}</title> <link rel="icon" type="image/ico" href="{% static 'images/ksp-favicon.ico' %}"> {% bootstrap_css %} {% bootstrap_javascript jquery='full' %} diff --git a/templates/public_base.html b/templates/public_base.html index d09d74b8..62193c49 100644 --- a/templates/public_base.html +++ b/templates/public_base.html @@ -4,7 +4,7 @@ <head> <meta charset="UTF-8"> <meta name="viewport" content="width=device-width, initial-scale=1"> - <title>{{ base_frontend_title }}</title> + <title>{{ tab_title }}</title> <link rel="icon" type="image/ico" href="{% static 'images/ksp-favicon.ico' %}"> {% bootstrap_css %} {% bootstrap_javascript jquery='full' %} From fb911c7429262cf463cad66ac993a933f6cea645 Mon Sep 17 00:00:00 2001 From: mpeltriaux <michel.peltriaux@sgdnord.rlp.de> Date: Thu, 20 Jan 2022 12:19:08 +0100 Subject: [PATCH 2/5] # 70 Tab title compensation * adds tab titles for compensations * adds/updates translations * optimizes identifier generating, so that one-digit months will be converted into two digits --- compensation/views/compensation.py | 13 ++++++++- konova/models/object.py | 7 ++++- locale/de/LC_MESSAGES/django.mo | Bin 34377 -> 34446 bytes locale/de/LC_MESSAGES/django.po | 44 ++++++++++++++++------------- 4 files changed, 42 insertions(+), 22 deletions(-) diff --git a/compensation/views/compensation.py b/compensation/views/compensation.py index 71efb5ee..ab11a62a 100644 --- a/compensation/views/compensation.py +++ b/compensation/views/compensation.py @@ -13,6 +13,7 @@ from intervention.models import Intervention from konova.contexts import BaseContext from konova.decorators import * from konova.forms import RemoveModalForm, SimpleGeomForm +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 FORM_INVALID, IDENTIFIER_REPLACED, DATA_UNSHARED_EXPLANATION, \ @@ -43,6 +44,7 @@ def index_view(request: HttpRequest): ) context = { "table": table, + TAB_TITLE_IDENTIFIER: _("Compensations - Overview"), } context = BaseContext(request, context).context return render(request, template, context) @@ -86,6 +88,7 @@ def new_view(request: HttpRequest, intervention_id: str = None): context = { "form": data_form, "geom_form": geom_form, + TAB_TITLE_IDENTIFIER: _("New compensation"), } context = BaseContext(request, context).context return render(request, template, context) @@ -150,6 +153,7 @@ def edit_view(request: HttpRequest, id: str): context = { "form": data_form, "geom_form": geom_form, + TAB_TITLE_IDENTIFIER: _("Edit {}").format(comp.identifier), } context = BaseContext(request, context).context return render(request, template, context) @@ -202,6 +206,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": comp.get_LANIS_link(), + TAB_TITLE_IDENTIFIER: f"{comp.identifier} - {comp.title}", } context = BaseContext(request, context).context return render(request, template, context) @@ -444,10 +449,15 @@ def report_view(request: HttpRequest, id: str): template = "compensation/report/compensation/report.html" comp = get_object_or_404(Compensation, id=id) + tab_title = _("Report {}").format(comp.identifier) # If intervention is not recorded (yet or currently) we need to render another template without any data if not comp.intervention.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( @@ -477,6 +487,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/konova/models/object.py b/konova/models/object.py index c9a8e6c9..900542d8 100644 --- a/konova/models/object.py +++ b/konova/models/object.py @@ -182,7 +182,12 @@ class BaseObject(BaseResource): return generate_random_string(10) _now = now() - curr_month = str(_now.month) + curr_month = _now.month + if curr_month < 10: + # Make sure month part has two digits to have same length identifiers by default + curr_month = f"0{curr_month}" + else: + curr_month = str(curr_month) curr_year = str(_now.year) rand_str = generate_random_string( length=definitions[self.__class__]["length"], diff --git a/locale/de/LC_MESSAGES/django.mo b/locale/de/LC_MESSAGES/django.mo index f32cd700492732b4f8862fe17daddafb41c590e7..097aff994d6ce0453171b0f4a589c1d019648987 100644 GIT binary patch delta 10021 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 delta 9982 zcmZA730zlI`p5ALu85$xAfgCL0&alf2JRc~;-34SqN3)$_ft`e+;E#HGcj|w+%30q z9~m{ZNzJ9nbS!6_G%dA^^#A#CAO7QO?(6mRKIh!!ob#M>FHkLB<ejz9+w+fNc~?3d zUwS!CSzPGvIK#aiCtDSc%m~LR!nw7$ochj4$C-~Uq8w)qp2hB%RLOBh;|A=2B`Z75 zTpWTS_%AGm1*$lX9|j|Jj}t{9KMnQJ7n@>X?0}Q7H!>#YEAxBwrT#O9W45)2Rdt*a z)MKzHHpc+$X7yoMg!&XLj&ETJ`gh)^pbmCoARfWecm;#-p`9;O&AqNPY9>)gQk;6$ zJ_z$rAB!<K5jC;(s1CPbVLXC<cn$;U-?>h~2OptEoQ=BCKia*aq*(zA(H>*<1hXaT z`mV^WPH(J$X{Z@*!vc5+Sv}_jYJ&ekk5ZYR;cA4%%m^$<JppxNGt`XRqCfUS&14iR z<<n62FF~#KI%_|Qn$Tq|iFZ*MevW=vGM4<SgYa1Q!BtRemw<X;TMWkj7>d(S9lVFS z?=#duk61kmb>Br)$9GVfd1~jMqcWJky5r=<fa>I5GYh0aBdUa&VI3@riKwM{71hx| zY>OkX4(`JRcpr=4v>I;5Z=*VTAN9PAsEO=D4g4Z%U{^iXa1+(RUGpI-WzSF#C>rMu zBouXHB@Dn=RL4zGOW7H<H2qK$8i`8zRBKO1z1gc#OXoR2K^>j93+|vE^avyIITpu= znvTPZ;3S~x!!QY_qf&VWHGvDL%w0td@ZV-O7NhQ8%gsP}<a&=&iGpTS1NGo|Y=-So z4_J!%a2@Kp&8UucU>V$x8o(vgz^|b)_5<p=$EerxIqH7z+V1r}SX}SFKLxFE1yt&) zn(?UACSob<j(Xr|)ax}F^}zScwWxt?GC#(;)OTSgyoV&gX~4$O-WZ3$djDrq;GC0z zJ@7o1!zk_!!<MLBpNz`LeAGZQuoSMx5_lL(;#U}mcTs!b1qPvCyt@PusDa0$M=5Vi zp*(g)J!leYmo7lfXt|kzT8h=EfviJiZZE2%FHosIXYChJ_g_cN_@<q|hZ?|xc=E55 zKA}M~dV%VoaDw}wVyN?hr~!qdHdmxs7q!-{Q3L9M+N2|}8oq-X&`DH>S*QVBK<%AN z3FLnqg@-f*<B)pp4Ib2tQc)c*MeT)mQ8U?$8ps~hz)zww@s+jTu=-D^4xeIk%tkF) zllt!SdwM8n&4!^aoQdja4(h?nP!C>%>Tok^uN*+#_YgJE0u9`yD~Vdt%BajVL`|SQ zDns2+&l`psh-WMXZH_e5ruop^Zx>uZ-W=yHR>E=(-40u!2HG9fJ`~kaIx;3F1KZ#w zYY%JWE^QQ+rac;25|7i0f<~Hznn^!11@*vbR-c1qsHbCD+=d!J7HW@NMZN#GP-}f3 zwW%LtM=aIYamHgZcEuamh5nuDP25z^Lk(b=)iY5K`WW@#J*bY3SUn51M3+!+%`H@l zpQ4t)r>XlxD+E8F-T?Ky8>pqcjehj+{7Rt;dh^-SjnSx?H8ne<GBgO)!B|wssi+60 zqt^5tRL0g~&R#JOpf>Fp)N?Oe`w!@;NW)VK`ZkBKMK#k{RJ}gx!AY10d!jPX7xUs! z)Br|eIUI+Yz*5v+T5t73sDWQVt^F<3p381d{#7X1!hJwAYO}RR4I~xype3l?x&d|l z=g6`;S1<%iC6ZpOg__}bY>BC;0iVHq_%$jM*H9C@lSuyc8vRCtI`Zc()hnWAQqN36 zt?^*gbyH9ST!QLw73RgQsG06Sb$kqU-x<{2x@q1=y*1e$3c4YpmAj^OQ4el`x}lS` z_qTcqYA;N~2uwpQ%?`|ud$0f=#NK!uD`RMDzAe}WE8uDDgr0j8^q>Z9T!&y7^#$fO ze1-Zstcj0M?{{QdcLqbSKlR0^f!xP}x(<Et4^-;&wPS;$FRJd3T<>v8P|%2jP$>*E zE217$8I_4REQC!^DQ|~bsy?Xu#-TDf8FgP8=Dg0R=Vzh@xCu3|Z5Xcie;<X~G+aY{ zU;^5^o2r`G7B%zXSQ$USs+fh^L{Chg4sN|HYVX9L2Gq>jyIFg(IYaIA@1#@EjMkaE zQSa|@^vADJ9o<Hy@Chn~zoXuU7pR#9CAl*#i>kk3Mp=7REKGY%Yj1)cJ+K9ZD%i@L zfSO?@#^E`PMlZgjx;_@!S56#i05ecOJy%+Nhna;r?>j29*{CH9V&{cpcqj57L!l)N zx?nQ;;&Rl5YtRq3U{f!C-^XvM|IwLWsqtzTb~?`P$}5Nsy19RRUd4UXqq_5}JAQ|U zu@05;_!y(GR1fm6wQAhMU8}CB%`+6$@fZxmnV5kqFaWFdbeE(N>blOTi3~txA{|3; zD+Xbfwcj%TwDurRFZaUgsF5Y1zI0=;G^U|;`8w2xWWTk4Y3+AW*FQ%sVPJ1}U`<hP zMK{#z-3zs6W}~iu6N{i{4TYi<wxecx1eN+LsLb3#ZKfxvnLe}jf_>ccWl^tFteIdo z$1=2cKn-97>iJ7i8Qz2y_5Saqpb=d`?al{S7PC<umhS8B>PS>aF{lB@qn4r#>b^dx zfe%N`bOI`a(@+^)fx2%C>iGvTSnvNg6#QxU1@!>$e(r$$%!;Uv8ek<%!g4qjwYC|k z56n)~CwM<<Ku1smIETUbBPx^L{oM@Ym-O!xp`Z~5p;A;%C$JXk0S!@W)dRI8$##AQ zvhkgH<~7tNjTzuR=QQfO@g3@|dW6crbJT!}3?%>Rs4@i^he~mM)PNGLy&Y<ax}j1z z3Uys7Dr1X~wRAEtpBF!#Q5iTf$Q|%SR0i*$?thB9&u=jK*NlS(yEBbJb<`Sl!9Y|; zDX7#>LOm!GtK%-z4F8G4@G0uP{zKfoGXnM2OhNUt2$jK)Fa$pv;&DfMnFgikHtGQn zP`mdT#$(`XZbuza0~&0OLaqH|)XY4X4_BfxunM)eHla52r|69*QTLtJ4S6VBz&iLf zs)NEq-L(otJs=V_)7q$xTBEM(kF{|)>VcV<A2(q>+>Uv1FDBpt?1GQ6EqYp$H{G}r zE8}Wxil=cN`X;*{mZca;{jk;VpavE&+}%52sLfRgmGT7C+mVDyeKPu>$LeXwQh1z9 z3R=@W<|z!L{*C!N=BFM!!ktNZGXgckDyR;sqcYUW?2Wo_G-}N!VgXD;4Rk5y(fj`) zg@QC}uoK%+4?bd^LM_o*)E>ED?Ke;vxP@BlhvswC>*_nw&1e~nrk;pe`-!N5O~JhM z?|3LERdaC}u10OX*c7+pcBqazqEg!*)xiX7pNq=iax8@FQJZato&VhG=g^n->(~K* zM2|i&wMV%r>4;kUfyis@e1uBf20MQMHIOr?lwZSE_z;!)gwd|;QLonk)b($m2D}Kh z1gp^p*N-Ou8qszds^USchIcU<1IM^OR$HLn_lcN@8?gr7N3CV~*WHe5U}NenP#w(2 zSWL%8coenNUSnMgjV1s36c(pJuSqlpU>xcJEwCsip+-IcwFJqi57kU8hbu7v_h1n` zg?ip))LLK1N_Y!rVBvB6yFpCzP)MZ^G2Z=sd<*(f&qlrHg(kQ&3qxfp4g;`})jOd- z^}c2bhEku75x5GqG{>y{5}u>}7?lan@rmvlpEYlyQuQlpjcZPFJ7|mQxR;rNC8@t* z^%bZLZ9r|pPf#7~$BK9ib^l$|M4lmUmB-0H+1>qxP-`EKC9o4J6GQF%1k_9xp<bg* zREO(OOSKi1>b<C+?}tzwUPZlK_fSincZ$2Dp%|j~KbC@K(gAhj5Y(E^#>SY58p!vk z>mHyUoNuc8pi-!}CJF;_Bv!{csJ*ZU8{!GnbMj1cGZTP?>E8*apc^Am9XG^q>}&Pe zsP920=FH66ubRK1HfgEpZswv;sc(SFSRxk2o>&Hlq9!s2J!;6Hpw#a{U3klUfLe-d z)QkgWxN8@Vnpq5nVI$Q215it|7_~G@&3BQcIcu>72G4YVQE5Mu{Oh&&fre37^bPm- z@;A(l7)JXAtbz}%J%qHiq^>{T+u>qtj@K~-!)CbyS%lh*>8L%j3bpyxqdw_7XK{m0 z?4>~?{{oe|W2g(xpk{I&b>kIOCT?5(F_xk3HQQaf5Y#5DkIG~-)Brl7mZ&%Cc`2y= zCU_{Q!^v13XJG>FGJisSN~7kunMlMa>cg-erla2Tv#1ZwFXnINpQd-JJD~!o>wHoD zdWureh)SbIUfwQ<GOM9}8rHx(SQmADeXBP|&9D_}uXM5YWXzc<s>2D^J{9%6nMi*g zC)G~8jk<6#YBMcI{R}vYvG_B_WBIvmy*K8ez7RWOItJlw)b7s4Ff2CD{mUv2!>M;O zr=qXk|J4*Ka$+;a;CT$i7pPBb=zMqWqfzw)^ukBPUg8@<n|LpcZ(?a8nesb?ej9$B z`eEV(v60wG+wZ9368$@2G~^zeDU_z}Z4LS^d|>7BwAUd{Q=e-0tg>?=lW0ZsCNxkT z?-Px<R{sgN2~m}L6t*LtQ1<-BKXQ+e6!vgJ$6Hv)$^}fVa{}c<sP}mq<*~Sq*kspe zv;INoxa#6;#qC5dLa*z`T)P0bd6ECe6h;s_@^a#9Y>Z`y&xxbNOu~=$;>1?U+E_0i zJ!$Jt)Tgm9@|kcJpkBeeL?Y#X-~nPg<^LY!e;o~<&@zlTN%=!!!b=x*qI~(kcjSDc z+ft9Dy#dzLwZsFcqB6%&La+0i)Q1pn6St}Fz?HZXa}KTl+r$lG4bhL#F`JmgMQ1R= zE`E=4Un2K7NZ}R2JNIFfLn)8J6yif-7SV{POM7GdfzZ*Km_?iC0RMQ4%6iN_A}EZa zUK!iq6^wrAd{evdU$~F<kI~1@cSe26bB~WG{FT^k4efJJxGql$^Ycune2u6}Eam>C z?l~uzas}cdb-n7jM>d7$xfT5LrSe#=??ODaw!c#T8?lS1NQ4ucIQJ^**q}Z59}4_> z;B=sII?>%u-lMG)<z_g9*hVa&UV?a!7(o3jahS4>*UWb)x2F6#W)RCL*TMXRj?aji z#2MNb=^OO&5nvDT$1<GwnfTP&_$1~097>}eYB%X$jJ<qxpfZ?vh4w8(kC#sNw6ea` z)rhK`AK|eFbi;vm!F>F{+6&?!Yu`<IE#)r64kC)ELVQb%<J@=*C*lYle{pdxV1CXg zVzRY~VB-JhzlF*dgb$(PS7I7*oEyCe{W7EDGs?r=qVoc~5`UrXZ@3meB90LHF%V1W zxI@&YZ8>p@@+rKJKj!xT6P1U=LQdo!Z739@UYSUsJcrmr9Hjm|>S#i|PCYB9#$VNx zTN2Nx|J&L`7%`0Ymyhw(J9;tymb9i&nS^KYJkG-&#QTJfDP}oLCziO)P6*}2#HZBj z5iN*!slR-DMP-$>`C>!jOS@pO)_<y1W@1;nuo(^@1`=b4iky3w=tFs&UEiK^Sz@u( z#c=BTa4ya#betsiTRA<ag&(|Fk~aN65Ka<>N`#+XRLU+IZS`|_+}ggdwixOsD4!+* ziH*b|VwqhRWQrq1an21Qx>4?hcQGw@{WEE(Ktt|vG`D~=I9C+Ev$h7*m9<608e+Y* z$5W0Wbo3!c6S36iSlbNhWeFWOiG@V>-2ERw<)4I(4MZF_wIU``?x;qNT|_OS1?~HB z1y&<6h@r$Wq9N@%`cd9Y^d)p85yyyvs&Le>_K}*&P8wDa@kBo2H6n=iXsnL2iTXql z>Jy00gpO3&niI7M9j_9dh`$q&L{Zv%+qqlRbu1^Y6Is?i;1dd~t)dHbyzxKvRN9&o z6RmwN<;j$Jd2;@stw;G6%KeEiDd!<-Q`WKEt83uyQxRi)c6W&Vw%YEN{aQx-A6?aH AfB*mh diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index aa8c41b2..8e2ef9c4 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:07+0100\n" +"POT-Creation-Date: 2022-01-20 12:17+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -426,7 +426,7 @@ msgstr "kompensiert Eingriff" msgid "Select the intervention for which this compensation compensates" msgstr "Wählen Sie den Eingriff, für den diese Kompensation bestimmt ist" -#: compensation/forms/forms.py:184 +#: compensation/forms/forms.py:184 compensation/views/compensation.py:91 msgid "New compensation" msgstr "Neue Kompensation" @@ -1055,53 +1055,65 @@ msgstr "" msgid "Responsible data" msgstr "Daten zu den verantwortlichen Stellen" -#: compensation/views/compensation.py:79 +#: compensation/views/compensation.py:47 +msgid "Compensations - Overview" +msgstr "Kompensationen - Übersicht" + +#: compensation/views/compensation.py:81 msgid "Compensation {} added" msgstr "Kompensation {} hinzugefügt" -#: compensation/views/compensation.py:143 +#: compensation/views/compensation.py:146 msgid "Compensation {} edited" msgstr "Kompensation {} bearbeitet" -#: compensation/views/compensation.py:230 compensation/views/eco_account.py:309 +#: compensation/views/compensation.py:156 intervention/views.py:309 +msgid "Edit {}" +msgstr "Bearbeite {}" + +#: compensation/views/compensation.py:235 compensation/views/eco_account.py:309 #: ema/views.py:183 intervention/views.py:482 msgid "Log" msgstr "Log" -#: compensation/views/compensation.py:253 +#: compensation/views/compensation.py:258 msgid "Compensation removed" msgstr "Kompensation entfernt" -#: compensation/views/compensation.py:274 compensation/views/eco_account.py:461 +#: compensation/views/compensation.py:279 compensation/views/eco_account.py:461 #: ema/views.py:350 intervention/views.py:132 msgid "Document added" msgstr "Dokument hinzugefügt" -#: compensation/views/compensation.py:343 compensation/views/eco_account.py:355 +#: compensation/views/compensation.py:348 compensation/views/eco_account.py:355 #: ema/views.py:288 msgid "State added" msgstr "Zustand hinzugefügt" -#: compensation/views/compensation.py:364 compensation/views/eco_account.py:376 +#: compensation/views/compensation.py:369 compensation/views/eco_account.py:376 #: ema/views.py:309 msgid "Action added" msgstr "Maßnahme hinzugefügt" -#: compensation/views/compensation.py:385 compensation/views/eco_account.py:441 +#: compensation/views/compensation.py:390 compensation/views/eco_account.py:441 #: ema/views.py:330 msgid "Deadline added" msgstr "Frist/Termin hinzugefügt" -#: compensation/views/compensation.py:407 compensation/views/eco_account.py:398 +#: compensation/views/compensation.py:412 compensation/views/eco_account.py:398 #: ema/views.py:420 msgid "State removed" msgstr "Zustand gelöscht" -#: compensation/views/compensation.py:429 compensation/views/eco_account.py:420 +#: compensation/views/compensation.py:434 compensation/views/eco_account.py:420 #: ema/views.py:442 msgid "Action removed" msgstr "Maßnahme entfernt" +#: compensation/views/compensation.py:452 intervention/views.py:546 +msgid "Report {}" +msgstr "Bericht {}" + #: compensation/views/eco_account.py:89 msgid "Eco-Account {} added" msgstr "Ökokonto {} hinzugefügt" @@ -1475,10 +1487,6 @@ msgstr "Dem Eingriff liegen {} Widersprüche vor" msgid "Intervention {} edited" msgstr "Eingriff {} bearbeitet" -#: intervention/views.py:309 -msgid "Edit {}" -msgstr "Bearbeite {}" - #: intervention/views.py:333 msgid "{} removed" msgstr "{} entfernt" @@ -1499,10 +1507,6 @@ msgstr "Widerspruch hinzugefügt" msgid "There are errors on this intervention:" msgstr "Es liegen Fehler in diesem Eingriff vor:" -#: intervention/views.py:546 -msgid "Report {}" -msgstr "Bericht {}" - #: konova/decorators.py:30 msgid "You need to be staff to perform this action!" msgstr "Hierfür müssen Sie Mitarbeiter sein!" From 2f65caf6b1f37e1eb87cff96461af67e9a232eab Mon Sep 17 00:00:00 2001 From: mpeltriaux <michel.peltriaux@sgdnord.rlp.de> Date: Thu, 20 Jan 2022 12:23:19 +0100 Subject: [PATCH 3/5] # 70 Tab title eco-account * adds tab titles for eco account * adds/updates translations --- compensation/views/eco_account.py | 13 +++++++- locale/de/LC_MESSAGES/django.mo | Bin 34446 -> 34517 bytes locale/de/LC_MESSAGES/django.po | 50 +++++++++++++++++------------- 3 files changed, 40 insertions(+), 23 deletions(-) diff --git a/compensation/views/eco_account.py b/compensation/views/eco_account.py index 0895823e..14caf9d3 100644 --- a/compensation/views/eco_account.py +++ b/compensation/views/eco_account.py @@ -25,6 +25,7 @@ from konova.decorators import any_group_check, default_group_required, conservat shared_access_required from konova.forms import RemoveModalForm, SimpleGeomForm, NewDocumentForm, 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, \ @@ -54,6 +55,7 @@ def index_view(request: HttpRequest): ) context = { "table": table, + TAB_TITLE_IDENTIFIER: _("Eco-account - Overview"), } context = BaseContext(request, context).context return render(request, template, context) @@ -96,6 +98,7 @@ def new_view(request: HttpRequest): context = { "form": data_form, "geom_form": geom_form, + TAB_TITLE_IDENTIFIER: _("New Eco-Account"), } context = BaseContext(request, context).context return render(request, template, context) @@ -153,6 +156,7 @@ def edit_view(request: HttpRequest, id: str): context = { "form": data_form, "geom_form": geom_form, + TAB_TITLE_IDENTIFIER: _("Edit {}").format(acc.identifier), } context = BaseContext(request, context).context return render(request, template, context) @@ -223,6 +227,7 @@ def detail_view(request: HttpRequest, id: str): "LANIS_LINK": acc.get_LANIS_link(), "deductions": deductions, "actions": actions, + TAB_TITLE_IDENTIFIER: f"{acc.identifier} - {acc.title}", } context = BaseContext(request, context).context return render(request, template, context) @@ -546,10 +551,15 @@ def report_view(request:HttpRequest, id: str): template = "compensation/report/eco_account/report.html" acc = get_object_or_404(EcoAccount, id=id) + tab_title = _("Report {}").format(acc.identifier) # If intervention is not recorded (yet or currently) we need to render another template without any data if not acc.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( @@ -586,6 +596,7 @@ def report_view(request:HttpRequest, id: str): "parcels": parcels, "actions": actions, "deductions": deductions, + 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 097aff994d6ce0453171b0f4a589c1d019648987..b80bbd8bbfa518373de989dea0adc5ff09c6e48b 100644 GIT binary patch delta 10059 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 M==gmHv#(bBAG%6oK>z>% delta 10009 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 M@>=_f4?9=se{Te0wEzGB diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index 8e2ef9c4..30a1c3c5 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:17+0100\n" +"POT-Creation-Date: 2022-01-20 12:22+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -452,7 +452,7 @@ msgstr "Vereinbarungsdatum" msgid "When did the parties agree on this?" msgstr "Wann wurde dieses Ökokonto offiziell vereinbart?" -#: compensation/forms/forms.py:340 +#: compensation/forms/forms.py:340 compensation/views/eco_account.py:101 msgid "New Eco-Account" msgstr "Neues Ökokonto" @@ -1067,11 +1067,12 @@ msgstr "Kompensation {} hinzugefügt" msgid "Compensation {} edited" msgstr "Kompensation {} bearbeitet" -#: compensation/views/compensation.py:156 intervention/views.py:309 +#: compensation/views/compensation.py:156 compensation/views/eco_account.py:159 +#: intervention/views.py:309 msgid "Edit {}" msgstr "Bearbeite {}" -#: compensation/views/compensation.py:235 compensation/views/eco_account.py:309 +#: compensation/views/compensation.py:235 compensation/views/eco_account.py:314 #: ema/views.py:183 intervention/views.py:482 msgid "Log" msgstr "Log" @@ -1080,86 +1081,91 @@ msgstr "Log" msgid "Compensation removed" msgstr "Kompensation entfernt" -#: compensation/views/compensation.py:279 compensation/views/eco_account.py:461 +#: compensation/views/compensation.py:279 compensation/views/eco_account.py:466 #: ema/views.py:350 intervention/views.py:132 msgid "Document added" msgstr "Dokument hinzugefügt" -#: compensation/views/compensation.py:348 compensation/views/eco_account.py:355 +#: compensation/views/compensation.py:348 compensation/views/eco_account.py:360 #: ema/views.py:288 msgid "State added" msgstr "Zustand hinzugefügt" -#: compensation/views/compensation.py:369 compensation/views/eco_account.py:376 +#: compensation/views/compensation.py:369 compensation/views/eco_account.py:381 #: ema/views.py:309 msgid "Action added" msgstr "Maßnahme hinzugefügt" -#: compensation/views/compensation.py:390 compensation/views/eco_account.py:441 +#: compensation/views/compensation.py:390 compensation/views/eco_account.py:446 #: ema/views.py:330 msgid "Deadline added" msgstr "Frist/Termin hinzugefügt" -#: compensation/views/compensation.py:412 compensation/views/eco_account.py:398 +#: compensation/views/compensation.py:412 compensation/views/eco_account.py:403 #: ema/views.py:420 msgid "State removed" msgstr "Zustand gelöscht" -#: compensation/views/compensation.py:434 compensation/views/eco_account.py:420 +#: compensation/views/compensation.py:434 compensation/views/eco_account.py:425 #: ema/views.py:442 msgid "Action removed" msgstr "Maßnahme entfernt" -#: compensation/views/compensation.py:452 intervention/views.py:546 +#: compensation/views/compensation.py:452 compensation/views/eco_account.py:554 +#: intervention/views.py:546 msgid "Report {}" msgstr "Bericht {}" -#: compensation/views/eco_account.py:89 +#: compensation/views/eco_account.py:58 +msgid "Eco-account - Overview" +msgstr "Ökokonten - Übersicht" + +#: compensation/views/eco_account.py:91 msgid "Eco-Account {} added" msgstr "Ökokonto {} hinzugefügt" -#: compensation/views/eco_account.py:146 +#: compensation/views/eco_account.py:149 msgid "Eco-Account {} edited" msgstr "Ökokonto {} bearbeitet" -#: compensation/views/eco_account.py:257 +#: compensation/views/eco_account.py:262 msgid "Eco-account removed" msgstr "Ökokonto entfernt" -#: compensation/views/eco_account.py:285 +#: compensation/views/eco_account.py:290 msgid "Deduction removed" msgstr "Abbuchung entfernt" -#: compensation/views/eco_account.py:330 ema/views.py:263 +#: compensation/views/eco_account.py:335 ema/views.py:263 #: intervention/views.py:524 msgid "{} unrecorded" msgstr "{} entzeichnet" -#: compensation/views/eco_account.py:330 ema/views.py:263 +#: compensation/views/eco_account.py:335 ema/views.py:263 #: intervention/views.py:524 msgid "{} recorded" msgstr "{} verzeichnet" -#: compensation/views/eco_account.py:531 intervention/views.py:505 +#: compensation/views/eco_account.py:536 intervention/views.py:505 msgid "Deduction added" msgstr "Abbuchung hinzugefügt" -#: compensation/views/eco_account.py:616 ema/views.py:520 +#: compensation/views/eco_account.py:627 ema/views.py:520 #: intervention/views.py:380 msgid "{} has already been shared with you" msgstr "{} wurde bereits für Sie freigegeben" -#: compensation/views/eco_account.py:621 ema/views.py:525 +#: compensation/views/eco_account.py:632 ema/views.py:525 #: intervention/views.py:385 msgid "{} has been shared with you" msgstr "{} ist nun für Sie freigegeben" -#: compensation/views/eco_account.py:628 ema/views.py:532 +#: compensation/views/eco_account.py:639 ema/views.py:532 #: intervention/views.py:392 msgid "Share link invalid" msgstr "Freigabelink ungültig" -#: compensation/views/eco_account.py:651 ema/views.py:555 +#: compensation/views/eco_account.py:662 ema/views.py:555 #: intervention/views.py:415 msgid "Share settings updated" msgstr "Freigabe Einstellungen aktualisiert" From 9e8d4fc753821f9d1cd6ab3b2a14e0fb93e1975a Mon Sep 17 00:00:00 2001 From: mpeltriaux <michel.peltriaux@sgdnord.rlp.de> Date: Thu, 20 Jan 2022 12:26:22 +0100 Subject: [PATCH 4/5] # 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 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 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 <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\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" From 648e287144a45d8791311bb82bc0b11078c0877a Mon Sep 17 00:00:00 2001 From: mpeltriaux <michel.peltriaux@sgdnord.rlp.de> Date: Thu, 20 Jan 2022 12:31:20 +0100 Subject: [PATCH 5/5] # 70 Tab title rest * adds tab titles for some other pages * adds/updates translations --- konova/views.py | 2 ++ locale/de/LC_MESSAGES/django.mo | Bin 34615 -> 34713 bytes locale/de/LC_MESSAGES/django.po | 24 ++++++++++++++++-------- news/views.py | 3 +++ user/views.py | 4 ++++ 5 files changed, 25 insertions(+), 8 deletions(-) diff --git a/konova/views.py b/konova/views.py index 1f16b9ea..abfea284 100644 --- a/konova/views.py +++ b/konova/views.py @@ -18,6 +18,7 @@ from konova.contexts import BaseContext from konova.decorators import any_group_check from konova.forms import RemoveModalForm from konova.models import Deadline +from konova.sub_settings.context_settings import TAB_TITLE_IDENTIFIER from news.models import ServerMessage from konova.settings import SSO_SERVER_BASE @@ -92,6 +93,7 @@ def home_view(request: HttpRequest): "user_compensation_count": user_comps.count(), "total_eco_count": eco_accs.count(), "user_eco_count": user_ecco_accs.count(), + TAB_TITLE_IDENTIFIER: _("Home"), } context = BaseContext(request, additional_context).context return render(request, template, context) diff --git a/locale/de/LC_MESSAGES/django.mo b/locale/de/LC_MESSAGES/django.mo index 87ac689b8766276b9b18c7238f66d14bfc9d74cf..619b6ef4f243212e38b6b5aceaefebcb847129ec 100644 GIT binary patch delta 8206 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 Gq5lILI~VK# delta 8113 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 UHyICP?3&T1_HDa1l-&saAIM_)F#rGn diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index a56e6ff0..46827b72 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:25+0100\n" +"POT-Creation-Date: 2022-01-20 12:30+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -1885,7 +1885,11 @@ msgstr "{} wurde erfolgreich vom Nutzer {} geprüft! {}" msgid "missing" msgstr "fehlt" -#: konova/views.py:115 +#: konova/views.py:96 templates/navbars/navbar.html:16 +msgid "Home" +msgstr "Home" + +#: konova/views.py:117 msgid "Deadline removed" msgstr "Frist gelöscht" @@ -1913,7 +1917,7 @@ msgstr "Ältere ..." msgid "All" msgstr "Alle" -#: news/templates/news/index.html:9 +#: news/templates/news/index.html:9 news/views.py:34 msgid "News" msgstr "Neuigkeiten" @@ -2182,10 +2186,6 @@ msgstr "" msgid "KSP" msgstr "" -#: templates/navbars/navbar.html:16 -msgid "Home" -msgstr "Home" - #: templates/navbars/navbar.html:40 msgid "More" msgstr "Mehr" @@ -2300,10 +2300,18 @@ msgstr "Benachrichtigungseinstellungen ändern" msgid "Notification settings" msgstr "Benachrichtigungen" -#: user/views.py:52 +#: user/views.py:29 +msgid "User settings" +msgstr "Einstellungen" + +#: user/views.py:55 msgid "Notifications edited" msgstr "Benachrichtigungen bearbeitet" +#: user/views.py:67 +msgid "User notifications" +msgstr "Benachrichtigungen" + #: venv/lib/python3.7/site-packages/bootstrap4/components.py:17 #: venv/lib/python3.7/site-packages/bootstrap4/templates/bootstrap4/form_errors.html:3 #: venv/lib/python3.7/site-packages/bootstrap4/templates/bootstrap4/messages.html:4 diff --git a/news/views.py b/news/views.py index d386de01..a556e4cc 100644 --- a/news/views.py +++ b/news/views.py @@ -2,8 +2,10 @@ from django.contrib.auth.decorators import login_required from django.http import HttpRequest from django.shortcuts import render from django.utils import timezone +from django.utils.translation import gettext_lazy as _ from konova.contexts import BaseContext +from konova.sub_settings.context_settings import TAB_TITLE_IDENTIFIER from news.models import ServerMessage @@ -29,6 +31,7 @@ def index_view(request: HttpRequest): context = { "news": news, + TAB_TITLE_IDENTIFIER: _("News"), } context = BaseContext(request, context).context return render(request, template, context) diff --git a/user/views.py b/user/views.py index 13fecf5c..59796752 100644 --- a/user/views.py +++ b/user/views.py @@ -1,5 +1,7 @@ from django.contrib import messages from django.contrib.auth.decorators import login_required + +from konova.sub_settings.context_settings import TAB_TITLE_IDENTIFIER from user.models import User from django.http import HttpRequest from django.shortcuts import render, redirect, get_object_or_404 @@ -24,6 +26,7 @@ def index_view(request: HttpRequest): template = "user/index.html" context = { "user": request.user, + TAB_TITLE_IDENTIFIER: _("User settings"), } context = BaseContext(request, context).context return render(request, template, context) @@ -61,6 +64,7 @@ def notifications_view(request: HttpRequest): context = { "user": user, "form": form, + TAB_TITLE_IDENTIFIER: _("User notifications"), } context = BaseContext(request, context).context return render(request, template, context)