From fbd77da7885250ab1dc8ab33676c95e5aec9c7b0 Mon Sep 17 00:00:00 2001 From: Andy Kittner Date: Wed, 7 Nov 2012 00:12:15 +0100 Subject: [PATCH] Fix missing translations (#415) - The text "motions" was used with a plural here, but it was also present in other places without a plural, therefore the .po file contained only a singular translation. Solved by disambiguating the uses with a context - The submitter field of the MotionManagerForm was missing a label --- openslides/locale/de/LC_MESSAGES/django.mo | Bin 35478 -> 35523 bytes openslides/locale/de/LC_MESSAGES/django.po | 34 ++++++++++++------ openslides/motion/forms.py | 2 +- .../motion/templates/motion/overview.html | 2 +- 4 files changed, 26 insertions(+), 12 deletions(-) diff --git a/openslides/locale/de/LC_MESSAGES/django.mo b/openslides/locale/de/LC_MESSAGES/django.mo index f089d3c78b16724930b9f2977ab37d78ee082af6..184352797b9d8b2976f1275ad8924d1e8ba07364 100644 GIT binary patch delta 4102 zcmXZddr;O@9>?+XJfKL#10n<}mj}5R7ZXDtZwupSe~B33 zj%zanZIYRZGw6_6Orx`=qr>jlHfipp+m?>hbkQ#BZdtRNxz4^np7RI1&iP%=`JV6h zoZr*g;qUM8AAURF1&uKqD~$2uOPGRta1b8FA$S7s#M2m!=P>~1W_z%*N-j0MDRzlE!ixe^_7)WidaYQZ;8Gli)nm zfSXaN-i`|BAQs>W9D`ruXiTZLE1izoD+@3gYcU-+qZYUugUoOGXy}3Ss7>-Mj=;DY zV+t`J6-X71#Em!C%TcMSLX{wl+MMfAD{n>(+=<$}-Kd2eLrwIayM76^8Ly-EfLUrw7lq!v^owbX z!dje&Z8#23VG&-($(a49F|)85r(!ow$4^j!WiB%&7xPhj=t0y17N7!ZLS?2ImBFrM z_ZW$>wKn1e)JjTG8Mz--vMSVowWtNHN1c{l%)|?*fc}Gn(O+i+ zj;S=0m{qTaiVQTQ!tbZJU23Mj= zyaqMTiXE6(}<9JM7Zc|)_GwIJoj=0&4`l9`eIT-)AT|fvmVFf1o_%vfQ z{l+J3rZzZtpq_gLIfkC;p^?jlD>xbhVOzTpYB$&5o!E#&a1(09&!AG-i4l0n-G9@0 z3>CniQRAFN9nS&018?DAo&V?+_6rt|x>1U;_*)EM72b`tsM_yD?UlVa0gs?E_fIUq zp$#_R5>#eqqwY62+ffTSg168ANgArr$C!o#sEGfEIt7778%Q2%z)7f;Eku=|4i)eY zRHnL60r#Lv^*7YQzC>->?=TJ{SCW4XkVr!TOhKh|8tT(og=26P>KN_CLhMIv%73E* zjBc{eXQSSqj>B;->b)jZiJ!*|JcfGzViWn-gFkR#5C&G+l_a7D9)*gu1eNk~R4SLE zj$MMiww57O4HuwRR*#yf z5%uDF)CAj68S21$@vyu884ja=4HMD7*7lQ8r>g*!nF=gIZ>4LzimK5Es0nXi9!9LQ zD;R^?bR~Ef{u-63YE)p2cn@wtt@tp;;7QbT@1fqmjM`gQk#Rf|x!(S~jzmt7nS=d! z0+rI{4R%vKhuSgb9LQNF6$-bY3Q|T9>j^z`m40T`(^PBxN zl%h9KHSb3a^e(31Mb!PD-1V5vHZ!T1#PxjVbkxL^sP~qm#(NgEXLh2F`7TsO_MjJ{ zafF6ebPdxnfv9xO$DyuQ$i?H9)6xFKVJ*)I`Tor{D~Zz$>T{`nTBtGckky zSk$<4FbAtqCGlEl=$!Uq79K@EUcyuyK<$y6s6A2qjO{N%{o1{NDoH>73ctr(47Kug z#D%E)uRAYeDgD@IjUfr1DWjpt&Y@lyKpnerZ8oq{%%(pZhhPILBkM2%x1uuA>hAv$ zwV=Hig|DGX_LjSU8uRF%!`r|AH)!Yu-*y{FEGo6Bs0j*DDJ{amI0qGAC2BV>b^SG{ zW3?5vH@Z*(96$x|2KsOn|E}Ra{-(C4r5F1z`1&47uZ$q=?FTbMz7P98&8+eJ{?Ruh zd%)-WdtYX5zt8tk-xs4h3xX@23@=&M6l|ysh8tGbH>_9{X*I6fzM-P9y{Do#YGSac jXi8D2Z~nutPKcYaVs+EvIwShK>z1|OY@5^`+P>)jgFHYK delta 4057 zcmXZdc~F-{9LMqfas5mbk3cT@ai}11L|}>%Vrhd}G6H2@iHR7Yp{A(`@)!vPj+vom z6Y5Cjn2uLu)0B>w=2dp89cGT9P2)JAS&hwP)BD3df9Pv>pXb^A?svcYIq{K za1|Ee9-M%liN-O*XcSE}CJ!4i1W%(D{1IdDH;lx9CvD${KKc(}EKbEZtir+A?D`pI z(eJ?Sm@vtj=9)dpu>+$S=*J5MsGXN#Z>+?-(LwFF3Gc=2s2!ijIQ$vCcn6~}aI)P% z9EQ?Q!)Sa6gK;`)-U^3?c3gu!aW#hF+phajFP=c{>;fty0aJ__gbCOm$KrAg&R`VYz*Gz_v4LcxCZ2|Ua49N~ zM)cukjKD*#=TYx>qKYram8s(XYV!umv;lEDp!O zS;jn!d6CHI#|kKrSkvV$=ppQMakOjQr~?*SHV1x_*pG{dX9E z9jJ(Jp>`5G+h!ycbtKuS3G-1Knu3FIHOAwIsDOUJAZ$kkd~G)QR{*ydP^5v+*omSs znSMGd#gkAeo{f5cIcmW*sDN5f6YfPV@Db{}!|25`sGXlf6?+H9VvtjA?{6Y1!qKh; zsG^#TT`5ByNi}N1J(!0dqEh=eYT=+~`BlW8sQ1R9GFXHO_#|qbWtfak9gTrB_Tm6M zi$m}>s_4=xj2VN&k*jTLP`_wD;~>0=`T+``V;3BPp&o+3yBIH=Ycn;~wGtKBOUN~J zOaqNX22NrUcH&?Rf6i9(DC|MM5WC@Y)Q+D)rE&@S;~MvQlWQ|7fOk>1VlV1?wqbX? zgh9Ih*Jz|MaMOJdTWQbk9_%VER6zNtv!9Qum0G+XH=;84C8ppXsDOR*Y-UqX&nLJp zLTzLtcHRH2G;~IvU<|gQBK`$+3pz0byU({1Mxu5$5_JS)u_sod7OqAG+<-c&_fb1O zfhyW>u@_!NM-%)-LjgoDuqlm0{d8udGV?g<8r5PdZbKF2H>d!wq23RC-hLmCk@Sb7 zzAHu@@e8P`Z$^E8@OkpD7tb*eh@GgN{Dqp>f1!=khe~-mDwShU*RdQ`^$tFS^{9zY zp)&a^s<_P}``sW^4LpKwgHf5v zLj_id={OVh{#p#it*G~Qql)%0s#Z=R^El=zjVuQKMQ)DCc+r@nxCNEc(q*=&7NCl! z!Sy{F1-0unzT;`X1`LFHo7dgj(nZ>idA@_OE3h)U_Os%FtpAW_?pnLn(R#b>`bp6Yatn zJcxS!lRJJLm6NXUh-YdhdvvtSoQK{dAT4x7pBL`6dU3X|G zC4ahlSK7#K5$5C_ITe!gf@Ees%WN^hRYQ19c>Ms3UR8 zXy~4<#sT;i`r#q$k8P+LxrnNX(0bc{5cSt?De6eJ;b{C06EXZ1eiLvc>iO%ghjAqR z4rI@cNqf~swjcFD8|vEhZLopG;z0T-sI#1a%E)B&$62V1l)KMgL~W=Rz4#jH$Tqmo zcVII8{n+*Q{{jtt@GB}s9jJ-#pi=2+wAUyO6<88_a0u$?hPvaApsv+KRO%~H0aT*` zSc&>>A^&yYJN(OOit%NU?$#pTM1Q{@Jxx2~hkDMpUXCyE^L*d>;J`~B&$-t4#G@Y1 s53N^|Hl#E)7pHg@HXSeC?ahkI7(OB^vvt|yE%!I2HV$KWX5-WU1L7SiNdN!< diff --git a/openslides/locale/de/LC_MESSAGES/django.po b/openslides/locale/de/LC_MESSAGES/django.po index ea2c90f44..1d1788c3a 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-03 09:32+0100\n" +"POT-Creation-Date: 2012-11-07 00:09+0100\n" "PO-Revision-Date: 2012-07-28 11:07+0200\n" "Last-Translator: Emanuel Schuetze \n" "Language-Team: support@openslides.de\n" @@ -964,6 +964,13 @@ msgstr "Triviale Änderung" msgid "Trivial changes don't create a new version." msgstr "Triviale Änderungen erzeugen keine neue Version." +#: motion/forms.py:35 motion/models.py:66 motion/views.py:742 +#: motion/templates/motion/overview.html:41 +#: motion/templates/motion/view.html:18 +#: motion/templates/projector/Motion.html:55 +msgid "Submitter" +msgstr "Antragsteller/in" + #: motion/forms.py:44 motion/views.py:762 motion/templates/motion/view.html:22 msgid "Supporters" msgstr "Unterstützer/innen" @@ -1053,18 +1060,17 @@ msgstr "Verworfen (nicht zulässig)" msgid "Needs Review" msgstr "Benötigt Review" -#: motion/models.py:66 motion/views.py:742 -#: motion/templates/motion/overview.html:41 -#: motion/templates/motion/view.html:18 -#: motion/templates/projector/Motion.html:55 -msgid "Submitter" -msgstr "Antragsteller/in" - #: motion/models.py:103 #, python-format msgid "Version %d authorized" msgstr "Version %d zugelassen" +#: motion/models.py:110 +#, fuzzy, python-format +msgctxt "Rejected means not authorized" +msgid "Version %d rejected" +msgstr "Version verworfen" + #: motion/models.py:139 msgid "Searching for supporters." msgstr "Auf Unterstützersuche." @@ -1154,8 +1160,7 @@ msgstr "von" msgid "no number" msgstr "ohne Nummer" -#: motion/models.py:455 motion/templates/motion/overview.html:32 -#: motion/templates/motion/widget.html:23 +#: motion/models.py:455 motion/templates/motion/widget.html:23 #: participant/templates/participant/personal_info_widget.html:9 #: participant/templates/participant/personal_info_widget.html:28 msgid "motion" @@ -1531,6 +1536,13 @@ msgstr "Zugelassen" msgid "Withdrawen (by submitter)" msgstr "Zurückgezogen (durch Antragsteller/in)" +#: motion/templates/motion/overview.html:32 +msgctxt "number of motions" +msgid "motion" +msgid_plural "motions" +msgstr[0] "Antrag" +msgstr[1] "Anträge" + #: motion/templates/motion/overview.html:35 msgid "Number" msgstr "Nummer" @@ -2211,6 +2223,8 @@ msgid "Projector view" msgstr "Projektor-Ansicht" #: projector/templates/projector/control_countdown.html:6 +#, fuzzy +msgctxt "seconds" msgid "s" msgstr "s" diff --git a/openslides/motion/forms.py b/openslides/motion/forms.py index cf144feec..64f949bf4 100644 --- a/openslides/motion/forms.py +++ b/openslides/motion/forms.py @@ -32,7 +32,7 @@ class MotionFormTrivialChanges(MotionForm): class MotionManagerForm(forms.ModelForm, CssClassMixin): - submitter = PersonFormField() + submitter = PersonFormField(label = _("Submitter")) class Meta: model = Motion diff --git a/openslides/motion/templates/motion/overview.html b/openslides/motion/templates/motion/overview.html index 8d6b92613..38de7d40e 100644 --- a/openslides/motion/templates/motion/overview.html +++ b/openslides/motion/templates/motion/overview.html @@ -29,7 +29,7 @@

{{ motions|length }} - {% blocktrans count counter=motions|length %}motion{% plural %}motions{% endblocktrans %} + {% blocktrans count counter=motions|length context "number of motions"%}motion{% plural %}motions{% endblocktrans %}
{% trans "Number" %}