From 35e41873a04ea65f6150a054fe0e1c1fd9fe73bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Norman=20J=C3=A4ckel?= Date: Tue, 6 Nov 2012 00:02:44 +0100 Subject: [PATCH 1/5] Add UserSlide with new template. --- openslides/participant/models.py | 15 ++++++- .../templates/projector/UserSlide.html | 43 +++++++++++++++++++ 2 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 openslides/participant/templates/projector/UserSlide.html diff --git a/openslides/participant/models.py b/openslides/participant/models.py index 17c5ef832..ce06e5b0c 100644 --- a/openslides/participant/models.py +++ b/openslides/participant/models.py @@ -22,8 +22,11 @@ from openslides.utils.person.signals import receive_persons from openslides.config.models import config from openslides.config.signals import default_config_value +from openslides.projector.api import register_slidemodel +from openslides.projector.projector import SlideMixin -class User(DjangoUser, PersonMixin, Person): +class User(DjangoUser, PersonMixin, Person, SlideMixin): + prefix = 'user' # This is for the slides person_prefix = 'user' GENDER_CHOICES = ( ('male', _('Male')), @@ -111,6 +114,16 @@ class User(DjangoUser, PersonMixin, Person): ) ordering = ('last_name',) + def slide(self): + """ + Returns a map with the data for the slides. + """ + return { + 'shown_user': self, + 'title': self.clean_name, + 'template': 'projector/UserSlide.html'} + +register_slidemodel(User) class Group(DjangoGroup, PersonMixin, Person): person_prefix = 'group' diff --git a/openslides/participant/templates/projector/UserSlide.html b/openslides/participant/templates/projector/UserSlide.html new file mode 100644 index 000000000..3c38a273b --- /dev/null +++ b/openslides/participant/templates/projector/UserSlide.html @@ -0,0 +1,43 @@ +{% extends "base-projector.html" %} + +{% load i18n %} +{% load tags %} + +{% block title %}{{ block.super }} - {{ title }}{% endblock %} + +{% block content %} + + + +

{{ shown_user }}

+

{{ shown_user.email }}

+ +{% endblock %} + +{% block scrollcontent %} +

+

{{ shown_user.about_me|linebreaks }}
+

+ +{% endblock %} From 71790a345b99421518b1725008ea16aedc5d772d Mon Sep 17 00:00:00 2001 From: Emanuel Schuetze Date: Wed, 7 Nov 2012 22:37:33 +0100 Subject: [PATCH 2/5] Fixed some English strings. Updated translations. --- openslides/assignment/views.py | 2 +- openslides/locale/de/LC_MESSAGES/django.mo | Bin 35452 -> 35451 bytes openslides/locale/de/LC_MESSAGES/django.po | 12 ++++-- openslides/locale/fr/LC_MESSAGES/django.mo | Bin 34289 -> 34607 bytes openslides/locale/fr/LC_MESSAGES/django.po | 38 ++++++++++--------- openslides/motion/templates/motion/view.html | 4 +- 6 files changed, 31 insertions(+), 25 deletions(-) diff --git a/openslides/assignment/views.py b/openslides/assignment/views.py index 1db7fa849..02e78bf1b 100644 --- a/openslides/assignment/views.py +++ b/openslides/assignment/views.py @@ -223,7 +223,7 @@ def delother(request, assignment_id, user_id): if not is_blocked: message = _("Do you really want to withdraw %s from the election?") % person else: - message = _("Do you really want to unblock %s from the election?") % person + message = _("Do you really want to unblock %s for the election?") % person gen_confirm_form(request, message, reverse('assignment_delother', args=[assignment_id, user_id])) return redirect(reverse('assignment_view', args=[assignment_id])) diff --git a/openslides/locale/de/LC_MESSAGES/django.mo b/openslides/locale/de/LC_MESSAGES/django.mo index 686ffd6aa3b09a2b39d59257e70288b63a173e57..4428222f58ad5028023fa1b73413cda58bbcb560 100644 GIT binary patch delta 6857 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 PJLKh&ncZAB%9Z\n" "Language-Team: support@openslides.de\n" @@ -25,6 +25,10 @@ msgstr "Deutsch" msgid "English" msgstr "Englisch" +#: global_settings.py:38 +msgid "French" +msgstr "" + #: agenda/forms.py:28 msgid "Parent item" msgstr "Elternelement" @@ -523,7 +527,7 @@ msgstr "Soll %s wirklich von der Wahl zurückgezogen werden?" #: assignment/views.py:226 #, python-format -msgid "Do you really want to unblock %s from the election?" +msgid "Do you really want to unblock %s for the election?" msgstr "Soll %s wirklich für die Wahl freigegeben werden?" #: assignment/views.py:241 @@ -1621,7 +1625,7 @@ msgid "Not permit (reject)" msgstr "Nicht zulassen (verwerfen)" #: motion/templates/motion/view.html:157 -msgid "Set Number" +msgid "Set number" msgstr "Setze Nummer" #: motion/templates/motion/view.html:164 @@ -1633,7 +1637,7 @@ msgid "Result after debate" msgstr "Ergebnis nach der Debatte" #: motion/templates/motion/view.html:189 -msgid "Withdrawed by Submitter" +msgid "Withdrawed by submitter" msgstr "Zurückgezogen durch Antragsteller/in" #: motion/templates/motion/view.html:194 diff --git a/openslides/locale/fr/LC_MESSAGES/django.mo b/openslides/locale/fr/LC_MESSAGES/django.mo index 7a238642c81151985dc051f894fc39610e0849f2..50f308e0a30e2ea25bb447509bd5458dcdbce538 100644 GIT binary patch delta 10095 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 diff --git a/openslides/locale/fr/LC_MESSAGES/django.po b/openslides/locale/fr/LC_MESSAGES/django.po index 165e3ffe0..5cec74118 100644 --- a/openslides/locale/fr/LC_MESSAGES/django.po +++ b/openslides/locale/fr/LC_MESSAGES/django.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: OpenSlides 1.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-07 21:58+0100\n" +"POT-Creation-Date: 2012-11-07 22:35+0100\n" "PO-Revision-Date: 2012-07-28 21:36+0200\n" "Last-Translator: Moira Brülisauer \n" "Language-Team: Französisch <>\n" @@ -27,8 +27,11 @@ msgstr "Allemand" msgid "English" msgstr "Anglais" +#: global_settings.py:38 +msgid "French" +msgstr "" + #: agenda/forms.py:28 -#, fuzzy msgid "Parent item" msgstr "Elément parent" @@ -424,6 +427,7 @@ msgid "The candidate list is already closed." msgstr "La liste des candidats est déjà fermée" #: assignment/models.py:94 +#, python-format msgid "%s does not want to be a candidate." msgstr "%s ne veut pas etre un candidat" @@ -510,20 +514,23 @@ msgstr "" "nominer comme candidat" #: assignment/views.py:218 +#, python-format msgid "Candidate %s was withdrawn successfully." msgstr "Le candidat %s a été rejeté avec succès." #: assignment/views.py:220 +#, python-format msgid "%s was unblocked successfully." msgstr "Le candidat %s a été nominé avec succès." #: assignment/views.py:224 +#, python-format msgid "Do you really want to withdraw %s from the election?" msgstr "Voulez-vous vraiment exclure %s de cette élection?" #: assignment/views.py:226 -#, fuzzy, python-format -msgid "Do you really want to unblock %s from the election?" +#, python-format +msgid "Do you really want to unblock %s for the election?" msgstr "" "Voulez-vous vraiment repermettre a participer %s à cette élection?" @@ -652,6 +659,7 @@ msgstr[0] "%d candidat" msgstr[1] "%d candidats" #: assignment/views.py:545 +#, python-format msgid "%d available post" msgid_plural "%d available posts" msgstr[0] "%d postes disponibles" @@ -1118,6 +1126,7 @@ msgid "Supporter: -%s" msgstr "Partisants: -%s" #: motion/models.py:295 +#, python-format msgid "Number set: %s" msgstr "Numéro inséré: %s" @@ -1277,7 +1286,6 @@ msgstr "" "Vous supportez maintenant cette motion, vous avez vous ajouté avec succès." #: motion/views.py:417 - msgid "You have unsupported this motion successfully." msgstr "Vous avez retiré votre support pour cette motion avec succès. " @@ -1432,6 +1440,7 @@ msgid "Poll" msgstr "Sondage" #: motion/views.py:851 +#, python-format msgid "Motion No. %s" msgstr "Motion No %s" @@ -1624,7 +1633,7 @@ msgid "Not permit (reject)" msgstr "Non autorisé (rejeter)" #: motion/templates/motion/view.html:157 -msgid "Set Number" +msgid "Set number" msgstr "Insérer un numéro" #: motion/templates/motion/view.html:164 @@ -1636,7 +1645,7 @@ msgid "Result after debate" msgstr "Résultat après la discussion" #: motion/templates/motion/view.html:189 -msgid "Withdrawed by Submitter" +msgid "Withdrawed by submitter" msgstr "Retiré par le requérant" #: motion/templates/motion/view.html:194 @@ -1746,12 +1755,10 @@ msgstr "" "Imprimé dans le PDF avec la liste des premiers mots de passe seulement." #: participant/forms.py:118 -#, fuzzy msgid "Sort participants by first name" msgstr "" #: participant/forms.py:119 -#, fuzzy msgid "Disable for sorting by last name" msgstr "" @@ -1834,7 +1841,6 @@ msgid "Can manage participant" msgstr "Peut gérer des participants" #: participant/models.py:119 -#, fuzzy msgid "Use this group as participant" msgstr "" @@ -1911,6 +1917,7 @@ msgid "Do you really want to reset the password?" msgstr "Voulez-vous vraiment reinitialser le mot de passe?" #: participant/views.py:378 +#, python-format msgid "The Password for %s was successfully reset." msgstr "Le mot de passe de %s a été initialisé avec succès" @@ -1921,6 +1928,7 @@ msgstr "" "succès" #: participant/views.py:467 +#, python-format msgid "" "Installation was successfully! Use %(user)s (password: %(password)s) for " "first login.
Important: Please change the password after " @@ -1942,7 +1950,6 @@ msgid "Password successfully changed." msgstr "Le mot de passe a été changé avec succès." #: participant/views.py:562 -#, fuzzy msgid "My motions and elections" msgstr "" @@ -1985,9 +1992,8 @@ msgid "First time passwords as PDF" msgstr "La liste des premiers mots de passe en PDF" #: participant/templates/participant/base_participant.html:38 -#, fuzzy msgid "View participant" -msgstr "Nouveau participant" +msgstr "Afficher participant" #: participant/templates/participant/base_participant.html:45 #: participant/templates/participant/edit.html:8 @@ -2002,9 +2008,8 @@ msgid "Delete participant" msgstr "Supprimer le participant" #: participant/templates/participant/base_participant.html:60 -#, fuzzy msgid "View group" -msgstr "Modifier le groupe" +msgstr "Afficher le groupe" #: participant/templates/participant/base_participant.html:65 #: participant/templates/participant/group_edit.html:8 @@ -2135,7 +2140,6 @@ msgid "Personal Settings" msgstr "Paramètres personnels" #: participant/templates/participant/personal_info_widget.html:5 -#, fuzzy msgid "I submitted the following motions:" msgstr "" @@ -2146,12 +2150,10 @@ msgid "None" msgstr "" #: participant/templates/participant/personal_info_widget.html:24 -#, fuzzy msgid "I support the following motions:" msgstr "" #: participant/templates/participant/personal_info_widget.html:43 -#, fuzzy msgid "I am candidate for the following elections:" msgstr "" diff --git a/openslides/motion/templates/motion/view.html b/openslides/motion/templates/motion/view.html index 28cf76881..f991c88b5 100644 --- a/openslides/motion/templates/motion/view.html +++ b/openslides/motion/templates/motion/view.html @@ -154,7 +154,7 @@ {% trans 'Not permit (reject)' %} {% endif %} {% if "setnumber" in actions %} - {% trans 'Set Number' %} + {% trans 'Set number' %} {% endif %}

{% endif %} @@ -186,7 +186,7 @@ {% trans 'Commited a bill' %}
{% endif %} {% if "wit" in actions %} - {% trans 'Withdrawed by Submitter' %} + {% trans 'Withdrawed by submitter' %} {% endif %} {% endif %}

From 8d599d6428a065d3c02079177dcadd49f2d987c3 Mon Sep 17 00:00:00 2001 From: Emanuel Schuetze Date: Thu, 8 Nov 2012 09:22:23 +0100 Subject: [PATCH 3/5] Fixed type in participants PDF list. --- openslides/participant/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openslides/participant/views.py b/openslides/participant/views.py index 053dae045..8c53601fb 100644 --- a/openslides/participant/views.py +++ b/openslides/participant/views.py @@ -255,7 +255,7 @@ class ParticipantsListPDF(PDFView): Paragraph(user.last_name, stylesheet['Tablecell']), Paragraph(user.first_name, stylesheet['Tablecell']), Paragraph(user.detail, stylesheet['Tablecell']), - Paragraph(_(user.type), stylesheet['Tablecell']), + Paragraph(user.type, stylesheet['Tablecell']), Paragraph(user.committee, stylesheet['Tablecell'])]) t = LongTable(data, style=[ ('VALIGN', (0, 0), (-1, -1), 'TOP'), From 7c75f42d85d56e68bac63a399f4cf07a89bb034c Mon Sep 17 00:00:00 2001 From: Emanuel Schuetze Date: Thu, 8 Nov 2012 09:42:35 +0100 Subject: [PATCH 4/5] Updated translations. --- openslides/locale/de/LC_MESSAGES/django.mo | Bin 35451 -> 35385 bytes openslides/locale/de/LC_MESSAGES/django.po | 68 ++++++++++----------- 2 files changed, 33 insertions(+), 35 deletions(-) diff --git a/openslides/locale/de/LC_MESSAGES/django.mo b/openslides/locale/de/LC_MESSAGES/django.mo index 4428222f58ad5028023fa1b73413cda58bbcb560..17c08c9e27867a884bb3a6789a52b06273d6d19f 100644 GIT binary patch delta 10305 zcmZ|TcUTt3+Q;z~5wHR(Dk|_;KoJWlhzbe{me_0T6%|Ee?`>m`B}OC07EA0$qesQA zvG)>tPdLY*@gy-ZMveXWet+!nUjB3Tx^6x*v$MN1_ss5N@+Q@7Z>pP}p5J|e#qmQn z%PNj<^I6tJH|hauwXA=au`F-Aho$ie7R5qkEvpem7{_BJ>Sv6v(2II#sAc8C%2*0( zVt(w7{+4B1!zk#%bBvo%&pwSM@MjE0uX2`E1uLR%+ygzaALhcLrhNhyqCOpUemVN$ zI?RiEP!l?dfjr;3LBWHD=U4#WVovl4vn)R>iaH;Tx4O>iWr; z8$U_f67}G9s0Zx8Nq7iPVx0<>)d_P} zw5+z+8`bY17Q-{B0X;xv`Y~#vc~~zykb;YX3*(I4P$Qm*N_DEKFGHnrD=ITbu?XHW z=bxZb?;h^77efso5({H<%!hqY_a7Nf{=F&8q(LKEg1Ye*<8jk|2ekx$AkVO#8-pX9 z)VD#+I0cod;iv~rMmCwX6xl}BPILZW=KSvw zY-j2z#!;wDPQyI77Iocr^uYtDOkO}e?*`_^A8iVH&@ZS9UzrmgY;`>_Kjudl>Vhh$ z8^oat>mip|$)>&pm7)Ep8UKdm&@a-ms$)E|ZLBdEgZ6p~RViekI~I*%17Z-W9*3Gq zB5FWQQK{}^+LKWO8;qLic+`OBpl19H>VX?k6TNACi1fFu7Zj9IFGivFyeNiXJnDmy zjLOU`)Ib)Y-s@GSeIx3@yHO85je48zqTU`W+8MA1YV-M;x(mJa{)bUeN@I+5P$T~c zHPe=;J<%Dp+ef1Y`Xy@Mdr$*Ai@MJ>)Bx|I29|*u&@*%1zZxGg>MqR7^Q~qSG}6vk z0h3TSnrGStxhF zmi%X@A&LfNpgL;gai|B?Lp`_=Dg*6N1M7$CHxxDFF{lTvMfKlmJc!yu=TQ^+(`eOn z+I?!0|00}-q(N)c1hv_Qm<~2-hO3PyPy={~y6!P*pkB3{2joRvA7JX`Py?%hx_@1B zJ_SRlkF+T$HOo;;umN?!Hq-?NP$R#G>h}cI?+q%|?s1mohGozn%b_18q6<5q20GT% zQ&CH>6SegASqi!!-JE!4>N(?`-}xY84b+8gun?x8W@@c3WrkeT&)a$qli{Tm6 z`3I<_dxepD|E=22w>k=oa-s=pCVfzAHwpFNb*SCDAC-Z#SQf9MGV~VfVIH=+9?%Na zuY)lOwRHVa{fA+0J%37O!LsI}9`rTpz1@b&%u&>u-oj9PfZB}S3C=ga1nPV|YS%YG z4WK=0z}-+wHxPB*Xe@!V(4FU7nAJzXU+Di2s3hL-r*BN;bs$&Q$g;A(}wJ-wPp$0S)%i~fU zfTwW_Mzan%@Ml!2AE7e)77L?qeP=+S^~t|dQj-REY=*j^HR=I9Q3Dx{+Qm~)16hWp zaW`s7en9o}Xy9DuhstOO>TRlm{2W-dP}dDd?X@Kh$iGsxlLqbLBdAPVG~UKA>KPb> z-XA#+s)U+hE!2P$(F0qXdPmgW>4zHFM9hhE(G!=L_EokiY(tIoFzU5Ahq__9X@7vq z(4VLbJVy=8yP=br7}U&KV=#`!lDGof<53L3;*Ff^60j6?dmshPY(DA%X{ed)L0xbV zb>j!9ndEBh+`u2Xr&SlT<6PABsi+w)#+>*K>i(NB0MDT^{R{FI@cU1}iw6HD&V?mW zsVirUM`h$=)Xe*$J}8roD^N?YA2TzD+B@l(7awCTe1{s4S5s%n^P`X6|3C^Fc_qw) zk*L(vMrEQG>IVH#HynXlnkmQ|Y0WbAi>R63K;0+Z_#0|MFHv94e9fFp1fv(vw-P95 zW{pt~>Wz9$2AlR7n2-8u)WEi*Qho!qi|=50e2!YGlFj*tE7nJ)d=$FyE7YFYjb-o- z+WaC~ZY`WOjYHk2A6CRg*cVTsFGjTFrx_DaGo6fDx>=|XRVpeoY3BSsbfbP0HL(+> z{SxMx8(1qtwH@br3vN169rrxKGlc7>!{9E?=BbT^ zsW(C`RT64OlhB2WQ0Moe_Qqu_iqEh-dUtgO5{tTTH`LoS4hz^6=1>U4RagX%81JAi zc#7J^-rbyEF@LN@y*aA?7pM$vK&5^!s{J%-Aos8ezD1o6@9yk@IJC7!Eh*>$-B1Hb zLET^m>O->%)o&f@ZP;Nvj{elIVLAK*b)A0?=YEw@nTka%K}*!8?1EZ?n)>NOf->QhlOUx-TiR&>X6sDWNWP2epm z6FGZ3OW|iz(2Yu?W)h8hJyNg)&PVO$o#=swQ3E}N8ptKo0DnT==Ou<>?qp}lqEH!3 zK=to{>enANAls&(8_q@#T!31VuhA1XqGq-owad?85N4oW*X(_q0lJJ~sJ&DbbzMAa zDcYka&cZmHk7U%gu2Rs0GcXo^MRhFG*ZeGFN$QcPOti&N?180mHkQI|7>UwUzalQY~DCmK{{pgU5-HSP?SM2Yks+zG8s$Un>>(?7Ya4nX> z^H>(2p*C^ACr*khq8IfT)E-JiWwJG9=lNED(_xTtG-?2oP&b;5dM%e>E=}A!Gp-Z)~XQ=8hKmP0D7TDJ_NO9OHni5 zir%;%wT9EEa?X1>8rX3C-7qIOsw$DlUldei_94<`S*;4Tfi!3)&PyoWd! zhN9NE5$eJrsPnTh2d+g8d=u)1drIOGg^N(B z+J(CCE^6)HV}1-A=42uQ)h`x(u{$=zq3DALQ3Jb(%G{5rrTY(RU{B0>+jF?n!4LHy z7itD^s1Y|q-LN-m*N-&qyHHDT0kvdLQJYe~-FlEG>N+3P07{@TR30m1eW%^F#!x6g z!&EGYi%oqC>a{wG%FM4Aj$R`jtD}}C1@*vr7>Y|!6F83AY}c?5rlT_T95pb{QTj(N z>tBR|E~t;%jBQaJlTbGpj@l!(XijCx zz5}%>PoN)O9Z&vM_=N^N_&o+-feFqHBT$>C8tOeyKxLo-R>f|p87;&>+>d(C@0fN^ z(%X}I7*@c!#)GK6^~k26R22Nwc|bJky^clg?mDQBeNdU2ixIdQo8xuNjv*5r%b_Rr zil_-y#Y)%^b)PY)39rH`xW}fTPvj%ig>OuU?30|1{-_&O!eW?!%1~DZdpa#4do8SS|^|_`v z`k@BoLOmz~wcBfBQS69Xsu9QlZEFFAAR1PqZhQ=t`YWiEy+my`*HmY%%cC3h=2#qC zq4vTc)Y`8%^=lYLJ@+){KW3vbfqHKY!Hw8L@Bd{A6=^6n-LWOsqCOFsoOKvAu*A=F z0S`pI9cxho+m5C2AbMd2DkG0DJH9|=cS!X z`2$xG)z!eET|1Dnr>XNhlDQ9_>LiCUp<@AY+4PC0oI-gG>d=1BaoU*=Gcp~A&mSCE zz+Pl($#iLy*^&RBW!jeDkF-_9NYnNSeoIU<^{t$*M%*&jx|w$6uDWTfLE8>uFZD}A zH_B&;w%J(w=@gFBsARS$`caP|`ceKjv4vPi{RKWFCQ;6T*NK13uN_pt?nvnuVhm>n zVIRyof+!a@^-{Q-Na7?P*~~ZZ5H2P<5%q}HggbrQu>n!uT>Ay(vcyls9NKyk11Rs! zrd`e9MZ55+&WHMIDUlR;9=C!*!UIY62xihkFX@Jz^o(Q z^wV3Nc{Jv4CmPG)P;;^jW%ga>k;30qw3jmVFYy-jDL4yX;SuaX==g{TrhF5N;CiB$ zPH=1@c;l_UwB5D&bDqk##5`gY_3fAg=cA724puqZ7Ex}96^NCT6YzUN#|8Wq=b5_N z`V&T}!S1RSJh`(0i|MijH?gXQB&Hhj>X`q~8fb$26ihTKGYQW`$ezHfwpoOZHPrv*6s^{juMw+F{UY|FUYqEgwf@Oe>T=?m>6DjxRmz2l%ckuh zZ8~}qpA!EiexNNo(UtN8VlCx3(=RvvK%0(S4%R`eLwlsD>%Z!(?@c9<6ZMHOVjFGy z@H~-=(9sHapf~EfQOLA!!^K1&&i$^A9~=?1mmp5iHUXo|ITx-Y>?iz5BXsPigNw*I zDp4*&OeVf0LWy0R{1kNz!GMsR3@$vLA2i?9uof4PZ3#1Q3~y-`w%M$Wj^z7{|`E4(6oW@ zCUz6Ii8ki^XOxdpPQZo4GSi+7mlJns>p}d3ax^iAvW`5IYhnO#mY7X^LtArVkJj-F zQJ=;}n01_@aDe)sSj)7h;&|dcZ5?qo(UllW3@3DahEb**;WSwzaf)gCj&cFYfw&Yi zvoM1~It{yUJn9(bV0}#64I=B{p&*G>Hp{*(F&e2rbO9&wJcC-Gg{yD}N>^9NR_oEBIi+?Ce4Nsy;! cHCK4`8j%rcV_Ki_NNd>f*O0WDlWKYWADhaXCjbBd delta 10372 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 diff --git a/openslides/locale/de/LC_MESSAGES/django.po b/openslides/locale/de/LC_MESSAGES/django.po index e6ddebfcc..c8ed90f13 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: OpenSlides 1.x\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-07 22:33+0100\n" +"POT-Creation-Date: 2012-11-08 09:41+0100\n" "PO-Revision-Date: 2012-07-28 11:07+0200\n" "Last-Translator: Emanuel Schuetze \n" "Language-Team: support@openslides.de\n" @@ -45,7 +45,7 @@ msgid "Text" msgstr "Text" #: agenda/models.py:44 agenda/templates/agenda/overview.html:65 -#: agenda/templates/agenda/view.html:13 participant/models.py:56 +#: agenda/templates/agenda/view.html:13 participant/models.py:59 #: participant/templates/participant/overview.html:72 #: participant/templates/participant/user_detail.html:45 msgid "Comment" @@ -69,7 +69,7 @@ msgid "Can manage agenda" msgstr "Darf die Tagesordung verwalten" #: agenda/models.py:189 agenda/slides.py:20 agenda/views.py:194 -#: agenda/views.py:195 agenda/views.py:214 +#: agenda/views.py:195 agenda/views.py:214 agenda/views.py:229 #: agenda/templates/agenda/base_agenda.html:10 #: agenda/templates/agenda/overview.html:8 #: agenda/templates/agenda/overview.html:52 @@ -396,7 +396,7 @@ msgstr "Abgeschlossen" msgid "Name" msgstr "Name" -#: assignment/models.py:55 participant/models.py:120 +#: assignment/models.py:55 participant/models.py:133 msgid "Description" msgstr "Beschreibung" @@ -463,6 +463,7 @@ msgid "Ballot %d" msgstr "Wahlgang %d" #: assignment/models.py:331 assignment/views.py:340 assignment/views.py:664 +#: assignment/views.py:678 #: assignment/templates/assignment/base_assignment.html:14 #: assignment/templates/assignment/overview.html:6 #: assignment/templates/assignment/overview.html:9 @@ -670,10 +671,6 @@ msgstr "Enthaltung" msgid "Election settings successfully saved." msgstr "Wahl-Einstellungen wurden erfolgreich gespeichert." -#: assignment/views.py:677 -msgid "Assignments" -msgstr "Wahlen" - #: assignment/templates/assignment/base_assignment.html:16 msgid "All elections" msgstr "Alle Wahlen" @@ -1195,7 +1192,7 @@ msgid "The assembly may decide," msgstr "Die Versammlung möge beschließen," #: motion/models.py:604 motion/views.py:692 motion/views.py:917 -#: motion/templates/motion/base_motion.html:9 +#: motion/views.py:928 motion/templates/motion/base_motion.html:9 #: motion/templates/motion/overview.html:7 #: motion/templates/motion/overview.html:10 msgid "Motions" @@ -1713,6 +1710,7 @@ msgstr "Teilnehmer" #: participant/templates/participant/group_overview.html:7 #: participant/templates/participant/group_overview.html:10 #: participant/templates/participant/user_detail.html:14 +#: participant/templates/projector/UserSlide.html:12 msgid "Groups" msgstr "Gruppen" @@ -1720,7 +1718,7 @@ msgstr "Gruppen" msgid "Permissions" msgstr "Rechte" -#: participant/forms.py:47 participant/views.py:530 +#: participant/forms.py:47 participant/views.py:530 participant/views.py:576 #: participant/templates/participant/base_participant.html:12 #: participant/templates/participant/overview.html:7 #: participant/templates/participant/overview.html:18 @@ -1753,93 +1751,95 @@ msgstr "Teilnehmer/innen nach Vornamen sortieren" msgid "Disable for sorting by last name" msgstr "Deaktivieren für Sortierung nach Nachnamen" -#: participant/models.py:29 participant/templates/participant/overview.html:25 +#: participant/models.py:32 participant/templates/participant/overview.html:25 msgid "Male" msgstr "Männlich" -#: participant/models.py:30 participant/templates/participant/overview.html:26 +#: participant/models.py:33 participant/templates/participant/overview.html:26 msgid "Female" msgstr "Weiblich" -#: participant/models.py:33 participant/templates/participant/overview.html:38 +#: participant/models.py:36 participant/templates/participant/overview.html:38 msgid "Delegate" msgstr "Delegierter" -#: participant/models.py:34 participant/templates/participant/overview.html:39 +#: participant/models.py:37 participant/templates/participant/overview.html:39 msgid "Observer" msgstr "Beobachter" -#: participant/models.py:35 participant/templates/participant/overview.html:40 +#: participant/models.py:38 participant/templates/participant/overview.html:40 msgid "Staff" msgstr "Mitarbeiter" -#: participant/models.py:36 participant/templates/participant/overview.html:41 +#: participant/models.py:39 participant/templates/participant/overview.html:41 msgid "Guest" msgstr "Gast" -#: participant/models.py:41 participant/templates/participant/overview.html:30 +#: participant/models.py:44 participant/templates/participant/overview.html:30 #: participant/templates/participant/overview.html:68 msgid "Detail" msgstr "Detail" -#: participant/models.py:42 +#: participant/models.py:45 msgid "Will be shown after the name." msgstr "Wird nach dem Namen angezeigt." -#: participant/models.py:45 participant/templates/participant/overview.html:24 +#: participant/models.py:48 participant/templates/participant/overview.html:24 #: participant/templates/participant/user_detail.html:24 +#: participant/templates/projector/UserSlide.html:20 msgid "Gender" msgstr "Geschlecht" -#: participant/models.py:45 participant/models.py:48 participant/models.py:51 +#: participant/models.py:48 participant/models.py:51 participant/models.py:54 msgid "Only for filtering the participant list." msgstr "Nur zum Filtern der Teilnehmerliste." -#: participant/models.py:48 +#: participant/models.py:51 msgid "Typ" msgstr "Typ" -#: participant/models.py:50 participant/views.py:245 +#: participant/models.py:53 participant/views.py:245 #: participant/templates/participant/overview.html:45 #: participant/templates/participant/overview.html:70 #: participant/templates/participant/user_detail.html:34 +#: participant/templates/projector/UserSlide.html:28 msgid "Committee" msgstr "Amt" -#: participant/models.py:53 +#: participant/models.py:56 #: participant/templates/participant/user_detail.html:39 msgid "About me" msgstr "Über mich" -#: participant/models.py:54 +#: participant/models.py:57 msgid "Your profile text" msgstr "Ihr Profiltext" -#: participant/models.py:57 +#: participant/models.py:60 msgid "Only for notes." msgstr "Nur für Notizen." -#: participant/models.py:60 +#: participant/models.py:63 msgid "Default password" msgstr "Vorgegebenes Passwort" -#: participant/models.py:108 +#: participant/models.py:111 msgid "Can see participant" msgstr "Darf die Teilnehmer/inen sehen" -#: participant/models.py:110 +#: participant/models.py:113 msgid "Can manage participant" msgstr "Darf die Teilnehmer/inen verwalten" -#: participant/models.py:119 +#: participant/models.py:132 msgid "Use this group as participant" msgstr "Verwende diese Gruppe als Teilnehmer/in" -#: participant/models.py:119 +#: participant/models.py:132 msgid "For example as submitter of a motion." msgstr "Zum Beispiel als Antragsteller." -#: participant/models.py:201 +#: participant/models.py:214 msgid "Welcome to OpenSlides!" msgstr "Willkommen bei OpenSlides!" @@ -1867,6 +1867,7 @@ msgstr "Gruppe" #: participant/views.py:244 participant/templates/participant/overview.html:37 #: participant/templates/participant/overview.html:69 #: participant/templates/participant/user_detail.html:29 +#: participant/templates/projector/UserSlide.html:24 msgid "Type" msgstr "Typ" @@ -1941,10 +1942,6 @@ msgstr "Passwort wurde erfolgreich geändert." msgid "My motions and elections" msgstr "Meine Anträge und Wahlen" -#: participant/views.py:576 -msgid "Users" -msgstr "Benutzer" - #: participant/templates/participant/base_participant.html:15 msgid "All participants" msgstr "Alle Teilnehmer/innen" @@ -2146,6 +2143,7 @@ msgid "I am candidate for the following elections:" msgstr "Ich bin Kandidat/in bei folgenden Wahlen:" #: participant/templates/participant/user_detail.html:19 +#: participant/templates/projector/UserSlide.html:16 msgid "The participant is not member of any group." msgstr "Teilnehmer/in ist kein Mitglied einer Gruppe." From e601d8a5a3a74123aedb53d9322d39df6335d741 Mon Sep 17 00:00:00 2001 From: Emanuel Schuetze Date: Thu, 8 Nov 2012 09:43:04 +0100 Subject: [PATCH 5/5] Fixed display_name of widgets. --- openslides/agenda/views.py | 1 + openslides/assignment/views.py | 3 ++- openslides/motion/views.py | 1 + openslides/participant/views.py | 2 +- 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/openslides/agenda/views.py b/openslides/agenda/views.py index 57629e1e4..b57128fbd 100644 --- a/openslides/agenda/views.py +++ b/openslides/agenda/views.py @@ -226,6 +226,7 @@ def get_widgets(request): return [ Widget( name='agenda', + display_name=_('Agenda'), template='agenda/widget.html', context={ 'agenda': SLIDE['agenda'], diff --git a/openslides/assignment/views.py b/openslides/assignment/views.py index 02e78bf1b..fde043889 100644 --- a/openslides/assignment/views.py +++ b/openslides/assignment/views.py @@ -674,7 +674,8 @@ def register_tab(request): def get_widgets(request): return [ Widget( - name=_('Assignments'), + name='assignments', + display_name=_('Elections'), template='assignment/widget.html', context={'assignments': Assignment.objects.all()}, permission_required='assignment.can_manage_assignment')] diff --git a/openslides/motion/views.py b/openslides/motion/views.py index 4512f05a1..8f564d60f 100644 --- a/openslides/motion/views.py +++ b/openslides/motion/views.py @@ -925,6 +925,7 @@ def get_widgets(request): return [ Widget( name='motions', + display_name=_('Motions'), template='motion/widget.html', context={'motions': Motion.objects.all()}, permission_required='motion.can_manage_motion')] diff --git a/openslides/participant/views.py b/openslides/participant/views.py index 8c53601fb..974d7d183 100644 --- a/openslides/participant/views.py +++ b/openslides/participant/views.py @@ -573,7 +573,7 @@ def get_user_widget(request): """ return Widget( name='user', - display_name=_('Users'), + display_name=_('Participants'), template='participant/user_widget.html', context={'users': User.objects.all(),}, permission_required='projector.can_manage_projector',