[Cdd-commits] r768 - cdd/trunk/webtools

[CDD Subversion Commit]

Author: tille
Date: Mon May 26 21:45:11 2008
New Revision: 768

Modified:
   cdd/trunk/webtools/tasks_idx.py
Log:
Verbatim long descriptions


Modified: cdd/trunk/webtools/tasks_idx.py
==============================================================================
--- cdd/trunk/webtools/tasks_idx.py	(original)
+++ cdd/trunk/webtools/tasks_idx.py	Mon May 26 21:45:11 2008
@@ -43,9 +43,6 @@
 		tasks		= tasksdict,
              )
 
-#for task in tasksdict.keys():
-#    	 data['tasks'].append(tasksdict[task]['Task'])
-#    	 data['taskshortdesc'].append(tasksdict[task]['ShortDesc'])
 
 for lang in languages:
 	l10nstring[lang].install()
@@ -72,13 +69,11 @@
 
 	# Make sure that long description is taken over verbatim because it might
 	# contain several html tags
-	VERBATIM=('tasklongdesc', 'projectadvertising')
+	VERBATIM=('projectadvertising', )
 	for verbatim in VERBATIM:
-	    try:
-		data[verbatim] = Markup(data[verbatim]) # .encode('utf-8'))
-	    except UnicodeDecodeError, err:
-	    	print "Failed to Markup(%s)" % data[verbatim]
-		print err
+		data[verbatim] = Markup(data[verbatim])
+	for task in data['tasks'].keys():
+    		data['tasks'][task]['LongDesc'] = Markup(data['tasks'][task]['LongDesc'])
 
 	template = loader.load('tasks_idx.xhtml')