[Mpuls-commits] r1928 - in wasko/branches/1.0: . formed waskaweb/i18n/de/LC_MESSAGES

[scm-commit@wald.intevation.org]

Author: roland
Date: 2010-03-11 12:04:54 +0100 (Thu, 11 Mar 2010)
New Revision: 1928

Modified:
   wasko/branches/1.0/ChangeLog.txt
   wasko/branches/1.0/formed/formedtree_web.xml
   wasko/branches/1.0/waskaweb/i18n/de/LC_MESSAGES/waskaweb.po
Log:
Don't block the date 1.1.2010

Modified: wasko/branches/1.0/ChangeLog.txt
===================================================================
--- wasko/branches/1.0/ChangeLog.txt	2010-03-11 10:54:09 UTC (rev 1927)
+++ wasko/branches/1.0/ChangeLog.txt	2010-03-11 11:04:54 UTC (rev 1928)
@@ -1,3 +1,10 @@
+2010-03-11	Roland Geider <roland.geider at intevation.de>
+
+	Don't block the date 1.1.2010
+
+	* formed/formedtree_web.xml: Don't block the date 1.1.2010 waskaweb/i18n/de/LC_MESSAGES/waskaweb.po
+        * waskaweb/i18n/de/LC_MESSAGES/waskaweb.p Updated date in version string 
+
 2010-03-10 	Torsten Irlaender	<torsten.irlaender at intevation.de> 
 
 	1.2.0 Release

Modified: wasko/branches/1.0/formed/formedtree_web.xml
===================================================================
--- wasko/branches/1.0/formed/formedtree_web.xml	2010-03-11 10:54:09 UTC (rev 1927)
+++ wasko/branches/1.0/formed/formedtree_web.xml	2010-03-11 11:04:54 UTC (rev 1928)
@@ -276,7 +276,7 @@
       <group description="3. Angaben zur Person" name="group-5">
         <page containers="a,b,c,d,e,f,g,h,i" description="3.1 Persönliche Angaben" name="page-2">
           <group description="Aufnahme in das Case Management" name="aufnahme_cm" containers="a,b" target="a">
-              <conditional expr="$datum_cm_start isset not $datum_cm_start 1 1 2010 date > or" name="conditional-11" target="a">
+              <conditional expr="$datum_cm_start isset not $datum_cm_start 1 1 2010 date >= or" name="conditional-11" target="a">
                 <date description="Datum Beginn der Umsetzung des Case Management in der Koordinierungsstelle" flags="required:phase_b_start,phase_a_end;time:phase_a_end,phase_b_start" name="datum_cm_start" order="erstgespraech;datum_bfplan" target="a"/>
                 <rule expr="$datum_cm_start isset" mark="warning:datum_cm_start" name="rule-72" value="Fehlende Pflichtfeldangabe"/>
               </conditional>
@@ -3340,7 +3340,7 @@
                 <rule description="'cm_datum_verlaengerung_1' muss vor 'cm_datum_verlaengerung_2' liegen." expr="$cm_datum_verlaengerung_1 isset $cm_datum_verlaengerung_1 known and $cm_datum_verlaengerung_2 isset $cm_datum_verlaengerung_2 known and and $cm_datum_verlaengerung_1 $cm_datum_verlaengerung_2 &gt; and not" name="date-sequence-rule-51" value="'Datum erste Verlängerung' darf zeitlich nicht nach 'Datum zweite Verlängerung' liegen."/>
               </group>
             </conditional>
-            <conditional expr="$datum_cm_ende isset not $datum_cm_ende 1 1 2010 date > or" name="conditional-12" target="a">
+            <conditional expr="$datum_cm_ende isset not $datum_cm_ende 1 1 2010 date >= or" name="conditional-12" target="a">
                 <date description="Datum Beendigung des Case Management" flags="required:phase_b_end;phase_c_start;time:phase_b_end" name="datum_cm_ende" order="datum_bfplan;nbetr_start" target="b"/>
             </conditional>
             <int description="Zeitraum des CM in Wochen" maxvalue="999" minvalue="0" name="cm_zeit" target="b"/>

Modified: wasko/branches/1.0/waskaweb/i18n/de/LC_MESSAGES/waskaweb.po
===================================================================
--- wasko/branches/1.0/waskaweb/i18n/de/LC_MESSAGES/waskaweb.po	2010-03-11 10:54:09 UTC (rev 1927)
+++ wasko/branches/1.0/waskaweb/i18n/de/LC_MESSAGES/waskaweb.po	2010-03-11 11:04:54 UTC (rev 1928)
@@ -453,7 +453,7 @@
 
 #: waskaweb/templates/main.mako:133
 msgid "footer_version"
-msgstr "10.03.2010 | Version 1.2.0"
+msgstr "11.03.2010 | Version 1.2.0"
 
 #: waskaweb/templates/main_login.mako:39
 msgid "main_login_bmf_phrase"