--- ECHO_content/ECHO_collection.py	2007/07/19 11:02:28	1.289
+++ ECHO_content/ECHO_collection.py	2008/02/04 18:49:13	1.294
@@ -196,12 +196,15 @@ class ECHO_locale(ZopePageTemplate):
         meta_type="ECHO_locale"
 
         def __init__(self,id,lang,title,label,text=None,content_type=None):
-                self.lang=lang
-                self.title=title
-                self.label=label
-                if text:
-                        self.pt_edit(text, content_type)
-                self.id=id
+            self.lang=lang
+            self.title=title
+            self.label=label
+            # default content
+            if not text:
+                text = open(self._default_content_fn).read()
+                content_type = 'text/html'
+            self.pt_edit(text, content_type)
+            self.id=id
 
         manage_options = ZopePageTemplate.manage_options+(
                 {'label':'Main Config','action':'change_ECHO_localeForm'},
@@ -218,6 +221,8 @@ class ECHO_locale(ZopePageTemplate):
                 self.title=title
                 self.label=label
                 if not text is None:
+                        if content_type is None:
+                            content_type = self.content_type
                         self.pt_edit(text, content_type)
 
                 if RESPONSE is not None:
@@ -307,6 +312,8 @@ class ECHO_layoutTemplate(ZopePageTempla
         if text is None:
             self._default_content_fn = os.path.join(package_home(globals()),'zpt','ECHO_%s_template_standard.zpt'%EchoType)
             text = open(self._default_content_fn).read()
+        if content_type is None:
+            content_type = self.content_type
         self.pt_edit(text, content_type)
 
 
@@ -1379,10 +1386,7 @@ class ECHO_resource(CatalogAware,Folder,
                    
                    ret= self.metaDataHash.get(fieldNameTest,empty)
                
-            if type(ret) is StringType:
-               return ret.decode('utf-8')
-            else:
-               return ret
+            return unicodify(ret)
 
     getFieldValue=getMDValue #depricated
 
@@ -2010,10 +2014,10 @@ def manage_addECHO_linkForm(self):
         return pt()
 
 
-def manage_addECHO_link(self,id,title,label,description="",contentType="",responsible="",link="",weight="",coords=[],credits=None,RESPONSE=None):
+def manage_addECHO_link(self,id,title,label,description="",contentType="",responsible="",link="",weight="",coords=[],credits=None,linkType="external",RESPONSE=None):
     """Add an external Link"""
 
-    newObj=ECHO_link(id,link,title,label,description,contentType,responsible,credits,weight,coords)
+    newObj=ECHO_link(id,link,title,label,description,contentType,responsible,credits,weight,coords,linkType)
 
     self._setObject(id,newObj)
     
@@ -3749,7 +3753,10 @@ class ECHO_root(Folder,Persistent,Implic
 
     def formatAscii(self,str,url=None):
         """ersetze ascii umbrueche durch <br>"""
-        #url=None
+
+	if not str: 
+            return ""
+
         if url:
             
             retStr=""
@@ -3761,9 +3768,10 @@ class ECHO_root(Folder,Persistent,Implic
                 retStr+="""<a href="%s">%s</a><br/>"""%(strUrl,word)
             str=retStr
         if str:
-            return re.sub(r"[\n]","<br/>",str)
+            str = re.sub(r"[\n]","<br/>",str)
+            return unicodify(str)
         else:
-            return ""
+            return u""
         
     link2html=vlp_xmlhelpers.link2html
     related2html=vlp_xmlhelpers.related2html
@@ -4134,6 +4142,8 @@ class ECHO_linkList(ZopePageTemplate,ECH
          self.ZBindings_edit(self._default_bindings)
          if text is None:
              text = ''
+         if content_type is None:
+             content_type = self.content_type
          self.pt_edit(text, contentType)