From 85d74683e8023db6b3a860ea42d867fcc27dda32 Mon Sep 17 00:00:00 2001 From: Emanuel Schuetze Date: Sun, 4 Sep 2011 12:21:38 +0200 Subject: [PATCH 01/11] Updated translations. --- openslides/locale/de/LC_MESSAGES/django.mo | Bin 21485 -> 21889 bytes openslides/locale/de/LC_MESSAGES/django.po | 362 +++++++++++---------- 2 files changed, 192 insertions(+), 170 deletions(-) diff --git a/openslides/locale/de/LC_MESSAGES/django.mo b/openslides/locale/de/LC_MESSAGES/django.mo index d75b8bd90a861a31bdd2f20b5095d5df98f7693d..48fc3f0c5328de23d483b627626b11a7ea55f1cc 100644 GIT binary patch delta 7554 zcmZwM2Xs|M9>?){2_%6e5JKn#ULb*xP6)wJLRW#90%D;_2oDUTnS_o!P!~i+qfb~H zC@K~#5uRWHSum(rP$^bWSj2*$pdtdX?Dv;Dc-TFAkN0nGGW??(b!4jN?F}M%u!u*P% zs7{+f7=~a648m9pHpXibDYT@a7dFAmFdhp~7tXimm!QV95+iUuhT|60eQ(?LeW(E+ zMGfFIYTzc?={F74&$SrM^Gz9r9yHv6EpRh-!(G@NPuhB$PRxROHa5mlsF@bvl{f*H z;RalXS)H8;96}A`8&n2ZKvT?Tj!T)!`J>%t}!MT7YeE1u7%!P&0fMHS?{g z>)%9DYWCauLDU1kM=jYesDT8rPBId`dO#-%npv7XF#vVL2wR_k%Ea}kRMuc0+>ZV5 zEM{Ux7y81P*a&Y!E!AD90Y8Eo=nJTcZtFt+8`jQVxX)gA6gBeGn1p}W^9fy@rRj(K zXQuE+_b){)NewCkt5ADtjcwnEdf>~b%~)sad%Kc*sX#gdMRl0Z9+F5vKN>*=Yn92r#&1S zVJ51BeyAlHf_l(cRB9)puA7N{u>y7fGsqik_Ms6@NW-~>UU*Vy*wZQXCJbM%^h6qJFlP!A4gr;!BH7PTn{ zAg9boWHrnUs3lp6Yzwmn^`IT7e)gc2s2+7)Q>L%$T4DfZqTZ$~Y_IpffP%hcCD;m= zqSopmRH`a(qnVo&PtV=vUnRLDTDMlzLx zQalH>Db}D;UyHhMtMvqGART!pHIO)Lf=S3Hz+|EZb`3Vgi5Q00qcSoJ)&FwT^Bzbd z|DhCi(4Y^;Zd9sHU>N?1N^xkiQ}2SRr=mK%6!oBS7>pj&fJ#vVoP*j6i%imPKfjxryE<9n| z*V}q6YG8iUgI_}}`7UJ7c+GwaO2rw}i2g#QG?Fc=6ec47mN0`b0w-8YQ3F_nO6|?4 zfz)6)u0npf&Eu#CzmCmuw>|#_2I>7j-caCo8I`(o*cn|+R|AVdt!)CTqhYq5hx(8d zqf)#Cm4O=665fm23$-`^Kf@u|rWapV9EXW|{~w~ja+_Vqbf$V;WB0}Y9L?nj{pt)7mUI<{*j<1=!?_w8r0s}j>_cGKIC5=o}{5A{%%i1 zT;hzdgEbcUXPik!&1@v{OfwpF|E;J8tweoC{HRRrMNRB5Y62%v1Fc65Ff@z&D|K$Z zzr5n6JI3Q!Y=MhVBd);&d=d4)L$>_{>TQT%J#<}f)SkH(_24O}OPjl_CPQ@Q0<|p zfweBQnTXd!4s=o-jT%v^bs)B*o`;%QF}A{mw*4MdYM;eK+T+WSxsUWc0D%cvXQKrPw(sP>Og_aDJvJcXLbSz8a` zWmo1Rup`E!mT)*W;rS+?f?k_(_JTW59X*YD&<0Gwmr z%-3QdZm{i}tlLlnc?-3N_6#NeTC*cGXeK|QQgsH~W3yq-gLCmhk9T%vrWPj)FvN4ocwFVVbz*YkCf~_FQBd>HUwt!WsDx z45L2QIt9b2m!mqq5w$nflIwFf@Je)uDXVnVKy!A#VB15leW7sIi{Iv>4ixRruZ zx61moycOe`&UJlJOO%UR`x&SiE=Emc4Qk*UQ1`u!>VH25<9Db` zpUNlyZVG?Upc^|CI5+e})%&9clxN!~S&Oj;?bWCZuEEauEb99AP_O9$)KZzz&eC+n z0II2|y_4>xpj75zIxa*uxT!_%HRmw}bH+F>Kz=#RdejHy7%Ih`uXH{rvDlLOK+MH4 z7>SRfUdv7P{5D(n?xmm(4p0}Ji> zYIITmiqMbL4a6mcjw5>iwNW$xrL!$p{)y*^w+X!_>MWf0zfhUcAarO$YO`%5b`ztC zSBOZi?L+LRtm6ZR|N86Z{2jC`;`t57AO|zl%4E$6;xVE<7e9*`L~F|b@6e|D-y@3# zb^io0k9d;Hc#r0obsNlbCImGs(s&|iVY(e9#lzZYSTtGZUgi?PIlP|hyGj;6|9nrLZi2Cp( z5j`%tZZ-7;>i@tCM-7F`3HGg-p#*ibH}s()&Xymbtm8bP-5hV*k5j&zSV&xaOr$cH z&^y1C=xeXn@5RSNXX=086~x6yQx^*~!nRagbS9tjY(l@$zY+HnI?9RkhLZC?)%1$3 zBt9ixCXNx^cvu9+;%%s-h!|)GbqnPJ;yvOEZIDq!CDEGD@hH)RiznlkgpTgi2NPFO z?v20WTSO-1cTmU8#C61TL=x?rZ~~D`+(qc%ZEQH^TD=}y5OKELn45Lj@ph92)+H@wX>&meAMk8{#G6pM;K|h!CP3aV?QXzuT}@>))KhuY?Xak)r~~6bJJR zE+v|AQ*Yd1+dEO$|7kIv`XQp4c$fHv=uFHZ9wc-uCYll*2pw&S=|oGd|KA6lT}Gvt zNF`jVJdh;Z9>55`dc9;Xpiw!JHDI({T#h(ux?p`#n|IdL`7pX>JF zO@s~~(UEAZJ07R-2yq{g#f4>f;dq$B(?oMU$Um`tv@67Ym8Y_*xV+3?)!}HM|CP>9 zxtdjYDocy2-Lst&zJW2@{hhje5D-yXQC?Z?t|+XmE-osrC@k}RAA8FGRov%|gA1#w z=9E`X^>0axcZF2gn(vdOv>>N@-=9gh_~#`bas`eZo#V?--5vnV(z^RDODk{Le@b>- zRsYl}+3v!kB2PuNXKIS?xwI!cc}j}POFiyt&)jNv{Iv2)p6oovoj>f-9{$liuXBYL zReB1mJ#J2VrWX6QrGMIba8XhDtg>piZpf?fl#MAVp6aRc)%02vNRux-BfH6keyV&U zGgbs=xO=AeP4DUdGNW5SPsM&$-Haw}7>U$LhlWB24{_zvc-XmwGlX3i&7Jh3{(H#zT< z9#e!8A^_ZN{hTiKoS5|u}eUFYA^&jU= Bl1cyo delta 7308 zcmZwL30Rd?9>?)>0YMP~5ky=si@1RZiu;PYxaLxkmZ&$N^onrNqUCC8|w*v%VkV+JXg<{rzpSQNUg?9ZE8#m7Gf68!8lxtNw^tj;yz5qUd@b@)G zi?J^HFdT2g2wa48;Wt$j=+mshwzvUx;YZE|<_N}9{~lv8luMIN z9)%k4)u`t#K|N;^w!pWs9sQe=6dKYHLu)!FV;dZ1>!lb)eHqrlb*LF`zzMho@50EI zWDXxhO`v-#XCVDh8OTTGU?yN9mSVi0!rc^_;40LOFQZ2On)N$Whb`RB%-f;{+!ghp zVW|72qB2l~%FH}erWT-5ejlp73^kyq(66=JNI@xk!}w92a*hP-kOlYz0|v)maIn#`PYa?(4dhOpk`W(nnAg}@HW(SOHm_V zjTyM!o$PgDl_qxSVM+detf?{qkghG%d8TGAt^O#X~|PMtJoAW_Ia)}Nocum|dbD^Mf88r$J@=*A`X z{04jeC2ULkRt&>qsQXW%W_kvd(Q_DvA+5;*MxgG?L*7{9zmbAcawlp{9z(79v&g

!_C4X71r0O_c`(*c#)zD~Q}jJ6Hqt<$aLs0=Jb zb^JUs8M6&Fz@x}NbDAGy*ED1&YM{BuHZXlr9TlRUGY7RqD^S;MKGLDcJX z7?ql{s4rX;`AWca)Kc|EWo#m9U?r&Qeb)Q1G4&0|Kl27Zv=paN_x)z;QH-h~{hOu~ z^neUhiiTo17GMu7L=9vGD%D$1GkF*5;$hVFCs3*W1~v2VQLpKr*2wmxpL%0!9{RIs z@KWfEYcLBBV9k5Z)k<+9YH##KrG5)UO852}Ns7=foy1Njj(unVY6xiXz4 zj70UDno0h(Tf5Mpl=ei8Y&fdpDX0g}Mm?|+HKRqSy|4teG*2K|Hr1#l`U=&-MU29z zj?QzEPyiZqwb4D4I~ED zQ4(q?(@-<*gxV8%s0_?N2I4ofC@7WlQK?&wvAEH?1J%KPR4PA44d4Vez*ER?U~?YT zaeTIup;oB#S*V%zu?|9IDj)0W{U1+3Yd9J8fVsB50QEgsfl6f%^@V#AwN!ghYknO2 zV13e+hr@9IR-u+~AF?Xu0y0L^j#rIaOaX@J{jZ{+kv@Pu@o|j7BdC#|MrGzKYUJTv zoD4);<54MXiuwa16_xsawmlz}u?eV&6reI$f_|;pTnab1SOQeX-{v|ayomACGx=q% z6z5?PPDSmRy{L?xK|SzSTMy%p0Szd|+64I{%Os;F&=+~M8PbjX>&9DYPzOs;@BMmI zM)sg)asV~*W2gcCfEw5(REFZaGe~TP+PuTDA(o*Ax(M6jGpPPPvhByZlYi~*Fut?8 zupMgTqfi}BLT$cjcr6y;65NBUa4hSk0ep`d@Gq#0hVo}nEH=P6Y>66BHa5nAsOt*+ z6j)X>1N-8msFWT;&G-Z=b!Slzitg=nl#ETNXQ4LbFxx&7HShvdrmna3xwd`>HlqDO ztN&>V8u=@jh?!~WPC8I!rq*0-ZFcmZ2uOJ<{q3_{I(3~E4y z);XA@_kRHe&1?ngi?-1@VctTe{&VbrU!XD))6ZGsmZ%TPP}CBXSW8h$I1gLleAEQj zpi;jPHK5%Xr}zI51c(GD57ac(9)Ws5JZkr*pk~q@Rqu()Tpl*Z0@Tdsq1N~g z%*HCz`PWhReTw1qZ@!?=5l^F1m^8q-pbshogHhjw5vT_*Mh)Gs?91J*M^hTW@j5#>g))%4%xD>SnkE33vqYVC_L1*@=$-v1XU=u^5E z>tom`Csnbi8xv8Rtt~ddA=U}jX{Zd9S{K^(M^FP^he~}lX5cQ=Tks?LGb#K+fzP%{ z9qs)3Eks=~AGOIAV<_HZy$_X<07m0_)DpamTCzQ;J@XkxV(b{_`evvl$wFP1KZg8k zp9CiIUTfcb!KuOKAU@Y+C+_8tGeV;CPg9(;lU(Ih5uvhzrCt;%DN0qMXoiC2<$QXTm&B z=+Fm^`PKaYpz1olbEx^*S^X=`5w?^5loKgGhV03j|5Va?>F7ecKE;jfwST94iI_|1 zOSywsO6XWfTt!@`3dfg3KVm-NBa|T>M>YS66tpXKR63Yc+sTL2(8 z<=h$cI89~}wxjI@j3yE&@5gu?h&uk}aQWwhl4(lXWIXu{3r2}Z404I$L|g%-PU8UHEk(MyN)5m zkHl%BIVZc~O++f8V}rxxpT{V@ZEGX(BvIc!ype4eMZ`YhKH>n8LDU{ADAe@dh8sV( ztlI42_1`x?Zk^jHqn64v5rV45{N0pdqg<#9I=a7MzkPweCA*t!W8<@ zv7mPS(^aE!p5z!$)Fpl(_7H7|Q^YsK%|s8b{Rnleb}%5^uSu%;)xc=D7JTpps?%8F|v;tL~KMBn5a#P^k zE1X{J2`(78GCY_*VyY{!GQU^gO#YVOrjdO@0vATV8`wLhb3&fSTfw8t?8JFug|{eh zVa(FN(_{AqSC8|%65SQE+?NOKDe+cTlzB>~7YB03{}AXmVP)Xhg#19ai6j04!o*r! diff --git a/openslides/locale/de/LC_MESSAGES/django.po b/openslides/locale/de/LC_MESSAGES/django.po index c1644c169..7bdc23036 100644 --- a/openslides/locale/de/LC_MESSAGES/django.po +++ b/openslides/locale/de/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-09-03 19:22+0200\n" +"POT-Creation-Date: 2011-09-04 12:21+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -32,7 +32,7 @@ msgstr "Englisch" #: application/templates/application/view.html:73 #: assignment/templates/assignment/poll_view.html:15 #: assignment/templates/assignment/view.html:159 poll/forms.py:45 -#: utils/pdf.py:328 utils/pdf.py:368 utils/utils.py:35 +#: utils/pdf.py:382 utils/pdf.py:424 utils/utils.py:35 msgid "Yes" msgstr "Ja" @@ -47,11 +47,11 @@ msgstr "Ja, mit allen Kindelementen." #: application/templates/application/view.html:74 #: assignment/templates/assignment/poll_view.html:16 #: assignment/templates/assignment/view.html:160 poll/forms.py:46 -#: utils/pdf.py:329 utils/pdf.py:368 utils/utils.py:35 +#: utils/pdf.py:383 utils/pdf.py:424 utils/utils.py:35 msgid "No" msgstr "Nein" -#: agenda/api.py:67 participant/views.py:129 participant/views.py:207 +#: agenda/api.py:67 participant/views.py:131 participant/views.py:209 #: utils/utils.py:40 #, python-format msgid "Do you really want to delete %s?" @@ -62,7 +62,7 @@ msgid "Parent item" msgstr "Elternelement" #: agenda/models.py:35 application/forms.py:23 -#: application/templates/application/view.html:235 +#: application/templates/application/view.html:236 msgid "Title" msgstr "Titel" @@ -70,7 +70,7 @@ msgstr "Titel" msgid "Closed" msgstr "Abgeschlossen" -#: agenda/models.py:37 agenda/templates/agenda/overview.html:58 +#: agenda/models.py:37 agenda/templates/agenda/overview.html:60 msgid "Weight" msgstr "Gewichtung" @@ -84,80 +84,79 @@ msgid "No Form for itemtype %s" msgstr "Kein Formular für Eintrag %s" #: agenda/models.py:189 application/forms.py:24 -#: application/templates/application/view.html:236 poll/models.py:108 +#: application/templates/application/view.html:237 poll/models.py:108 msgid "Text" msgstr "Text" -#: agenda/models.py:199 agenda/templates/agenda/overview.html:105 +#: agenda/models.py:199 agenda/templates/agenda/overview.html:109 #: agenda/templates/beamer/ItemApplication.html:5 #: application/templates/application/edit.html:2 #: application/templates/application/poll_view.html:8 #: application/templates/application/poll_view.html:16 #: application/templates/application/view.html:2 #: application/templates/application/view.html:208 poll/models.py:23 -#: poll/models.py:110 system/templates/system/general.html:13 utils/pdf.py:263 -#: utils/pdf.py:265 utils/pdf.py:297 utils/pdf.py:305 utils/pdf.py:315 -#: utils/pdf.py:323 +#: poll/models.py:110 system/templates/system/general.html:13 utils/pdf.py:314 +#: utils/pdf.py:316 utils/pdf.py:349 utils/pdf.py:357 utils/pdf.py:368 +#: utils/pdf.py:377 msgid "Application" msgstr "Antrag" -#: agenda/models.py:206 agenda/templates/agenda/overview.html:118 +#: agenda/models.py:206 agenda/templates/agenda/overview.html:122 #: agenda/templates/beamer/ItemAssignment.html:4 #: assignment/templates/assignment/edit.html:2 poll/models.py:24 -#: utils/pdf.py:346 utils/pdf.py:354 +#: utils/pdf.py:401 utils/pdf.py:410 msgid "Election" msgstr "Wahl" #: agenda/models.py:213 agenda/templates/beamer/ItemApplication.html:20 #: assignment/templates/assignment/poll_view.html:2 poll/models.py:111 -#: utils/pdf.py:315 +#: utils/pdf.py:368 msgid "Poll" msgstr "Abstimmung" #: agenda/views.py:74 agenda/templates/agenda/base_agenda.html:7 #: agenda/templates/agenda/overview.html:3 #: agenda/templates/agenda/overview.html:38 -#: agenda/templates/agenda/overview.html:67 +#: agenda/templates/agenda/overview.html:71 #: agenda/templates/beamer/overview.html:3 -#: agenda/templates/beamer/overview.html:10 templates/403.html:8 -#: templates/404.html:8 templates/500.html:8 templates/base.html:48 -#: utils/pdf.py:201 utils/pdf.py:206 +#: agenda/templates/beamer/overview.html:10 templates/base.html:37 +#: utils/pdf.py:207 utils/pdf.py:212 msgid "Agenda" msgstr "Tagesordnung" -#: agenda/views.py:158 agenda/views.py:174 agenda/views.py:197 +#: agenda/views.py:175 agenda/views.py:193 agenda/views.py:216 #, python-format msgid "Item ID %d does not exist." msgstr "Eintrag %d existiert nicht." -#: agenda/views.py:211 +#: agenda/views.py:230 msgid "New item was successfully created." msgstr "Neuer Eintrag erfolgreich angelegt." -#: agenda/views.py:213 +#: agenda/views.py:232 msgid "Agenda item created" msgstr "Tagesordnungseintrag angelegt" -#: agenda/views.py:215 +#: agenda/views.py:234 msgid "Item was successfully modified." msgstr "Eintrag wurde erfolgreich geändert." -#: agenda/views.py:217 +#: agenda/views.py:236 msgid "Agenda item modified" msgstr "Tagesordnungseintrag geändert" -#: agenda/views.py:223 participant/views.py:108 participant/views.py:192 -#: participant/views.py:221 participant/views.py:269 system/views.py:31 -#: system/views.py:57 +#: agenda/views.py:242 participant/views.py:108 participant/views.py:194 +#: participant/views.py:223 participant/views.py:271 system/views.py:32 +#: system/views.py:59 msgid "Please check the form for errors." msgstr "Bitte kontrollieren Sie das Formular nach Fehlern." -#: agenda/views.py:257 +#: agenda/views.py:276 #, python-format msgid "Item %s and his children were successfully deleted." msgstr "Eintrag %s und seine Kindelemente wurde erfolgreich gelöscht." -#: agenda/views.py:263 +#: agenda/views.py:282 #, python-format msgid "Item %s was successfully deleted." msgstr "Eintrag %s wurde erfolgreich gelöscht." @@ -176,12 +175,12 @@ msgid "Beamer view" msgstr "Beameransicht" #: agenda/templates/agenda/edit.html:2 -#: agenda/templates/agenda/overview.html:52 +#: agenda/templates/agenda/overview.html:54 msgid "Item" msgstr "Eintrag" #: agenda/templates/agenda/edit.html:6 -#: agenda/templates/agenda/overview.html:130 +#: agenda/templates/agenda/overview.html:134 msgid "Edit item" msgstr "Eintrag bearbeiten" @@ -243,51 +242,51 @@ msgstr "Abbrechen" msgid "Do you want to save the changed order of agenda items?" msgstr "Möchten Sie die geänderte Reihenfolge der Einträge speichern?" -#: agenda/templates/agenda/overview.html:51 +#: agenda/templates/agenda/overview.html:53 msgid "Beamer" msgstr "Beamer" -#: agenda/templates/agenda/overview.html:54 +#: agenda/templates/agenda/overview.html:56 #: participant/templates/participant/overview.html:23 -#: participant/templates/participant/overview.html:45 utils/pdf.py:230 +#: participant/templates/participant/overview.html:46 utils/pdf.py:237 msgid "Type" msgstr "Typ" -#: agenda/templates/agenda/overview.html:56 +#: agenda/templates/agenda/overview.html:58 #: assignment/templates/assignment/overview.html:24 -#: participant/templates/participant/overview.html:51 +#: participant/templates/participant/overview.html:50 msgid "Actions" msgstr "Aktionen" -#: agenda/templates/agenda/overview.html:67 +#: agenda/templates/agenda/overview.html:71 msgid "items" msgstr "Einträge" -#: agenda/templates/agenda/overview.html:73 +#: agenda/templates/agenda/overview.html:77 msgid "Print agenda" msgstr "Tagesordnung drucken" -#: agenda/templates/agenda/overview.html:110 +#: agenda/templates/agenda/overview.html:114 msgid "Poll of Application" msgstr "Antragsabstimmung" -#: agenda/templates/agenda/overview.html:113 +#: agenda/templates/agenda/overview.html:117 msgid "Poll of Election" msgstr "Wahlen" -#: agenda/templates/agenda/overview.html:127 +#: agenda/templates/agenda/overview.html:131 msgid "Show beamer preview" msgstr "Beamer-Vorschau anzeigen" -#: agenda/templates/agenda/overview.html:131 +#: agenda/templates/agenda/overview.html:135 msgid "Delete item" msgstr "Eintrag löschen" -#: agenda/templates/agenda/overview.html:138 +#: agenda/templates/agenda/overview.html:142 msgid "Select item overview" msgstr "Wähle Eintragsübersicht" -#: agenda/templates/agenda/overview.html:158 +#: agenda/templates/agenda/overview.html:162 msgid "No items available." msgstr "Keine Einträge vorhanden." @@ -298,8 +297,8 @@ msgstr "Keine Einträge vorhanden." #: application/templates/application/view.html:34 #: assignment/templates/assignment/overview.html:10 #: assignment/templates/assignment/overview.html:22 -#: assignment/templates/assignment/view.html:8 utils/pdf.py:280 -#: utils/pdf.py:282 +#: assignment/templates/assignment/view.html:8 utils/pdf.py:331 +#: utils/pdf.py:333 msgid "Status" msgstr "Status" @@ -312,7 +311,7 @@ msgstr "Abstimmungsergebnis" #: application/templates/application/view.html:75 #: assignment/templates/assignment/poll_view.html:17 #: assignment/templates/assignment/view.html:161 poll/forms.py:35 -#: poll/forms.py:47 utils/pdf.py:330 utils/pdf.py:368 +#: poll/forms.py:47 utils/pdf.py:384 utils/pdf.py:424 msgid "Abstention" msgstr "Enthaltung" @@ -321,8 +320,8 @@ msgid "No poll results available." msgstr "Keine Abstimmungen vorhanden." #: agenda/templates/beamer/ItemApplication.html:44 application/forms.py:25 -#: application/templates/application/view.html:219 -#: application/templates/application/view.html:238 utils/pdf.py:268 +#: application/templates/application/view.html:220 +#: application/templates/application/view.html:239 utils/pdf.py:319 msgid "Reason" msgstr "Begründung" @@ -351,7 +350,7 @@ msgstr "Wahlergebnisse" #: agenda/templates/beamer/ItemAssignment.html:42 #: assignment/templates/assignment/poll_view.html:6 -#: assignment/templates/assignment/view.html:119 utils/pdf.py:357 +#: assignment/templates/assignment/view.html:119 utils/pdf.py:413 msgid "ballot" msgstr "Wahlgang" @@ -405,7 +404,7 @@ msgid "Rejected (not permitted)" msgstr "Verworfen (nicht zulässig)" #: application/models.py:44 application/templates/application/overview.html:35 -#: application/templates/application/view.html:9 utils/pdf.py:270 +#: application/templates/application/view.html:9 utils/pdf.py:321 msgid "Submitter" msgstr "Antragsteller" @@ -413,85 +412,69 @@ msgstr "Antragsteller" msgid "Supporters" msgstr "Unterstützer" -#: application/models.py:106 +#: application/models.py:105 msgid "Searching for supporters." msgstr "Auf Unterstützersuche." -#: application/models.py:108 +#: application/models.py:107 msgid "Not yet permitted." msgstr "Noch nicht zugelassen." -#: application/models.py:110 +#: application/models.py:109 msgid "Not yet permitted changes." msgstr "Noch nicht zugelassene Änderungen." -#: application/models.py:154 +#: application/models.py:155 #, python-format msgid "Version %s created" msgstr "Version %s erstellt" -#: application/models.py:163 +#: application/models.py:164 msgid "Supporters removed" msgstr "Unterstützer gelöscht" -#: application/models.py:172 +#: application/models.py:173 #, python-format msgid "Status reseted to: %s" msgstr "Status zurückgesetzt auf: %s" -#: application/models.py:185 +#: application/models.py:186 #, python-format msgid "Supporter: +%s" msgstr "Unterstützer: +%s" -#: application/models.py:195 +#: application/models.py:196 #, python-format msgid "Supporter: -%s" msgstr "Unterstützer: -%s" -#: application/models.py:211 +#: application/models.py:212 #, python-format msgid "Number set: %s" msgstr "Nummer gesetzt: %s" -#: application/models.py:224 +#: application/models.py:225 #, python-format msgid "Version %s permitted" msgstr "Version %s zugelassen" -#: application/models.py:238 +#: application/models.py:239 #, python-format msgid "Version %s not permitted" msgstr "Version %s nicht zugelassen" -#: application/models.py:264 +#: application/models.py:265 msgid "Status modified" msgstr "Status geändert" -#: application/models.py:375 +#: application/models.py:381 msgid "Poll created" msgstr "Abstimmung erstellt" -#: application/models.py:393 -msgid "Can see applications" -msgstr "Anträge anzeigen" - -#: application/models.py:394 -msgid "Can insert new applications" -msgstr "Anträge anlegen" - -#: application/models.py:395 -msgid "Can support applications" -msgstr "Anträge unterstützen" - -#: application/models.py:396 -msgid "Can manage applications" -msgstr "Anträge verwalten" - #: application/views.py:95 -msgid "You have not the necessary rights to edit or insert applications." +msgid "You have not the necessary rights to create or edit applications." msgstr "" -"Sie haben nicht die nötigen Rechte um Anträge einzureichen oder zu " +"Sie haben nicht die nötigen Rechte, um Anträge zu erstellen oder zu " "bearbeiten." #: application/views.py:100 @@ -581,27 +564,28 @@ msgstr "die %s. Abstimmung" msgid "Votes are successfully saved." msgstr "Stimmen erfolgreich gespeichert." -#: application/views.py:366 -msgid "Version accepted" -msgstr "Version akzeptiert" - #: application/views.py:368 -msgid "ERROR by accepting the Version" -msgstr "FEHLER beim Akzeptieren der Version" +#, python-format +msgid "Version %s accepted." +msgstr "Version %s akzeptiert." -#: application/views.py:377 +#: application/views.py:370 +#, python-format +msgid "Do you really want to permit version %s?" +msgstr "Soll Version %s wirklich zugelassen werden?" + +#: application/views.py:379 application/templates/application/view.html:256 msgid "Version rejected" msgstr "Version zurückgewiesen" -#: application/views.py:379 +#: application/views.py:381 msgid "ERROR by rejecting the Version" msgstr "FEHLER beim Zurückweisen der Version" #: application/templates/application/base_application.html:6 #: application/templates/application/overview.html:2 -#: application/templates/application/overview.html:6 templates/403.html:12 -#: templates/404.html:12 templates/500.html:12 templates/base.html:52 -#: utils/pdf.py:287 utils/pdf.py:294 +#: application/templates/application/overview.html:6 templates/base.html:41 +#: utils/pdf.py:339 utils/pdf.py:346 msgid "Applications" msgstr "Anträge" @@ -675,7 +659,7 @@ msgstr "Abstimmung drucken" #: application/templates/application/poll_view.html:16 #: application/templates/application/poll_view.html:19 -#: application/templates/application/view.html:65 utils/pdf.py:326 +#: application/templates/application/view.html:65 utils/pdf.py:380 msgid "Vote" msgstr "Abstimmung" @@ -812,21 +796,37 @@ msgstr "Nur zur Administration:" msgid "Reset" msgstr "Zurücksetzen" -#: application/templates/application/view.html:229 +#: application/templates/application/view.html:214 +msgid "Revision" +msgstr "Überarbeitungen" + +#: application/templates/application/view.html:230 msgid "Revisions" msgstr "Überarbeitungen" -#: application/templates/application/view.html:234 +#: application/templates/application/view.html:235 msgid "Time" msgstr "Zeit" -#: application/templates/application/view.html:259 -#: application/templates/application/view.html:266 -#: application/templates/application/view.html:273 +#: application/templates/application/view.html:246 +msgid "Version accepted" +msgstr "Version akzeptiert" + +#: application/templates/application/view.html:249 +msgid "Accept Version" +msgstr "Zugelassene Version" + +#: application/templates/application/view.html:252 +msgid "Reject Version" +msgstr "Verion zurückweisen" + +#: application/templates/application/view.html:265 +#: application/templates/application/view.html:272 +#: application/templates/application/view.html:279 msgid "unchanged" msgstr "unverändert" -#: application/templates/application/view.html:282 +#: application/templates/application/view.html:288 msgid "Log" msgstr "Log" @@ -951,8 +951,7 @@ msgstr "gewählt" #: assignment/templates/assignment/base_assignment.html:11 #: assignment/templates/assignment/overview.html:2 #: assignment/templates/assignment/overview.html:5 -#: assignment/templates/assignment/overview.html:20 templates/403.html:16 -#: templates/404.html:16 templates/500.html:16 templates/base.html:56 +#: assignment/templates/assignment/overview.html:20 templates/base.html:45 msgid "Elections" msgstr "Wahlen" @@ -981,7 +980,7 @@ msgstr "Wahl löschen" msgid "No assignments available." msgstr "Keine Wahlen vorhanden." -#: assignment/templates/assignment/poll_view.html:7 utils/pdf.py:357 +#: assignment/templates/assignment/poll_view.html:7 utils/pdf.py:413 msgid "candidate" msgid_plural "candidates" msgstr[0] "Kandidat" @@ -1036,15 +1035,15 @@ msgstr "Abstimmung löschen" msgid "New ballot" msgstr "Neuer Wahlgang" -#: participant/forms.py:23 +#: participant/forms.py:23 participant/forms.py:34 msgid "First name" msgstr "Vorname" -#: participant/forms.py:24 +#: participant/forms.py:24 participant/forms.py:35 msgid "Last name" msgstr "Nachname" -#: participant/forms.py:64 +#: participant/forms.py:72 msgid "CSV File" msgstr "CSV-Datei" @@ -1053,12 +1052,10 @@ msgid "Not specified" msgstr "Nicht angegeben" #: participant/models.py:22 participant/templates/participant/overview.html:11 -#: participant/templates/participant/overview.html:60 msgid "Male" msgstr "Männlich" #: participant/models.py:23 participant/templates/participant/overview.html:12 -#: participant/templates/participant/overview.html:62 msgid "Female" msgstr "Weiblich" @@ -1079,12 +1076,11 @@ msgid "Staff" msgstr "Mitarbeiter" #: participant/models.py:33 participant/templates/participant/overview.html:10 -#: participant/templates/participant/overview.html:43 msgid "Gender" msgstr "Geschlecht" #: participant/models.py:34 participant/templates/participant/overview.html:16 -#: participant/templates/participant/overview.html:44 utils/pdf.py:230 +#: participant/templates/participant/overview.html:43 utils/pdf.py:237 msgid "Group" msgstr "Gruppe" @@ -1093,7 +1089,7 @@ msgid "Typ" msgstr "Typ" #: participant/models.py:36 participant/templates/participant/overview.html:30 -#: participant/templates/participant/overview.html:46 utils/pdf.py:230 +#: participant/templates/participant/overview.html:44 utils/pdf.py:237 msgid "Committee" msgstr "Amt" @@ -1109,54 +1105,54 @@ msgstr "Neuer Teilnehmer wurde erfolgreich angelegt." msgid "Participant was successfully modified." msgstr "Teilnehmer wurde erfolgreich geändert." -#: participant/views.py:127 +#: participant/views.py:129 #, python-format msgid "Participant %s was successfully deleted." msgstr "Teilnehmer %s wurde erfolgreich gelöscht." -#: participant/views.py:139 +#: participant/views.py:141 #, python-format msgid "Participant %s is now a normal user." msgstr "Teilnehmer %s ist jetzt ein normaler Nutzer." -#: participant/views.py:143 +#: participant/views.py:145 #, python-format msgid "Participant %s is now administrator." msgstr "Teilnehmer %s ist jetzt ein Administrator." -#: participant/views.py:153 +#: participant/views.py:155 #, python-format msgid "Participant %s was successfully deactivated." msgstr "Teilnehmer %s wurde erfolgreich deaktiviert." -#: participant/views.py:157 +#: participant/views.py:159 #, python-format msgid "Participant %s was successfully activated." msgstr "Teilnehmer %s wurde erfolgreich aktiviert." -#: participant/views.py:184 +#: participant/views.py:186 msgid "New group was successfully created." msgstr "Neue Gruppe wurde erfolgreich angelegt." -#: participant/views.py:186 +#: participant/views.py:188 msgid "Group was successfully modified." msgstr "Gruppe wurde erfolgreich geändert." -#: participant/views.py:205 +#: participant/views.py:207 #, python-format msgid "Group %s was successfully deleted." msgstr "Gruppe %s wurde erfolgreich gelöscht." -#: participant/views.py:219 +#: participant/views.py:221 msgid "User settings successfully saved." msgstr "Nutzereinstellungen wurden erfolgreich gespeichert." -#: participant/views.py:267 +#: participant/views.py:269 #, python-format msgid "%d new participants were successfully imported." msgstr "%d neue Teilnehmer wurden erfolgreich importiert." -#: participant/views.py:271 +#: participant/views.py:273 msgid "" "Attention: All existing participants will be removed if you import new " "participants." @@ -1164,20 +1160,19 @@ msgstr "" "Achtung: Alle existierenden Teilnehmer werden gelöscht, wenn Sie neue " "Teilnehmer importieren." -#: participant/views.py:290 +#: participant/views.py:292 #, python-format msgid "The Password for %s was successfully reset." msgstr "Das Passwort für %s wurde erfolgreich zurückgesetzt." -#: participant/views.py:292 +#: participant/views.py:294 #, python-format msgid "Do you really want to reset the password for %s?" msgstr "Soll das Passwort für %s wirklich zurückgesetzt werden?" #: participant/templates/participant/base_participant.html:6 #: participant/templates/participant/overview.html:2 -#: participant/templates/participant/overview.html:5 templates/403.html:20 -#: templates/404.html:20 templates/500.html:20 templates/base.html:60 +#: participant/templates/participant/overview.html:5 templates/base.html:49 msgid "Participants" msgstr "Teilnehmer" @@ -1204,20 +1199,23 @@ msgid "Print participant list" msgstr "Teilnehmerliste drucken" #: participant/templates/participant/base_participant.html:16 -#: participant/templates/participant/import.html:12 -msgid "Import" -msgstr "Import" +msgid "Import participant" +msgstr "Teilnehmer importieren" #: participant/templates/participant/base_participant.html:17 msgid "Generate first passwords" msgstr "Erste Passwörter generieren" +#: participant/templates/participant/base_participant.html:18 +msgid "Print password list" +msgstr "Passwortliste drucken" + #: participant/templates/participant/edit.html:2 poll/models.py:109 msgid "Participant" msgstr "Teilnehmer" #: participant/templates/participant/edit.html:6 -#: participant/templates/participant/overview.html:74 +#: participant/templates/participant/overview.html:66 msgid "Edit participant" msgstr "Teilnehmer bearbeiten" @@ -1255,7 +1253,7 @@ msgid "Delete group" msgstr "Benutzergruppe löschen" #: participant/templates/participant/group_overview.html:20 -#: participant/templates/participant/overview.html:91 +#: participant/templates/participant/overview.html:83 msgid "No participants available." msgstr "Keine Teilnehmer vorhanden." @@ -1275,13 +1273,17 @@ msgstr "" "(Erfordert kommaseparierte Werte: Nachname, Vorname, E-Mail, " "Geschlecht, Gruppe, Typ, Amt)" +#: participant/templates/participant/import.html:12 +msgid "Import" +msgstr "Importiern" + #: participant/templates/participant/login.html:5 #: participant/templates/participant/login.html:13 #: participant/templates/participant/login.html:43 templates/base.html:26 msgid "Login" msgstr "Anmelden" -#: participant/templates/participant/login.html:18 templates/base.html:77 +#: participant/templates/participant/login.html:18 templates/base.html:66 msgid "Close this notification" msgstr "Meldung ausblenden" @@ -1298,15 +1300,15 @@ msgstr "Mitarbeiter" msgid "guest" msgstr "Gast" -#: participant/templates/participant/overview.html:41 utils/pdf.py:230 +#: participant/templates/participant/overview.html:41 utils/pdf.py:237 msgid "First Name" msgstr "Vorname" -#: participant/templates/participant/overview.html:42 utils/pdf.py:230 +#: participant/templates/participant/overview.html:42 utils/pdf.py:237 msgid "Last Name" msgstr "Nachname" -#: participant/templates/participant/overview.html:47 +#: participant/templates/participant/overview.html:47 utils/pdf.py:287 msgid "Username" msgstr "Nutzername" @@ -1318,23 +1320,23 @@ msgstr "E-Mail" msgid "Last Login" msgstr "Letzer Login" -#: participant/templates/participant/overview.html:75 +#: participant/templates/participant/overview.html:67 msgid "Delete participant" msgstr "Teilnehmer löschen" -#: participant/templates/participant/overview.html:77 +#: participant/templates/participant/overview.html:69 msgid "Participiant is activated. Click to deactivate!" msgstr "Teilnehmer ist aktiviert. Zum Deaktivieren klicken!" -#: participant/templates/participant/overview.html:79 +#: participant/templates/participant/overview.html:71 msgid "Participiant is deactivated. Click to activate!" msgstr "Teilnehmer ist deaktiviert, Zum Aktivieren klicken!" -#: participant/templates/participant/overview.html:82 +#: participant/templates/participant/overview.html:74 msgid "Administrator. Click to get normal user!" msgstr "Administrator. Klicken, um normaler Nutzer zu werden!" -#: participant/templates/participant/overview.html:84 +#: participant/templates/participant/overview.html:76 msgid "Normal user. Click to get administrator!" msgstr "Normaler Nutzer. Klicken, um Administrator zu werden!" @@ -1366,50 +1368,53 @@ msgstr "Mehrheit" msgid "No options" msgstr "Keine Wahlmöglichkeiten" -#: system/forms.py:21 -msgid "User registration" -msgstr "Benutzerregistrierung" +#: system/forms.py:22 +msgid "System URL" +msgstr "System URL" -#: system/forms.py:27 +#: system/forms.py:23 +msgid "Welcome text (for password PDF)" +msgstr "Willkommenstext (für Passwort-PDF-Liste)" + +#: system/forms.py:30 msgid "Event name" msgstr "Veranstaltungsname" -#: system/forms.py:28 +#: system/forms.py:31 msgid "Short description of event" msgstr "Kurzbeschreibung der Veranstaltung" -#: system/forms.py:29 +#: system/forms.py:32 msgid "Event date" msgstr "Veranstaltungszeitraum" -#: system/forms.py:30 +#: system/forms.py:33 msgid "Event location" msgstr "Veranstaltungsort" -#: system/forms.py:31 +#: system/forms.py:34 msgid "Event organizer" msgstr "Veranstalter" -#: system/forms.py:37 +#: system/forms.py:40 msgid "Number of (minimum) required supporters for a application" msgstr "Mindestanzahl erforderlicher Unterstützer für einen Antrag" -#: system/forms.py:38 +#: system/forms.py:41 msgid "Application preamble" msgstr "Antragseinleitung" -#: system/views.py:29 +#: system/views.py:30 msgid "System settings successfully saved." msgstr "Systemeinstellungen erfolgreich gespeichert." -#: system/views.py:55 +#: system/views.py:57 msgid "General settings successfully saved." msgstr "Allgemeine Einstellungen erfolgreich gespeichert." #: system/templates/system/base_system.html:7 #: system/templates/system/general.html:2 -#: system/templates/system/system.html:2 templates/403.html:24 -#: templates/404.html:24 templates/500.html:24 templates/base.html:64 +#: system/templates/system/system.html:2 templates/base.html:53 msgid "Configuration" msgstr "Konfiguration" @@ -1418,19 +1423,20 @@ msgstr "Konfiguration" msgid "General" msgstr "Allgemein" -#: system/templates/system/general.html:8 -msgid "Event" -msgstr "Veranstaltung" - +#: system/templates/system/base_system.html:10 #: system/templates/system/system.html:5 msgid "System" msgstr "System" -#: templates/404.html:33 +#: system/templates/system/general.html:8 +msgid "Event" +msgstr "Veranstaltung" + +#: templates/404.html:10 msgid "Page not found." msgstr "Seite nicht gefunden." -#: templates/500.html:33 +#: templates/500.html:9 msgid "Server Error" msgstr "Serverfehler" @@ -1450,39 +1456,55 @@ msgstr "Einstellungen" msgid "Welcome" msgstr "Willkommen" -#: templates/base.html:31 -msgid "Language" -msgstr "Sprache" - -#: utils/pdf.py:165 utils/pdf.py:271 +#: utils/pdf.py:170 utils/pdf.py:322 msgid "%Y-%m-%d %H:%Mh" msgstr "%d.%m.%Y %H:%Mh" -#: utils/pdf.py:178 +#: utils/pdf.py:183 msgid "Printed" msgstr "Gedruckt am" -#: utils/pdf.py:188 utils/pdf.py:196 +#: utils/pdf.py:193 utils/pdf.py:201 msgid "Page" msgstr "Seite" -#: utils/pdf.py:223 +#: utils/pdf.py:230 msgid "Participant-list" msgstr "Teilnehmerliste" -#: utils/pdf.py:228 +#: utils/pdf.py:235 msgid "List of Participants" msgstr "Teilnehmerliste" #: utils/pdf.py:271 +msgid "passwords" +msgstr "Passwörter" + +#: utils/pdf.py:284 +msgid "Your Account for OpenSlides" +msgstr "Ihr Zugang für OpenSlides" + +#: utils/pdf.py:285 +msgid "for" +msgstr "für" + +#: utils/pdf.py:288 +msgid "Password" +msgstr "Passwort" + +#: utils/pdf.py:290 +msgid "URL" +msgstr "URL" + +#: utils/pdf.py:322 msgid "Created" msgstr "Erstellt am" -#: utils/pdf.py:275 +#: utils/pdf.py:326 msgid "Supporter" msgstr "Unterstützer" -#: utils/pdf.py:357 +#: utils/pdf.py:413 msgid "available posts" msgstr "verfügbare Posten" From d1d0e7e9b4c1d3ac39105883080595162c9c48a2 Mon Sep 17 00:00:00 2001 From: Emanuel Schuetze Date: Sun, 4 Sep 2011 12:21:58 +0200 Subject: [PATCH 02/11] Updated permissions. --- openslides/agenda/models.py | 6 ++--- openslides/agenda/views.py | 2 +- openslides/application/models.py | 8 +++---- .../application/base_application.html | 2 +- openslides/application/views.py | 8 +++---- openslides/assignment/models.py | 9 ++++---- .../assignment/templates/assignment/view.html | 2 +- openslides/assignment/views.py | 4 ++-- openslides/participant/models.py | 4 ++-- .../participant/base_participant.html | 8 +++---- .../templates/participant/overview.html | 4 ++-- openslides/participant/views.py | 22 +++++++++---------- openslides/system/models.py | 2 +- openslides/templates/base.html | 8 +++---- openslides/utils/pdf.py | 12 +++++----- 15 files changed, 50 insertions(+), 51 deletions(-) diff --git a/openslides/agenda/models.py b/openslides/agenda/models.py index 3ccb20131..b94925bc1 100644 --- a/openslides/agenda/models.py +++ b/openslides/agenda/models.py @@ -176,9 +176,9 @@ class Item(InheritanceCastModel): class Meta: permissions = ( - ('can_view_agenda', "Can see the agenda"), - ('can_manage_agenda', "Can manage the agenda and its items"), - ('can_see_beamer', "Can see the Beamer"), + ('can_see_agenda', "Can see agenda"), + ('can_manage_agenda', "Can manage agenda"), + ('can_see_beamer', "Can see projector"), ) diff --git a/openslides/agenda/views.py b/openslides/agenda/views.py index e72de845f..519219d26 100644 --- a/openslides/agenda/views.py +++ b/openslides/agenda/views.py @@ -130,7 +130,7 @@ def assignment_votes(item): return votes -@permission_required('agenda.can_view_agenda') +@permission_required('agenda.can_see_agenda') @template('agenda/overview.html') def overview(request): """ diff --git a/openslides/application/models.py b/openslides/application/models.py index 4affe00a5..827fb8de9 100644 --- a/openslides/application/models.py +++ b/openslides/application/models.py @@ -396,10 +396,10 @@ class Application(models.Model): class Meta: permissions = ( - ('can_view_application', _("Can see applications")), - ('can_insert_application', _("Can insert new applications")), - ('can_support_application', _("Can support applications")), - ('can_manage_application', _("Can manage applications")), + ('can_see_application', "Can see application"), + ('can_create_application', "Can create application"), + ('can_support_application', "Can support application"), + ('can_manage_application', "Can manage application"), ) diff --git a/openslides/application/templates/application/base_application.html b/openslides/application/templates/application/base_application.html index 98040c52e..dcf89242b 100644 --- a/openslides/application/templates/application/base_application.html +++ b/openslides/application/templates/application/base_application.html @@ -6,7 +6,7 @@

{%trans "Applications" %}

  • {%trans "All applications" %}
    • - {% if perms.application.can_insert_application or perms.application.can_manage_application %} + {% if perms.application.can_create_application or perms.application.can_manage_application %}
  • {%trans "New application" %}
    • {% endif %}
  • {%trans 'Print all applications' %}
    • diff --git a/openslides/application/views.py b/openslides/application/views.py index 3ae1e6963..433b46f20 100644 --- a/openslides/application/views.py +++ b/openslides/application/views.py @@ -27,7 +27,7 @@ from openslides.utils.pdf import print_application, print_application_poll from openslides.system.api import config_get -@permission_required('application.can_view_application') +@permission_required('application.can_see_application') @template('application/overview.html') def overview(request): """ @@ -61,7 +61,7 @@ def overview(request): } -@permission_required('application.can_view_application') +@permission_required('application.can_see_application') @template('application/view.html') def view(request, application_id): """ @@ -91,8 +91,8 @@ def edit(request, application_id=None): is_manager = False if not is_manager \ - and not request.user.has_perm('application.can_insert_application'): - messages.error(request, _("You have not the necessary rights to edit or insert applications.")) + and not request.user.has_perm('application.can_create_application'): + messages.error(request, _("You have not the necessary rights to create or edit applications.")) return redirect(reverse('application_overview')) if application_id is not None: application = Application.objects.get(id=application_id) diff --git a/openslides/assignment/models.py b/openslides/assignment/models.py index edfd950b8..b400f3d78 100644 --- a/openslides/assignment/models.py +++ b/openslides/assignment/models.py @@ -130,9 +130,8 @@ class Assignment(models.Model): class Meta: permissions = ( - ('can_view_assignment', "Can see the assignments"), - ('can_nominate_other', "Can nominate another person" - " for a election"), - ('can_nominate_self', "Can nominate hisself for a election"), - ('can_manage_assignment', "Can manage assignments"), + ('can_see_assignment', "Can see assignment"), + ('can_nominate_other', "Can nominate another person"), + ('can_nominate_self', "Can nominate themselves"), + ('can_manage_assignment', "Can manage assignment"), ) diff --git a/openslides/assignment/templates/assignment/view.html b/openslides/assignment/templates/assignment/view.html index c91786831..d30a23051 100644 --- a/openslides/assignment/templates/assignment/view.html +++ b/openslides/assignment/templates/assignment/view.html @@ -91,7 +91,7 @@ {% for field in form %} {{ field }} - {% if perms.participant.can_view_participants and perms.participant.can_manage_participants %} + {% if perms.participant.can_see_participant and perms.participant.can_manage_participant %} {% endif %} diff --git a/openslides/assignment/views.py b/openslides/assignment/views.py index d34c9a8b9..46122a888 100644 --- a/openslides/assignment/views.py +++ b/openslides/assignment/views.py @@ -25,7 +25,7 @@ from utils.pdf import print_assignment_poll from participant.models import Profile -@permission_required('assignment.can_view_assignment') +@permission_required('assignment.can_see_assignment') @template('assignment/overview.html') def get_overview(request): query = Assignment.objects @@ -46,7 +46,7 @@ def get_overview(request): } -@permission_required('assignment.can_view_assignment') +@permission_required('assignment.can_see_assignment') @template('assignment/view.html') def view(request, assignment_id=None): form = None diff --git a/openslides/participant/models.py b/openslides/participant/models.py index cbce6d025..89b138a97 100644 --- a/openslides/participant/models.py +++ b/openslides/participant/models.py @@ -49,8 +49,8 @@ class Profile(models.Model): class Meta: permissions = ( - ('can_view_participants', "Can see the list of participants"), - ('can_manage_participants', "Can manage the participant list"), + ('can_see_participant', "Can see participant"), + ('can_manage_participant', "Can manage participant"), ) def set_first_user_passwords(): diff --git a/openslides/participant/templates/participant/base_participant.html b/openslides/participant/templates/participant/base_participant.html index d1bdf68c2..11fe855c7 100644 --- a/openslides/participant/templates/participant/base_participant.html +++ b/openslides/participant/templates/participant/base_participant.html @@ -5,17 +5,17 @@ {% url user_overview as url_useroverview %}

    {%trans "Participants" %}

    {% endblock %} diff --git a/openslides/participant/templates/participant/overview.html b/openslides/participant/templates/participant/overview.html index 409059c82..2258020ff 100644 --- a/openslides/participant/templates/participant/overview.html +++ b/openslides/participant/templates/participant/overview.html @@ -42,7 +42,7 @@ {%trans "Last Name" %} {%trans "Group" %} {%trans "Committee" %} - {% if perms.participant.can_manage_participants %} + {% if perms.participant.can_manage_participant %} {%trans "Type" %} {%trans "Username" %} {%trans "Email" %} @@ -56,7 +56,7 @@ {{ user.last_name }} {{ user.profile.group }} {{ user.profile.committee }} - {% if perms.participant.can_manage_participants %} + {% if perms.participant.can_manage_participant %} {{ user.profile.type }} {{ user.username }} {{ user.email }} diff --git a/openslides/participant/views.py b/openslides/participant/views.py index daada7da3..93c9dc5ca 100644 --- a/openslides/participant/views.py +++ b/openslides/participant/views.py @@ -30,7 +30,7 @@ from utils.pdf import print_userlist, print_passwords from django.db.models import Avg, Max, Min, Count -@permission_required('participant.can_view_participants') +@permission_required('participant.can_see_participant') @template('participant/overview.html') def get_overview(request): query = User.objects @@ -69,7 +69,7 @@ def get_overview(request): 'committees': committees, } -@permission_required('participant.can_manage_participants') +@permission_required('participant.can_manage_participant') @template('participant/edit.html') def edit(request, user_id=None): """ @@ -120,7 +120,7 @@ def edit(request, user_id=None): 'edituser': user, } -@permission_required('participant.can_manage_participants') +@permission_required('participant.can_manage_participant') @template('confirm.html') def user_delete(request, user_id): user = User.objects.get(pk=user_id) @@ -131,7 +131,7 @@ def user_delete(request, user_id): gen_confirm_form(request, _('Do you really want to delete %s?') % user, reverse('user_delete', args=[user_id])) return redirect(reverse('user_overview')) -@permission_required('participant.can_manage_participants') +@permission_required('participant.can_manage_participant') @template('confirm.html') def user_set_superuser(request, user_id): user = User.objects.get(pk=user_id) @@ -145,7 +145,7 @@ def user_set_superuser(request, user_id): messages.success(request, _('Participant %s is now administrator.') % user) return redirect(reverse('user_overview')) -@permission_required('participant.can_manage_participants') +@permission_required('participant.can_manage_participant') @template('confirm.html') def user_set_active(request, user_id): user = User.objects.get(pk=user_id) @@ -159,7 +159,7 @@ def user_set_active(request, user_id): messages.success(request, _('Participant %s was successfully activated.') % user) return redirect(reverse('user_overview')) -@permission_required('participant.can_manage_participants') +@permission_required('participant.can_manage_participant') @template('participant/group_overview.html') def get_group_overview(request): groups = Group.objects.all() @@ -167,7 +167,7 @@ def get_group_overview(request): 'groups': groups, } -@permission_required('participant.can_manage_participants') +@permission_required('participant.can_manage_participant') @template('participant/group_edit.html') def group_edit(request, group_id=None): if group_id is not None: @@ -199,7 +199,7 @@ def group_edit(request, group_id=None): 'group': group, } -@permission_required('participant.can_manage_participants') +@permission_required('participant.can_manage_participant') def group_delete(request, group_id): group = Group.objects.get(pk=group_id) if request.method == 'POST': @@ -231,7 +231,7 @@ def user_settings(request): 'edituser': request.user, } -@permission_required('participant.can_manage_participants') +@permission_required('participant.can_manage_participant') @template('participant/import.html') def user_import(request): try: @@ -277,13 +277,13 @@ def user_import(request): } -@permission_required('participant.can_manage_participants') +@permission_required('participant.can_manage_participant') def gen_passwords(request): set_first_user_passwords() return redirect(reverse('user_overview')) -@permission_required('participant.can_manage_participants') +@permission_required('participant.can_manage_participant') def reset_password(request, user_id): user = User.objects.get(pk=user_id) if request.method == 'POST': diff --git a/openslides/system/models.py b/openslides/system/models.py index 849b88776..aec5a1274 100644 --- a/openslides/system/models.py +++ b/openslides/system/models.py @@ -29,5 +29,5 @@ class Config(models.Model): class Meta: permissions = ( - ('can_manage_system', "Can manage the system"), + ('can_manage_system', "Can manage system configuration"), ) diff --git a/openslides/templates/base.html b/openslides/templates/base.html index eb2ee3650..1cc027228 100644 --- a/openslides/templates/base.html +++ b/openslides/templates/base.html @@ -31,20 +31,20 @@