Index: openacs-4/packages/notifications/catalog/notifications.en_US.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/catalog/notifications.en_US.ISO-8859-1.xml,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/notifications/catalog/notifications.en_US.ISO-8859-1.xml 8 Nov 2002 10:04:19 -0000 1.1 @@ -0,0 +1,25 @@ + + + + + Action + Delivery Method + Frequency + Item + Manage Notifications + Notification type + Object ID + Request Notification + Return URL + SUBJECT: + Type ID + Unsubscribe + Getting too much email? Manage your notifications at: %manage_notifications_url% + Notification Interval + Request Notification for %pretty_name% + You have no notifications. + You have requested notification for %pretty_name%. You may <a href="%sub_url%">unsubscribe</a>. + You may <a href="%sub_url%">request notification</a> for %pretty_name%. + [%system_name% - Batched Notification] + "manage notifications" + Index: openacs-4/packages/notifications/tcl/notification-display-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/tcl/notification-display-procs.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/notifications/tcl/notification-display-procs.tcl 1 Aug 2002 12:57:55 -0000 1.4 +++ openacs-4/packages/notifications/tcl/notification-display-procs.tcl 8 Nov 2002 10:04:22 -0000 1.5 @@ -31,10 +31,10 @@ if {![empty_string_p $request_id]} { set sub_url [unsubscribe_url -request_id $request_id -url $url] - set sub_chunk "You have requested notification for $pretty_name. You may unsubscribe." + set sub_chunk "[_ notifications.lt_You_have_requested_no]" } else { set sub_url [subscribe_url -type $type -object_id $object_id -url $url -user_id $user_id -pretty_name $pretty_name] - set sub_chunk "You may request notification for $pretty_name." + set sub_chunk "[_ notifications.lt_You_may_a_hrefsub_url]" } return "\[ $sub_chunk \]" Index: openacs-4/packages/notifications/tcl/notification-email-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/tcl/notification-email-procs.tcl,v diff -u -r1.9 -r1.10 --- openacs-4/packages/notifications/tcl/notification-email-procs.tcl 22 Sep 2002 15:49:29 -0000 1.9 +++ openacs-4/packages/notifications/tcl/notification-email-procs.tcl 8 Nov 2002 10:04:22 -0000 1.10 @@ -83,9 +83,11 @@ } { # Get email set email [cc_email_from_party $to_user_id] + + # Variable used in the content + set manage_notifications_url [manage_notifications_url] + append content "\n[_ notifications.lt_Getting_too_much_emai]" - append content "\nGetting too much email? Manage your notifications at: [manage_notifications_url]" - acs_mail_lite::send \ -to_addr $email \ -from_addr [reply_address -object_id $reply_object_id -type_id $notification_type_id] \ Index: openacs-4/packages/notifications/tcl/sweep-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/tcl/sweep-procs.tcl,v diff -u -r1.9 -r1.10 --- openacs-4/packages/notifications/tcl/sweep-procs.tcl 20 Sep 2002 21:19:00 -0000 1.9 +++ openacs-4/packages/notifications/tcl/sweep-procs.tcl 8 Nov 2002 10:04:22 -0000 1.10 @@ -74,9 +74,11 @@ ns_log Notice "NOTIF-BATCHED: content to send!" db_transaction { ns_log Notice "NOTIF-BATCHED: sending content" + # System name is used in the subject + set system_name [ad_system_name] notification::delivery::send -to_user_id $prev_user_id \ -notification_type_id $prev_type_id \ - -subject "\[[ad_system_name] - Batched Notification\]" \ + -subject "[_ notifications.lt_system_name_-_Batched]" \ -content $batched_content \ -delivery_method_id $prev_deliv_method_id @@ -104,7 +106,7 @@ # append content to built-up content ns_log Notice "NOTIF-BATCHED: appending one notif!" - append batched_content "SUBJECT: [ns_set get $notif notif_subject]\n[ns_set get $notif notif_text]\n=====================\n" + append batched_content "[_ notifications.SUBJECT] [ns_set get $notif notif_subject]\n[ns_set get $notif notif_text]\n=====================\n" lappend list_of_notification_ids [ns_set get $notif notification_id] # Set the vars Index: openacs-4/packages/notifications/www/manage.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/www/manage.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/notifications/www/manage.adp 20 Sep 2002 21:19:01 -0000 1.1 +++ openacs-4/packages/notifications/www/manage.adp 8 Nov 2002 10:04:23 -0000 1.2 @@ -1,13 +1,13 @@ -Manage Notifications -"manage notifications" +#notifications.Manage_Notifications# +#notifications.manage_notifications# - - - - + + + + @@ -19,15 +19,16 @@ - + - +
Notification typeItemFrequencyAction#notifications.Notification_type##notifications.Item##notifications.Frequency##notifications.Action#
@notifications.type@ @notifications.object_name@ @notifications.interval@Unsubscribe#notifications.Unsubscribe#
You have no notifications.#notifications.lt_You_have_no_notificat#
+ Index: openacs-4/packages/notifications/www/request-new.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/www/request-new.tcl,v diff -u -r1.5 -r1.6 --- openacs-4/packages/notifications/www/request-new.tcl 16 Sep 2002 12:36:31 -0000 1.5 +++ openacs-4/packages/notifications/www/request-new.tcl 8 Nov 2002 10:04:23 -0000 1.6 @@ -19,30 +19,30 @@ if {[empty_string_p $pretty_name]} { - set page_title "Request Notification" + set page_title "[_ notifications.Request_Notification]" } else { - set page_title "Request Notification for $pretty_name" + set page_title "[_ notifications.lt_Request_Notification_]" } -set context [list "Request Notification"] +set context [list "[_ notifications.Request_Notification]"] form create subscribe element create subscribe type_id \ - -label "Type ID" -datatype integer -widget hidden + -label "[_ notifications.Type_ID]" -datatype integer -widget hidden element create subscribe object_id \ - -label "Object ID" -datatype integer -widget hidden + -label "[_ notifications.Object_ID]" -datatype integer -widget hidden element create subscribe return_url \ - -label "Return URL" -datatype text -widget hidden + -label "[_ notifications.Return_URL]" -datatype text -widget hidden element create subscribe interval_id \ - -label "Notification Interval" -datatype integer -widget select -options [notification::get_intervals -type_id $type_id] + -label "[_ notifications.lt_Notification_Interval]" -datatype integer -widget select -options [notification::get_intervals -type_id $type_id] element create subscribe delivery_method_id \ - -label "Delivery Method" -datatype integer -widget select -options [notification::get_delivery_methods -type_id $type_id] + -label "[_ notifications.Delivery_Method]" -datatype integer -widget select -options [notification::get_delivery_methods -type_id $type_id] if {[form is_valid subscribe]} { template::form get_values subscribe type_id object_id return_url interval_id delivery_method_id