Index: src/org/w3c/unicorn/Framework.java
===================================================================
--- src/org/w3c/unicorn/Framework.java	(revision 617:2968c72be675)
+++ src/org/w3c/unicorn/Framework.java	(revision 633:624e95f9f277)
@@ -1,3 +1,3 @@
-// $Id: Framework.java,v 1.16 2009-10-01 17:32:24 tgambet Exp $
+// $Id: Framework.java,v 1.17 2009-10-02 16:52:10 tgambet Exp $
 // Author: Damien LEROY & Thomas GAMBET.
 // (c) COPYRIGHT MIT, ERCIM ant Keio, 2006.
@@ -30,4 +30,6 @@
 import org.apache.velocity.app.Velocity;
 import org.apache.velocity.app.VelocityEngine;
+import org.apache.velocity.tools.generic.EscapeTool;
+import org.w3c.unicorn.action.LanguageAction;
 import org.w3c.unicorn.contract.Observer;
 import org.w3c.unicorn.contract.WADLUnmarshaller;
@@ -104,4 +106,5 @@
 		mapOfObserver = new LinkedHashMap<String, Observer>();
 		mapOfReponseParser = new LinkedHashMap<String, ResponseParser>();
+		LanguageAction.setLanguageProperties(new TreeMap<String, Properties>());
 	}
 	
@@ -424,4 +427,5 @@
 			logger.debug("> Found language (default): " + defaultProps.getProperty("lang") + " - " + defaultProps.getProperty("language"));
 			defaultProps.put("complete", "true");
+			LanguageAction.addLanguageProperties(defaultProps);
 			languageProperties.put(Property.get("DEFAULT_LANGUAGE"), defaultProps);
 		} catch (IllegalArgumentException e) {
@@ -442,4 +446,5 @@
 				Properties props = Language.load(langFile);
 				logger.debug("> Found language: " + props.getProperty("lang") + " - " + props.getProperty("language"));
+				LanguageAction.addLanguageProperties(props);
 				Language.complete(props, defaultProps);
 				languageProperties.put(props.getProperty("lang"), props);
@@ -481,4 +486,5 @@
 		    	context.put((String) key, langProps.get(key));
 		    }
+			context.put("esc", new EscapeTool());
 			context.put("tasklist", mapOfTask);
 			context.put("param_prefix", Property.get("UNICORN_PARAMETER_PREFIX"));