From a429f9ca76ada9338dbb0a2af20588428f5b3915 Mon Sep 17 00:00:00 2001
From: Helmut Merz <helmutm@cy55.de>
Date: Thu, 22 Nov 2012 12:40:01 +0100
Subject: [PATCH] fix translation of state information

---
 locales/de/LC_MESSAGES/loops.mo  | Bin 19050 -> 19168 bytes
 locales/de/LC_MESSAGES/loops.po  |  61 +++++++++++++++++++------------
 organize/stateful/browser.py     |  11 +++---
 organize/stateful/task.py        |  15 +++++---
 organize/stateful/view_macros.pt |   3 +-
 5 files changed, 55 insertions(+), 35 deletions(-)

diff --git a/locales/de/LC_MESSAGES/loops.mo b/locales/de/LC_MESSAGES/loops.mo
index ebb7cbedc511a4b7c1bd788544f33e2447fc6014..845ab899f549becb8a417b94945544956f133d8e 100644
GIT binary patch
delta 7323
zcmZA63w)1dAII@~b~KyA#^yA(F>E%QZ4Sd6Vsjc1HJ!{>TQQHrHgr&bib^ddQ%fbs
zkc!6~N<|LUBP5<k^bkTkMG<)@_4)qq-(K~4?w8;HeO=dmUDth`?*D(iI#=QI?K~gP
z(J;Sx4%c8G$7zb?!H%<)^l$Z5%0=N2@WHlt3kKk$=1dGEUyi<5fwiy_LvblK$F*1&
z_hU^wi6M^TaegGBhSyLHZ@4#{;3&swKt2*9FbUORA5;gopayam2H`!HA8YqZF`V*8
ztb7jEAzz6a@CqEp^PM#$vMKOu=5{m?{mBnURlLK>3oKuZ>bMlc@JYKrA2qNgsF}Wv
z%+T3v?m`Xp5Z1%v7{K$LOIG0;s)In*OBL#&R-gr{!wl4e2Vf+QMAe&&n%PsRdX*T9
zE3pyoM(yTlRJ-e_e#4_#e{~p7LQ9;9>To!!qaw>s!G`2#p=P`owH52JHf~4FbU$h!
z$58!Vz{cns<36w%YC!3zfeeme{WX#z3e;dKYNXFw#bwApXN#2|N7cWA?3xq8G&P_E
zRQpV9fkRP;brNbqi%?rxh1!DmQ3Kf#>v0Q?Qs76y8Ppd1fI5^{Pz|o3X6j4tI;3H!
z!`BSeE)G>M0ku+Tmd`;w=vLIqj7Qb?Sbl~Q8hHik0V_}=-iTV#ov5uii0a@BYUzJP
z)%S1du0Va%%CtuBN}$>eMfF#JTG=wx1ZUZO&s-AfXep}WD!Z{2y?biq$B?fE=SRz5
zMeS`soI9`>)QYr6U+j!pk#4AgWT7T-8~S4rvXUNWED4S10aSy>&<~%n^5;<<&PP39
z0cwWJFdg5s^7E*EE~6&$2l7HWp{?9Al!!V5gU#E}Pw)RoZ-OrnR0sE?22x`AhcSTs
zOjHNu=#LfX9T;jr3s5s%i(2ySs3kvun)x|Yy=!*Ac5B``p6^7H(1<&swjvAldJIQ3
z7;ELzto%9D)+|T0TZcMy+b{r+paymVby!cMR`epO{;!tzZ^QcQ^$8{sh*7AH<B-*J
zQc*J+VfROy6H)aZM6JXV7=-1Rg7Z)V`2=++_n^+sNo<1WF$ja>S${1}c)UA+7N~q%
zRL5PhFZM#M%q&#HO4Ljip&qarHK32}{(h`U{)pvIp;q8Ls@^5k0G$NZUrQ92;65N6
zm5)V@v>ob!15gcyp$2jX^3NH~hgPrx^`0+BUJPd|Y70-JR`LdF04>|P6N^VZC)q<H
zm_%2*k&O(_$+7%otU-P%YKv4~19=j4HfEzbUW~PHIcnvqQ2oA#I*dC|{T#$3{2Dn1
zjwdjYeI}8NL$Clf^D5NL_o6yFgzESt>QtXa9kLr%UV~nBKL|Cj+8Bbds0SybCXk96
za2I6jJWdZ1s(34^Vu4jCL^T*=mY^Q|5Nbfrp$0e~)!`CU`xRIdS78>e$M$#~HNd2H
zZo4$}zW?1w=n(Znb)1W#Sb$8<nSjmlHPq67h<fl2%kM$0#Fv&ogc`sx)C132`31}*
ze+4zM^kn+c``?X(_9zS0FxT?=SciNm>NR}a@)f8VFGW3IC2C-+Q3Kn6b#M#naPCF5
zKVkVxmJi@v_2|KoBsBAQREOzi7gUEmQ4i>k8u<{^07js;?rv1OF{qW8VC7|~dec$u
zo<Q|C+k7d7{nw3!6llp;U@hE$YPbzM`#8?0*oVAMYFEfYJ$O25V6#yj&qK9efZEbG
zQGX|VglxZa6!lt$q`3oana29prl1W4>Yx*bVNVRlVW_{1?n8C>sFhcswrT~|!L_LN
z+pK(-<qx19c+|?TU|sV1<<dawc}V1uh(gWq5!6a-Lv6_ys0SUf{3+Cm{e<=LDypN<
z4(<RNq1wly?x&#cXQ5VVs5t`pL)-D>kx++IQ4MFH9{d7oC0;`<;TqITK1coTpSHYD
zN4H)h)LBY2yJIx@AsB%ZQSF~XeN!%U%RSB}5*q0~t8g0iy4^r^*sPQLfD}~2-l+O_
zTX~5&6E%TK)Dpje4R9m!=c2O*HSi1A8iPCQtD5~!C7~JSqQ3bip(@Tn{Q>b7s=+SQ
z04|~Gg=V-*7>}x-jggp-@%SKi!6g`uM^R_wB5H-NV{@MG1W-$_Pb<_OC8B1MhI*ZP
zp&DkPW;Pgg`twj*Hx|`l8LFKJqw!f(zwe+1w$ASFM%6!z9xc%+647`a8)H-6F_m{h
zoq<6ZfupQ^3Tg|UH5X$e@*7cyYM<rLV?**m-P{4hp!&~1ZSC-GtiN8rA_~;uB=c$1
zh+jwV9-@|T4{8ODTmB+yZv*&V)d1U|R-^~&`=hU!gM8^ZLs1i&j#}x8Ox9lyeuV<P
zCTma~e1KZI9jMpuGt`gEm#Btcq2BwW$Uo;iA8MD_-QB8m)Wk9|7IQET$J_mRsD2iB
zNNA+X%r{X3S&iEJ_fZ4bf;s~`&HbnW9zoSRj#{x(s2To_8erWX?g~buR<I*R;Q-Xu
zc<v{mhSO1d@-k}Vt58e2$?os7`)9EU<=0UUitOngx&+irJELZHCu(2?sKZ)>>c14V
zg)@-}c$^nWXb)dSE#YR=06xLCcmOpJpI+_?G(>e6gF40S%nZBV2M1F=2-V-Ks6)3D
zwIW-v1@6UKdjBtx&;$NJjXdHecV<zj4pJ}=JENAa5_KpypjKeF<&U9WzssmC^X=^p
zFcj5KLsWS*s(k`_|NFlu3GI1b)XayW_PPL7u^2Ve>8N_;s0UXfFMzWO_4<8}+R7Sz
z+`o7lV+{EmOvQ1ifh<BzbR~K;;x$&V+58xrQob8?$j)L7ykPl@sE)3p4we4SQog>~
z6g7dCmQO+rxC5%6ewdB}vsnLTB&Jc&1z*Qo@G!<>QnowuT=cF8`cqzv?QtS%#g<t4
zTGUFti#lxE?fwDOgTF)da|V6!r)>6Lr}-BOyst}N+apxP1XOt%24Zj2_r*Ze%8f$p
z={O9;2T%{1hHC#f-i+mV6Mlo5K=Xd?z~ek5{3u9AjXVQ&y8Bp#q1ci9DAeJ534?Gw
zs{UqFhdWVcV=rnzM=XB|)!)yk0pCCkB&5GPV9(7Y)KM;K<ONt03sLXsc+~xA*bbjT
zb-2mOKgB@u`_04V2@Ih89IE}#7=*u}`t={+E%!JPBs8)Z)Se`xW|U@Tpthg~>OnV~
zxu_ZEp;oXMgK+|?pNCOrz=Imd98~*CRJ(=VJp2C^iJBCwLp^9Ss=?<Nj0eyM_Y#wd
zzh5KCd`xI&MZ}lH9YlK?oW~alUFxU$8cJddF`xL9=Q~kU-j9QD4C=t>@+Y56{7yOy
zf5UNvW;LGBc2r;AllX{uozSbM71dQpbRyOgHR<Cn+)Qu|y_aV?+)1o*^WM)sRMh*~
z26d&mct8JT>8CK7(EFcBz3Zr}E3wR*;(G(1C%Ridb4jlz>Ja}U`1;WN|GIKWzW-O&
zn=0e;E8-jC--J%DzBAJ4^cd>OCZ-YES6!{_fe(}JK{}AAO?ojAM0y5xAe#B`{7e${
zDeOozC#~xgQA&hTrYoPgm1sglP?kdk5dR<_hx#cUOLQgu16E(hNpvSth?T?u?l&M_
zCao_z@BAw<OBt@+L~AP4A#Nh{%XNg%_j?j~U5^v9iIYSkWj(O^+CbtJ;xVGB)n7+?
zJ+Y8jKs2=Sfuxzg`}#Ddu(L9D^}^+rZh<$5+lUb2GvZm|08xEKTc<5Co*2!Ij>OwU
z6T7FnCkTDj4<ZKo@cfA++F1pS=1JmR;ya=ZQAGrEe-!p6{!8e3i8x23Slj1F&m=;~
zr{W|+mww3f-;jETv#qYm+Y=Ks{~wj(YQ)VYnCQ*9A8C|zutq&GoG7sS_u}nDvE_&1
zgTx2KH7omnd?~n(=tVyj=&u>a5P8H;#2MldVkz++QGI<#B9=zGupUO(jT+dSd@}B{
zvP<|3v4a?5WugZ4bZsJ1N%ut0X+91U`Uadz^e3vXPb@JH+gju8r2k3OBHzmHAH)lm
zzKm~JdJ0}7T3Y@Ae8JLR;1fE3zI1ezOar?i0*If9cp}CgOwxOGvAiEHva(3h+bk{C
z5Uq(<iMqtMg#HKDQH&)XCEg+uwEqv0c!#J>g-(R7dx-kpl>4KhWOMFyv$D@|mZilA
zq6PPTh+qF!uH*{K_v7A1(j}IU#J1Z1;l$TO5}~Ub73W|%(Vz5dxRrR5(Dk&7^9%k#
z+--RgXXy+)L=3jP=tumA$e_<X7)5l*B9lPqs*Aa9()&4p&z+XPAFo)tZ`JxH`@;P1
zDH}bxaPEwD2mS9Y$uBCax;;6_r&d{hX>nd@S$<hz>D*B%BmLXAPfAU#+Mcp3(m%hL
p237a<^YaPJ8do-DQc2O=G5s%x4Wsg;Qm3FWzoejWbXnmz=TEa&)2aXf

delta 7224
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
H<x|X``Dnbq

diff --git a/locales/de/LC_MESSAGES/loops.po b/locales/de/LC_MESSAGES/loops.po
index 76aaab2..f849adc 100644
--- a/locales/de/LC_MESSAGES/loops.po
+++ b/locales/de/LC_MESSAGES/loops.po
@@ -3,7 +3,7 @@ msgstr ""
 
 "Project-Id-Version: $Id$\n"
 "POT-Creation-Date: 2007-05-22 12:00 CET\n"
-"PO-Revision-Date: 2012-09-17 12:00 CET\n"
+"PO-Revision-Date: 2012-11-22 12:00 CET\n"
 "Last-Translator: Helmut Merz <helmutm@cy55.de>\n"
 "Language-Team: loops developers <helmutm@cy55.de>\n"
 "MIME-Version: 1.0\n"
@@ -883,38 +883,53 @@ msgstr "an"
 msgid "move_to_task"
 msgstr "nach"
 
+# state definitions
+
+msgid "task_states"
+msgstr "Status"
+
+# state names
+
+msgid "accepted"
+msgstr "angenommen"
+
+msgid "active"
+msgstr "aktiv"
+
+msgid "cancelled"
+msgstr "abgebrochen"
+
+msgid "closed"
+msgstr "abgeschlossen"
+
+msgid "delegated"
+msgstr "delegiert"
+
+msgid "done"
+msgstr "bearbeitet"
+
+msgid "draft"
+msgstr "Entwurf"
+
+msgid "finished"
+msgstr "beendet"
+
+msgid "moved"
+msgstr "verschoben"
+
 msgid "new"
 msgstr "neu"
 
 msgid "planned"
 msgstr "geplant"
 
-msgid "accepted"
-msgstr "angenommen"
-
-msgid "delegated"
-msgstr "delegiert"
+msgid "replaced"
+msgstr "ersetzt"
 
 msgid "running"
 msgstr "in Arbeit"
 
-msgid "done"
-msgstr "bearbeitet"
-
-msgid "finished"
-msgstr "beendet"
-
-msgid "closed"
-msgstr "abgeschlossen"
-
-msgid "cancelled"
-msgstr "abgebrochen"
-
-msgid "moved"
-msgstr "verschoben"
-
-msgid "replaced"
-msgstr "ersetzt"
+# transitions
 
 msgid "plan"
 msgstr "planen"
diff --git a/organize/stateful/browser.py b/organize/stateful/browser.py
index 1e4c49b..da9a340 100644
--- a/organize/stateful/browser.py
+++ b/organize/stateful/browser.py
@@ -1,5 +1,5 @@
 #
-#  Copyright (c) 2008 Helmut Merz helmutm@cy55.de
+#  Copyright (c) 2012 Helmut Merz helmutm@cy55.de
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -18,13 +18,12 @@
 
 """
 Views and actions for states management.
-
-$Id$
 """
 
 from zope import component
 from zope.app.pagetemplate import ViewPageTemplateFile
 from zope.cachedescriptors.property import Lazy
+from zope.i18n import translate
 
 from cybertools.browser.action import Action, actions
 from cybertools.stateful.interfaces import IStateful, IStatesDefinition
@@ -53,9 +52,11 @@ class StateAction(Action):
 
     @Lazy
     def description(self):
+        lang = self.view.languageInfo.language
+        definition = translate(_(self.definition), target_language=lang)
+        title = translate(_(self.stateObject.title), target_language=lang)
         return _(u'State information for $definition: $title',
-                 mapping=dict(definition=self.definition,
-                              title=self.stateObject.title))
+                 mapping=dict(definition=definition, title=title))
 
     @Lazy
     def stateObject(self):
diff --git a/organize/stateful/task.py b/organize/stateful/task.py
index 7a99273..6a02fcd 100644
--- a/organize/stateful/task.py
+++ b/organize/stateful/task.py
@@ -35,16 +35,21 @@ from loops.organize.stateful.base import StatefulLoopsObject
 @implementer(IStatesDefinition)
 def taskStates():
     return StatesDefinition('task_states',
-        State('planned', 'planned', ('finish', 'cancel'),
+        State('draft', 'draft', ('start', 'cancel',),
               color='yellow'),
-        State('finished', 'finished', ('reopen'),
+        State('active', 'active', ('finish', 'cancel',),
+              color='yellow'),
+        State('finished', 'finished', ('reopen', 'archive',),
               color='green'),
-        State('cancelled', 'cancelled', ('reopen'),
+        State('cancelled', 'cancelled', ('reopen',),
               color='grey'),
+        State('archived', 'archived', ('reopen',),
+              color='grey'),
+        Transition('start', 'start', 'active'),
         Transition('finish', 'finish', 'finished'),
         Transition('cancel', 'cancel', 'cancelled'),
-        Transition('reopen', 're-open', 'planned'),
-        initialState='planned')
+        Transition('reopen', 're-open', 'draft'),
+        initialState='draft')
 
 
 class StatefulTask(StatefulLoopsObject):
diff --git a/organize/stateful/view_macros.pt b/organize/stateful/view_macros.pt
index c9473c2..0d7c742 100644
--- a/organize/stateful/view_macros.pt
+++ b/organize/stateful/view_macros.pt
@@ -1,4 +1,3 @@
-<!-- $Id$ -->
 
 
 <metal:query define-macro="query">
@@ -32,7 +31,7 @@
                          tal:attributes="name string:$name:list;
                                          value value;
                                          checked python:
-                                             value in item.selectedStates.get(name, ());
+                                            value in item.selectedStates.get(name, ());
                                          id string:$name.$value"
                       />&nbsp;<label tal:content="state/title"
                                      i18n:translate=""