Index: openacs-4/packages/logger/lib/entries.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/lib/entries.tcl,v
diff -u -r1.14 -r1.15
--- openacs-4/packages/logger/lib/entries.tcl 17 Jun 2005 09:33:26 -0000 1.14
+++ openacs-4/packages/logger/lib/entries.tcl 27 Jul 2005 16:13:12 -0000 1.15
@@ -130,7 +130,7 @@
append project_where " and lp.active_p = :project_status "
}
- set project_status_values [list [list "Open" "t"] [list "Closed" "f"]]
+ set project_status_values [list [list "[_ logger.Open]" "t"] [list "[_ logger.Closed]" "f"]]
} else {
set project_where "and lp.project_id = :project_id"
@@ -153,54 +153,54 @@
label {}
display_template {
-
+ alt="[_ logger.Edit]" border="0">
}
}
project_id {
display_col project_name
- label "Project"
+ label "[_ logger.Project]"
hide_p {[ad_decode [exists_and_not_null project_id] 1 1 0]}
}
user_id {
- label "User"
+ label "[_ logger.User]"
display_col user_name
link_url_eval {[acs_community_member_url -user_id $user_id]}
csv_col user_name
hide_p {[ad_decode [exists_and_not_null user_id] 1 1 0]}
}
time_stamp {
- label "Date"
+ label "[_ logger.Date]"
display_col time_stamp_pretty
- aggregate_label {[ad_decode $variable(type) "additive" "Total" "Average"]}
- aggregate_group_label {[ad_decode $variable(type) "additive" "Group total" "Group Average"]}
+ aggregate_label {[ad_decode $variable(type) "additive" "[_ logger.Total]" "[_ logger.Average]"]}
+ aggregate_group_label {[ad_decode $variable(type) "additive" "[_ logger.Group_total]" "[_ logger.Group_Average]"]}
}
value {
label $variable(name)
link_url_eval {[export_vars -base "${my_base_url}log" { entry_id }]}
- link_html { title "View this entry" }
+ link_html { title "[_ logger.View_this_entry]" }
aggregate {[ad_decode $variable(type) "additive" sum average]}
html { align right }
display_eval {[lc_numeric $value]}
}
description {
- label "Description"
+ label "[_ logger.Description]"
display_eval {[string_truncate -len 50 -- $description]}
link_url_eval {[export_vars -base "${my_base_url}log" { entry_id }]}
- link_html { title "View this entry" }
+ link_html { title "[_ logger.View_this_entry]" }
}
task_name {
- label "Task"
+ label "[_ logger.Task]"
link_url_eval {[export_vars -base "${my_project_manager_url}task-one" { task_id }]}
}
description_long {
- label "Description"
+ label "[_ logger.Description]"
display_eval {[string_truncate -len 400 -- $description]}
hide_p 1
link_url_eval {[export_vars -base "${my_base_url}log" { entry_id }]}
- link_html { title "View this entry" }
+ link_html { title "[_ logger.View_this_entry]" }
}
}
@@ -210,7 +210,7 @@
set filters {
project_id {
- label "Projects"
+ label "[_ logger.Projects]"
values $project_values
where_clause {
le.project_id = :project_id
@@ -219,14 +219,14 @@
has_default_p {[ad_decode [llength $project_values] 1 1 0]}
}
project_status {
- label "Project status"
+ label "[_ logger.Project_status]"
values $project_status_values
where_clause {
lp.active_p = :project_status
}
}
variable_id {
- label "Variables"
+ label "[_ logger.Variables]"
values {[db_list_of_lists select_variables {}]}
where_clause {
le.variable_id = :variable_id
@@ -235,85 +235,85 @@
has_default_p t
}
projection_id {
- label "Projections"
+ label "[_ logger.Projections]"
type multivar
values $projection_values
has_default_p 1
}
user_id {
- label "Users"
+ label "[_ logger.Users]"
values {[db_list_of_lists select_users {}]}
where_clause {
submitter.person_id = :user_id
}
}
time_stamp {
- label "Date"
+ label "[_ logger.Date]"
where_clause {
le.time_stamp >= to_date(:start_date,'YYYY-MM-DD') and le.time_stamp <= to_date(:end_date,'YYYY-MM-DD')
}
- other_label "Custom"
+ other_label "[_ logger.Custom]"
type multival
has_default_p 1
values {
{
- "Today" {
+ "[_ logger.Today]" {
[clock format [clock seconds] -format "%Y-%m-%d"]
[clock format [clock seconds] -format "%Y-%m-%d"]
}
}
{
- "Yesterday" {
+ "[_ logger.Yesterday]" {
[clock format [clock scan "-1 days"] -format "%Y-%m-%d"]
[clock format [clock scan "-1 days"] -format "%Y-%m-%d"]
}
}
{
- "This week" {
+ "[_ logger.This_week]" {
[clock format [clock scan "-$weekdayno days"] -format "%Y-%m-%d"]
[clock format [clock scan "[expr 6-$weekdayno] days"] -format "%Y-%m-%d"]
}
}
{
- "Last week" {
+ "[_ logger.Last_week]" {
[clock format [clock scan "[expr -7-$weekdayno] days"] -format "%Y-%m-%d"]
[clock format [clock scan "[expr -1-$weekdayno] days"] -format "%Y-%m-%d"]
}
}
{
- "Past 7 days" {
+ "[_ logger.Past_7_days]" {
[clock format [clock scan "-1 week 1 day"] -format "%Y-%m-%d"]
[clock format [clock seconds] -format "%Y-%m-%d"]
}
}
{
- "This month" {
+ "[_ logger.This_month]" {
[clock format [clock scan "[expr 1-$monthdayno] days"] -format "%Y-%m-%d"]
[clock format [clock scan "1 month -1 day" -base [clock scan "[expr 1-$monthdayno] days"]] -format "%Y-%m-%d"]
}
}
{
- "Last month" {
+ "[_ logger.Last_month]" {
[clock format [clock scan "-1 month [expr 1-$monthdayno] days"] -format "%Y-%m-%d"]
[clock format [clock scan "1 month -1 day" -base [clock scan "-1 month [expr 1-$monthdayno] days"]] -format "%Y-%m-%d"]
}
}
{
- "Past 30 days" {
+ "[_ logger.Past_30_days]" {
[clock format [clock scan "-1 month 1 day"] -format "%Y-%m-%d"]
[clock format [clock seconds] -format "%Y-%m-%d"]
}
}
{
- "Always" {
+ "[_ logger.Always]" {
[clock format 0 -format "%Y-%m-%d"]
[clock format [clock scan "+10 year"] -format "%Y-%m-%d"]
}
}
}
}
pm_task_id {
- label "Tasks"
+ label "[_ logger.Tasks]"
where_clause {
task.item_id = :pm_task_id
}
@@ -322,18 +322,18 @@
set orderbys {
time_stamp {
- label "Date"
+ label "[_ logger.Date]"
orderby_desc "le.time_stamp desc, ao.creation_date desc"
orderby_asc "le.time_stamp asc, ao.creation_date asc"
default_direction desc
}
project_id {
- label "Project"
+ label "[_ logger.Project]"
orderby_asc "project_name asc, le.time_stamp desc, ao.creation_date desc"
orderby_desc "project_name desc, le.time_stamp desc, ao.creation_date desc"
}
user_id {
- label "User"
+ label "[_ logger.User]"
orderby_asc "user_name asc, le.time_stamp desc, ao.creation_date desc"
orderby_desc "user_name desc, le.time_stamp desc, ao.creation_date desc"
}
@@ -343,7 +343,7 @@
orderby_desc "value desc, le.time_stamp desc, ao.creation_date desc"
}
description {
- label "Description"
+ label "[_ logger.Description]"
orderby_asc "description asc, le.time_stamp desc, ao.creation_date desc"
orderby_desc "description desc, le.time_stamp desc, ao.creation_date desc"
}
@@ -357,10 +357,10 @@
set groupby_values {
- { "Day" { { groupby time_stamp } { orderby time_stamp,desc } } }
- { "Week" { { groupby time_stamp_week } { orderby time_stamp,desc } } }
- { "Project" { { groupby project_name } { orderby project_id,asc } } }
- { "User" { { groupby user_id } { orderby user_id,asc } } }
+ { "[_ logger.Day]" { { groupby time_stamp } { orderby time_stamp,desc } } }
+ { "[_ logger.Week]" { { groupby time_stamp_week } { orderby time_stamp,desc } } }
+ { "[_ logger.Project]" { { groupby project_name } { orderby project_id,asc } } }
+ { "[_ logger.User]" { { groupby user_id } { orderby user_id,asc } } }
}
set normal_row {
@@ -449,17 +449,17 @@
set add_link "${base_url}project-select"
}
-set actions_list [list "Add Entry" $add_link "Add new log entry"]
+set actions_list [list "[_ logger.Add_Entry]" $add_link "[_ logger.Add_new_log_entry]"]
set delete_link "${base_url}log-delete"
-set bulk_actions_list [list "Delete" $delete_link "Delete checked entries"]
+set bulk_actions_list [list "[_ logger.Delete]" $delete_link "[_ logger.lt_Delete_checked_entrie]"]
list::create \
-name entries \
-multirow entries \
-key entry_id \
- -row_pretty_plural "entries" \
+ -row_pretty_plural "[_ logger.entries]" \
-checkbox_name checkbox \
-selected_format $format \
-class "list" \
@@ -474,17 +474,17 @@
} \
-elements $elements -filters $filters \
-groupby {
- label "Group by"
+ label "[_ logger.Group_by]"
type multivar
values $groupby_values
} -orderby $orderbys -formats {
normal {
- label "Table"
+ label "[_ logger.Table]"
layout table
row $normal_row
}
detailed {
- label "Detailed table"
+ label "[_ logger.Detailed_table]"
layout table
row {
checkbox {
@@ -504,7 +504,7 @@
}
}
list {
- label "List"
+ label "[_ logger.List]"
layout list
template {
@@ -519,17 +519,17 @@
- Project:
+ [_ logger.Project_1]
- By
- on
+ [_ logger.By]
+ [_ logger.on]
}
}
csv {
- label "CSV"
+ label "[_ logger.CSV]"
output csv
page_size 0
}
Index: openacs-4/packages/logger/tcl/variable-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/tcl/variable-procs.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/logger/tcl/variable-procs.tcl 4 Jan 2004 17:25:16 -0000 1.8
+++ openacs-4/packages/logger/tcl/variable-procs.tcl 27 Jul 2005 16:13:12 -0000 1.9
@@ -33,6 +33,9 @@
@author Peter Marklund
} {
ad_assert_arg_value_in_list type {additive non-additive}
+
+ set name [lang::util::convert_to_i18n -package_key "logger" -prefix "name" -text $name]
+ set unit [lang::util::convert_to_i18n -package_key "logger" -prefix "unit" -text $unit]
# Use ad_conn to initialize variables
logger::util::set_vars_from_ad_conn {package_id creation_user creation_ip}