--- kernel/classes/ezcontentobject.php	18 Apr 2006 07:16:16 -0000	1.1.1.1
+++ kernel/classes/ezcontentobject.php	25 Jan 2007 11:41:03 -0000
@@ -263,7 +263,7 @@
         return $name;
     }
 
-    function &versionLanguageName( $contentObjectID, $version, $lang = false )
+    function &versionLanguageName( $contentObjectID, $version, $lang = false, $plutotLaTraduction = false )
     {
         if ( !$lang )
         {
@@ -287,7 +287,7 @@
             $name = false;
             return $name;
         }
-        return $result[0]['name'];
+        return $result[0][$plutotLaTraduction ? 'real_translation' : 'name'];
     }
 
     /*!
--- kernel/classes/ezcontentobjecttreenode.php	18 Apr 2006 07:16:17 -0000	1.1.1.1
+++ kernel/classes/ezcontentobjecttreenode.php	25 Jan 2007 11:41:03 -0000
@@ -145,7 +145,8 @@
 
                       "keys" => array( "node_id" ),
                       "function_attributes" => array( "name" => "getName",
-                                                      'data_map' => 'dataMap',
+                                                      'd' => 'dataMapTranslated',
+                                                      'data_map' => 'dataMapTranslated',
                                                       'remote_id' => 'remoteID', // Note: This overrides remote_id field
                                                       "object" => "object",
                                                       "subtree" => "subTree",
@@ -212,11 +213,18 @@
              attribute identifiers.
      \sa eZContentObject::fetchDataMap
     */
-    function &dataMap()
+    function &dataMap($translated = false)
     {
         $obj =& $this->object();
-        return $obj->fetchDataMap( $this->attribute( 'contentobject_version' ) );
+		$langue = $obj->CurrentLanguage;
+		if($translated)
+			$obj->CurrentLanguage = $obj->versionLanguageName($obj->ID, $obj->CurrentVersion, false, true);
+        $r =& $obj->fetchDataMap( $this->attribute( 'contentobject_version' ) );
+		$obj->CurrentLanguage = $langue;
+		return $r;
     }
+	
+	function &dataMapTranslated() { return $this->dataMap(true); }
 
     /*!
      Get remote id of content node, the remote ID is often used to synchronise imports and exports.