[Mpuls-commits] r656 - in wasko/branches/1.0: . formed waskaweb/controllers waskaweb/i18n/de/LC_MESSAGES waskaweb/public/xml

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2009-10-26 10:19:26 +0100 (Mon, 26 Oct 2009)
New Revision: 656

Modified:
   wasko/branches/1.0/ChangeLog.txt
   wasko/branches/1.0/formed/formedtree_web.xml
   wasko/branches/1.0/waskaweb/controllers/evaluate.py
   wasko/branches/1.0/waskaweb/i18n/de/LC_MESSAGES/waskaweb.po
   wasko/branches/1.0/waskaweb/public/xml/eval_analyse.xml
   wasko/branches/1.0/waskaweb/public/xml/eval_weitere.xml
Log:
Issues 255, 522, 530


Modified: wasko/branches/1.0/ChangeLog.txt
===================================================================
--- wasko/branches/1.0/ChangeLog.txt	2009-10-23 08:53:09 UTC (rev 655)
+++ wasko/branches/1.0/ChangeLog.txt	2009-10-26 09:19:26 UTC (rev 656)
@@ -1,3 +1,21 @@
+2009-10-26	Torsten Irlaender	<torsten.irlaender at intevation.de> 
+
+	Issue255:
+
+	* formed/formedtree_web.xml: Commented out "Freie Dokumentation NB"
+
+	Issue530:
+
+	* waskaweb/public/xml/eval_analyse.xml,
+	  waskaweb/public/xml/eval_weitere.xml: Unified namings
+
+	Issue522:
+
+	* waskaweb/i18n/de/LC_MESSAGES/waskaweb.po,
+	  waskaweb/controllers/evaluate.py: Changed translation: Does not
+	  include umlauts anymore (quickfix) 
+
+
 2009-10-23	Torsten Irlaender	<torsten.irlaender at intevation.de> 
 
 	Set version to 1.1.0

Modified: wasko/branches/1.0/formed/formedtree_web.xml
===================================================================
--- wasko/branches/1.0/formed/formedtree_web.xml	2009-10-23 08:53:09 UTC (rev 655)
+++ wasko/branches/1.0/formed/formedtree_web.xml	2009-10-26 09:19:26 UTC (rev 656)
@@ -3788,9 +3788,11 @@
         <text description="Nennung Sonstiges" function="suppress_value" maxlength="256" name="nbetr_verbl_t" size="40" target="d"/>
         <rule description="'nbetr_start' muss vor 'nbetr_ende' liegen." expr="$nbetr_start isset $nbetr_start known and $nbetr_ende isset $nbetr_ende known and and $nbetr_start $nbetr_ende &gt; and not" name="date-sequence-rule-99" value="'Datum Start der Nachbetreuung' darf zeitlich nicht nach 'Datum Ende der Nachbetreuung' liegen."/>
       </page>
+      <!--
       <page description="7.2 Freie Dokumentation zur Nachbetreuung" name="page-34">
         <textarea description="Freie Dokumentation zur Nachbetreuung" function="suppress_value" name="dok_nebtr" rows="30"/>
       </page>
+      -->
     </group>
   </case>
   <logbook>

Modified: wasko/branches/1.0/waskaweb/controllers/evaluate.py
===================================================================
--- wasko/branches/1.0/waskaweb/controllers/evaluate.py	2009-10-23 08:53:09 UTC (rev 655)
+++ wasko/branches/1.0/waskaweb/controllers/evaluate.py	2009-10-26 09:19:26 UTC (rev 656)
@@ -188,7 +188,6 @@
             try:
                 form_result  = validator.to_python(params)
             except formencode.Invalid, error:
-                print error
                 form_result = error.value
                 form_errors = error.error_dict or {}
                 c.evaloptions = get_search_options(session.get('evaluation.options'), id)

Modified: wasko/branches/1.0/waskaweb/i18n/de/LC_MESSAGES/waskaweb.po
===================================================================
--- wasko/branches/1.0/waskaweb/i18n/de/LC_MESSAGES/waskaweb.po	2009-10-23 08:53:09 UTC (rev 655)
+++ wasko/branches/1.0/waskaweb/i18n/de/LC_MESSAGES/waskaweb.po	2009-10-26 09:19:26 UTC (rev 656)
@@ -297,7 +297,7 @@
 
 #: waskaweb/lib/validators.py:52
 msgid "Date is invalid"
-msgstr "Datum ist ungültig"
+msgstr "Datum ist ungueltig"
 
 #: waskaweb/model/case.py:1204 waskaweb/model/case.py:1205
 #: waskaweb/templates/casemanagement/caselist.mako:64

Modified: wasko/branches/1.0/waskaweb/public/xml/eval_analyse.xml
===================================================================
--- wasko/branches/1.0/waskaweb/public/xml/eval_analyse.xml	2009-10-23 08:53:09 UTC (rev 655)
+++ wasko/branches/1.0/waskaweb/public/xml/eval_analyse.xml	2009-10-26 09:19:26 UTC (rev 656)
@@ -1,7 +1,7 @@
 <evaluationset>
   <id>4</id>
   <version>1.0</version>
-  <name>Analyse</name>
+  <name>Fallaktenanalyse</name>
   <desc>Analyse der Fallakten nach Phasen und Validität</desc>
   <evaluation>
     <id>1</id>

Modified: wasko/branches/1.0/waskaweb/public/xml/eval_weitere.xml
===================================================================
--- wasko/branches/1.0/waskaweb/public/xml/eval_weitere.xml	2009-10-23 08:53:09 UTC (rev 655)
+++ wasko/branches/1.0/waskaweb/public/xml/eval_weitere.xml	2009-10-26 09:19:26 UTC (rev 656)
@@ -1,7 +1,7 @@
 <evaluationset>
   <id>3</id>
   <version>0.9.2</version>
-  <name>Weitere Kategorien</name>
+  <name>Weitere Kriterien</name>
   <desc>Weitere Auswertungen der CM Fälle</desc>
   <requirement>
     <phase>2</phase>