Index: openacs-4/packages/logger/lib/entries.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/lib/entries.tcl,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/logger/lib/entries.tcl	13 Jan 2005 13:58:22 -0000	1.13
+++ openacs-4/packages/logger/lib/entries.tcl	17 Jun 2005 09:33:26 -0000	1.14
@@ -425,14 +425,14 @@
     set task_left_join {
         LEFT JOIN  (select 
                     r.title, 
-                    m.logger_entry,
+                    ar.object_id_two as logger_entry,
                     i.item_id 
                     from 
                     cr_items i, 
                     cr_revisions r,
-                    pm_task_logger_proj_map m 
-                    where 
-                    r.item_id = m.task_item_id and
+		    acs_rels ar
+		    where r.item_id = ar.object_id_one and
+		    ar.rel_type = 'application_data_link' and
                     i.live_revision = r.revision_id) task 
         ON le.entry_id = task.logger_entry,
     }
Index: openacs-4/packages/logger/sql/postgresql/logger-tables-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/sql/postgresql/logger-tables-create.sql,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/logger/sql/postgresql/logger-tables-create.sql	9 May 2003 11:04:13 -0000	1.5
+++ openacs-4/packages/logger/sql/postgresql/logger-tables-create.sql	17 Jun 2005 09:33:27 -0000	1.6
@@ -40,8 +40,8 @@
 begin
 PERFORM acs_object_type__create_type (
 	''logger_project'',            -- object_type          
-	''Logger project'',            -- pretty_name          
-	''Logger projects'',           -- pretty_plural        
+	''#logger.Logger_project#'',            -- pretty_name          
+	''#logger.Logger_projects#'',           -- pretty_plural        
 	''acs_object'',                -- supertype            
 	''logger_projects'',           -- table_name           
 	''project_id'',                -- id_column            
@@ -108,8 +108,8 @@
 begin
 PERFORM acs_object_type__create_type (
 	''logger_variable'',            -- object_type          
-	''Logger variable'',            -- pretty_name          
-	''Logger variables'',           -- pretty_plural        
+	''#logger.Logger_variable#'',            -- pretty_name          
+	''#logger.Logger_variables#'',           -- pretty_plural        
 	''acs_object'',                -- supertype            
 	''logger_variables'',           -- table_name           
 	''variable_id'',                -- id_column            
@@ -236,8 +236,8 @@
 begin
 PERFORM  acs_object_type__create_type (
 	''logger_entry'',        -- object_type          
-	''Logger entry'',        -- pretty_name          
-	''Logger entries'',      -- pretty_plural        
+	''#logger.Logger_entry#'',        -- pretty_name          
+	''#logger.Logger_entries#'',      -- pretty_plural        
 	''acs_object'',          -- supertype            
 	''logger_entries'',      -- table_name           
 	''entry_id'',            -- id_column            
Index: openacs-4/packages/logger/tcl/apm-callback-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/tcl/apm-callback-procs.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/logger/tcl/apm-callback-procs.tcl	8 Jun 2005 20:52:54 -0000	1.6
+++ openacs-4/packages/logger/tcl/apm-callback-procs.tcl	17 Jun 2005 09:33:27 -0000	1.7
@@ -14,9 +14,9 @@
 
     @author Peter Marklund
 } {
-    logger::variable::new -name "Time" -unit "hours" -pre_installed_p 1
+    logger::variable::new -name "[_ logger.Time]" -unit "[_ logger.hours]" -pre_installed_p 1
 
-    logger::variable::new -name "Expense" -unit "Euro" -pre_installed_p 1
+    logger::variable::new -name "[_ logger.Expense]" -unit "[_ logger.Euro]" -pre_installed_p 1
 }
 
 ad_proc -public logger::apm::before_uninstall {} {