Index: openacs-4/packages/evaluation-portlet/lib/tasks-chunk.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation-portlet/lib/tasks-chunk.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/evaluation-portlet/lib/tasks-chunk.tcl 31 May 2004 23:43:09 -0000 1.1
+++ openacs-4/packages/evaluation-portlet/lib/tasks-chunk.tcl 10 Jun 2004 22:00:22 -0000 1.2
@@ -15,63 +15,63 @@
set return_url "[ad_conn url]?[export_vars { grade_id }]"
set elements [list task_name \
- [list label "Name" \
- link_url_col task_url \
- orderby_asc {task_name asc} \
- orderby_desc {task_name desc}] \
- pretty_due_date \
- [list label "Due date" \
- orderby_asc {pretty_due_date asc} \
- orderby_desc {pretty_due_date desc}] \
- ]
+ [list label "[_ evaluation-portlet.Name_]" \
+ link_url_col task_url \
+ orderby_asc {task_name asc} \
+ orderby_desc {task_name desc}] \
+ due_date_pretty \
+ [list label "[_ evaluation-portlet.Due_date_]" \
+ orderby_asc {due_date_pretty asc} \
+ orderby_desc {due_date_pretty desc}] \
+ ]
if { $admin_p } {
#admin
lappend elements solution \
[list label "" \
link_url_col solution_url \
- link_html { title "Add/edit solution" }]
+ link_html { title "[_ evaluation-portlet.Addedit_solution_]" }]
lappend elements audit_info \
[list label "" \
link_url_col audit_info_url \
- link_html { title "Audit info" }]
+ link_html { title "[_ evaluation-portlet.Audit_info_]" }]
lappend elements groups_admin \
[list label "" \
link_url_col groups_admin_url \
- link_html { title "Groups administration" }]
+ link_html { title "[_ evaluation-portlet.lt_Groups_administration]" }]
lappend elements view \
[list label "" \
sub_class narrow \
display_template {
} \
link_url_eval {[export_vars -base "${base_url}evaluation/admin/tasks/task-add-edit" { grade_id task_id return_url mode }]} \
- link_html { title "View task" }]
+ link_html { title "[_ evaluation-portlet.View_task_]" }]
lappend elements edit \
[list label "" \
sub_class narrow \
display_template {
} \
link_url_eval {[export_vars -base "${base_url}evaluation/admin/tasks/task-add-edit" { return_url item_id grade_id task_id }]} \
- link_html { title "Edit task" }]
+ link_html { title "[_ evaluation-portlet.Edit_task_]" }]
lappend elements delete \
[list label "" \
- sub_class narrow \
- display_template {
} \
- link_url_eval {[export_vars -base "${base_url}evaluation/admin/tasks/task-delete" { grade_id task_id return_url }]} \
- link_html { title "Delete task" }]
+ sub_class narrow \
+ display_template {} \
+ link_url_eval {[export_vars -base "${base_url}evaluation/admin/tasks/task-delete" { grade_id task_id return_url }]} \
+ link_html { title "[_ evaluation-portlet.Delete_task_]" }]
set multirow_name tasks_admin
- set actions [list "Add $grade_name" [export_vars -base "${base_url}evaluation/admin/tasks/task-add-edit" { return_url grade_id }] ]
+ set actions [list "[_ evaluation-portlet.Add_grade_name_]" [export_vars -base "${base_url}evaluation/admin/tasks/task-add-edit" { return_url grade_id }] ]
} else {
#student
lappend elements answer \
[list label "" \
link_url_col answer_url \
- link_html { title "Add/edit answer" }]
+ link_html { title "[_ evaluation-portlet.Addedit_answer_]" }]
lappend elements view \
[list label "" \
sub_class narrow \
display_template {} \
link_url_eval {[export_vars -base "${base_url}evaluation/task-view" { grade_id task_id return_url }]} \
- link_html { title "View task" }]
+ link_html { title "[_ evaluation-portlet.View_task_]" }]
set multirow_name tasks
set actions ""
}
@@ -95,74 +95,77 @@
if { $admin_p } {
- db_multirow -extend { solution_url solution solution_mode task_url audit_info audit_info_url groups_admin groups_admin_url } tasks_admin get_tasks_admin { *SQL* } {
+ db_multirow -extend { solution_url due_date_pretty solution solution_mode task_url audit_info audit_info_url groups_admin groups_admin_url } tasks_admin get_tasks_admin { *SQL* } {
+
+ set due_date_pretty [lc_time_fmt $due_date_ansi "%q"]
# working with task stuff (if it has a file/url attached)
if { [empty_string_p $task_data] } {
set task_url "[export_vars -base "${base_url}evaluation/task-view" { grade_id task_id return_url }]"
- set task_name "$task_name (No data)"
+ set task_name "[_ evaluation-portlet.task_name_No_data_]"
} elseif { [regexp "http://" $task_data] } {
set task_url "[export_vars -base "$task_data" { }]"
- set task_name "$task_name (URL)"
+ set task_name "[_ evaluation-portlet.task_name_URL_]"
} else {
# we assume it's a file
set task_url "[export_vars -base "${base_url}evaluation/view/$task_title" { revision_id }]"
- set task_name "$task_name ([format %.0f [expr ($content_length/1024)]] Kb)"
+ set task_name "$task_name ([format %.0f [lc_numeric [expr ($content_length/1024)]]] Kb)"
}
if { ![empty_string_p $solution_id] } {
set solution_mode display
set solution_url "[export_vars -base "${base_url}evaluation/admin/tasks/solution-add-edit" { grade_id task_id solution_id return_url solution_mode }]"
- set solution "View/Edit Solution"
+ set solution "[_ evaluation-portlet.ViewEdit_Solution_]"
} else {
set solution_mode edit
set solution_url "[export_vars -base "${base_url}evaluation/admin/tasks/solution-add-edit" { grade_id task_id return_url solution_mode }]"
- set solution "Upload Solution"
+ set solution "[_ evaluation-portlet.Upload_Solution_]"
}
set audit_info_url "[export_vars -base "${base_url}evaluation/admin/evaluations/audit-info" { grade_id task_id }]"
- set audit_info "Audit Info."
+ set audit_info "[_ evaluation-portlet.Audit_Info_]"
if { ![string eq $number_of_members 1] } {
set groups_admin_url "[export_vars -base "${base_url}evaluation/admin/groups/one-task" { grade_id task_id }]"
- set groups_admin "Groups Admin."
+ set groups_admin "[_ evaluation-portlet.Groups_Admin_]"
}
}
} else {
- db_multirow -extend { task_url solution_url solution solution_mode answer answer_url } tasks get_tasks { *SQL* } {
- set answer_mode display
+ db_multirow -extend { task_url solution_url solution due_date_pretty solution_mode answer answer_url } tasks get_tasks { *SQL* } {
+ set answer_mode display
+ set due_date_pretty [lc_time_fmt $due_date_ansi "%q"]
# working with task stuff (if it has a file/url attached)
if { [empty_string_p $task_data] } {
set task_url "[export_vars -base "${base_url}evaluation/task-view" { grade_id task_id return_url }]"
- set task_name "$task_name (No data)"
+ set task_name "[_ evaluation-portlet.task_name_No_data_]"
} elseif { [regexp "http://" $task_data] } {
set task_url "[export_vars -base "$task_data" { }]"
- set task_name "$task_name (URL)"
+ set task_name "[_ evaluation-portlet.task_name_URL_]"
} else {
# we assume it's a file
set task_url "[export_vars -base "${base_url}evaluation/view/$task_title" { revision_id }]"
- set task_name "$task_name ([format %.0f [expr ($content_length/1024)]] Kb)"
+ set task_name "$task_name ([format %.0f [lc_numeric [expr ($content_length/1024)]]] Kb)"
}
if { [string eq $online_p "t"] } {
if { ([template::util::date::compare $due_date [template::util::date::now]] > 0) } {
if { [empty_string_p $answer_id] } {
- set answer "submit answer"
+ set answer "[_ evaluation-portlet.submit_answer_]"
set answer_mode edit
set answer_url "[export_vars -base "${base_url}evaluation/answer-add-edit" { grade_id task_id return_url answer_mode }]"
} else {
- set answer "submit answer again"
+ set answer "[_ evaluation-portlet.submit_answer_again_]"
set answer_mode display
set answer_url "[export_vars -base "${base_url}evaluation/answer-add-edit" { grade_id task_id answer_id return_url answer_mode }]"
}
} elseif { [string eq $turn_in_late_p "t"] } {
if { [empty_string_p $answer_id] } {
- set answer "submit answer "
+ set answer "[_ evaluation-portlet.lt_submit_answer_style_f]"
set answer_mode edit
set answer_url "[export_vars -base "${base_url}evaluation/answer-add-edit" { grade_id task_id return_url answer_mode }]"
} else {
- set answer "submit answer again"
+ set answer "[_ evaluation-portlet.lt_submit_answer_style_f_1]"
set answer_mode display
set answer_url "[export_vars -base "${base_url}evaluation/admin/tasks/solution-add-edit" { grade_id task_id answer_id return_url solution_mode }]"
}