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 -N -r1.22 -r1.22.2.1
--- openacs-4/packages/notifications/catalog/notifications.en_US.ISO-8859-1.xml	7 Jun 2008 20:29:00 -0000	1.22
+++ openacs-4/packages/notifications/catalog/notifications.en_US.ISO-8859-1.xml	14 Jul 2009 11:44:34 -0000	1.22.2.1
@@ -4,6 +4,8 @@
   <msg key="Action">Action</msg>
   <msg key="Administer_Notifications">Administer Notifications</msg>
   <msg key="Change">Change</msg>
+  <msg key="Change_frequency">Change frequency</msg>
+  <msg key="Change_frequency_of_object_name">Change frequency of %object_name% Notification</msg>
   <msg key="change_interval_object_name">Change notification interval for %notifications.object_name%</msg>
   <msg key="Contents">Contents:</msg>
   <msg key="daily">daily</msg>
@@ -19,8 +21,8 @@
   <msg key="lt_Notification_Delivery_1">Notification Delivery Methods</msg>
   <msg key="lt_Notification_Interval">Notification Interval</msg>
   <msg key="lt_Notification_Interval_1">Notification Intervals</msg>
-  <msg key="lt_Notifications_Interval">Notifications Interval</msg>
   <msg key="lt_Notification_Requests">Notification Requests</msg>
+  <msg key="lt_Notifications_Interval">Notifications Interval</msg>
   <msg key="lt_Request_Notification_">Request Notification for %pretty_name%</msg>
   <msg key="lt_system_name_-_Batched">[%system_name% - Batched Notification]</msg>
   <msg key="lt_Ubsubscribe_Notification_">Unsubscribe from %pretty_name% Email Notifications</msg>
Index: openacs-4/packages/notifications/catalog/notifications.es_ES.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/catalog/notifications.es_ES.ISO-8859-1.xml,v
diff -u -N -r1.18 -r1.18.2.1
--- openacs-4/packages/notifications/catalog/notifications.es_ES.ISO-8859-1.xml	31 Mar 2009 12:18:57 -0000	1.18
+++ openacs-4/packages/notifications/catalog/notifications.es_ES.ISO-8859-1.xml	14 Jul 2009 11:44:35 -0000	1.18.2.1
@@ -4,6 +4,8 @@
   <msg key="Action">Acci�n</msg>
   <msg key="Administer_Notifications">Administrar notificaciones</msg>
   <msg key="Change">Cambiar</msg>
+  <msg key="Change_frequency">Cambiar frecuencia</msg>
+  <msg key="Change_frequency_of_object_name">Cambiar la frecuencia de las notificaciones para %object_name%</msg>
   <msg key="change_interval_object_name">Cambiar el intervalo de notificaci�n para %notifications.object_name%</msg>
   <msg key="Contents">Contenido:</msg>
   <msg key="daily">diaria</msg>
Index: openacs-4/packages/notifications/tcl/notification-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/tcl/notification-procs.tcl,v
diff -u -N -r1.15 -r1.15.4.1
--- openacs-4/packages/notifications/tcl/notification-procs.tcl	13 Jan 2008 13:49:02 -0000	1.15
+++ openacs-4/packages/notifications/tcl/notification-procs.tcl	14 Jul 2009 11:44:35 -0000	1.15.4.1
@@ -50,13 +50,27 @@
     }
     
     ad_proc -public get_intervals {
+        {-localized:boolean}
         {-type_id:required}
     } {
-	return a list of intervals that are associated with a given notification type
-	(not all intervals are available to all notification types).
-	The fields for each interval is: name, interval_id, n_seconds.
+        return a list of intervals that are associated with a given notification type
+        (not all intervals are available to all notification types).
+        The fields for each interval is: name, interval_id, n_seconds.
+        If the localized flag is set, then the name of the interval will be localized.
     } {
-        return [db_list_of_lists select_intervals {}]
+        set intervals [db_list_of_lists select_intervals {}]
+        if { $localized_p } {
+            # build pretty names for intervals
+            set intervals_pretty [list]
+            foreach elm $intervals {
+                set elm_name [lindex $elm 0]
+                set elm_id [lindex $elm 1]
+                lappend intervals_pretty [list [_ notifications.${elm_name}] $elm_id]
+            }
+            return $intervals_pretty
+        } else {
+            return $intervals
+        }
     }
 
     ad_proc -public get_delivery_methods {
Index: openacs-4/packages/notifications/www/manage.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/www/manage.adp,v
diff -u -N -r1.11 -r1.11.4.1
--- openacs-4/packages/notifications/www/manage.adp	12 Jan 2008 17:23:45 -0000	1.11
+++ openacs-4/packages/notifications/www/manage.adp	14 Jul 2009 11:44:35 -0000	1.11.4.1
@@ -1,10 +1,10 @@
 <master>
-<property name="title">#notifications.Manage_Notifications#</property>
+<property name="&doc">doc</property>
 
+<h1>#notifications.Manage_Notifications#</h1>
+
 <if @notice@ not nil>
-<h2>@notice;noquote@</h2>
+<p>@notice;noquote@</p>
 </if>
 
-#notifications.Manage_Notifications#
-
 <listtemplate name="notifications"></listtemplate>
Index: openacs-4/packages/notifications/www/manage.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/www/manage.tcl,v
diff -u -N -r1.8 -r1.8.4.1
--- openacs-4/packages/notifications/www/manage.tcl	12 Jan 2008 18:26:34 -0000	1.8
+++ openacs-4/packages/notifications/www/manage.tcl	14 Jul 2009 11:44:35 -0000	1.8.4.1
@@ -9,6 +9,7 @@
 }
 
 auth::require_login
+set doc(title) [_ notifications.Manage_Notifications]
 if { $user_id ne "" && $user_id ne [ad_conn user_id] } {
     # we need to verify that they are an admin
     permission::require_permission -object_id [ad_conn package_id] -privilege "admin"
@@ -34,7 +35,7 @@
         object_name {
             label {[_ notifications.Item]}
             link_url_eval {[export_vars -base object-goto { object_id type_id }]}
-	    link_html {title "\#notifications.goto_object_name\#"}
+            link_html {title "\#notifications.goto_object_name\#"}
         }
         interval {
             label {[_ notifications.Frequency]}
@@ -47,7 +48,7 @@
             label {[_ notifications.Action]}
             display_template {\#notifications.Unsubscribe\#}
             link_url_eval {[export_vars -base request-delete { request_id {return_url [ad_return_url]} }]}
-	    link_html {title "\#notifications.Unsubscribe_from_object_name\#"}
+            link_html {title "\#notifications.Unsubscribe_from_object_name\#"}
         }
     }
 }
@@ -56,6 +57,7 @@
 
 db_multirow -extend { interval_url } notifications select_notifications {} {
     set interval_url [export_vars -base request-change-frequency { request_id {return_url [ad_return_url]} }]
+    set interval [_ notifications.${interval}]
 }
 
 
Index: openacs-4/packages/notifications/www/request-change-frequency.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/www/request-change-frequency.adp,v
diff -u -N -r1.4 -r1.4.4.1
--- openacs-4/packages/notifications/www/request-change-frequency.adp	15 May 2007 20:14:51 -0000	1.4
+++ openacs-4/packages/notifications/www/request-change-frequency.adp	14 Jul 2009 11:44:35 -0000	1.4.4.1
@@ -1,7 +1,7 @@
 <master>
-<property name="title">@page_title;noquote@</property>
+<property name="&doc">doc</property>
 <property name="context">@context;noquote@</property>
 
-<h1>@page_title;noquote@</h1>
+<h1>#notifications.Change_frequency_of_object_name#</h1>
 
 <formtemplate id="change_frequency"></formtemplate>
Index: openacs-4/packages/notifications/www/request-change-frequency.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/www/request-change-frequency.tcl,v
diff -u -N -r1.2 -r1.2.16.1
--- openacs-4/packages/notifications/www/request-change-frequency.tcl	16 Jan 2003 13:53:40 -0000	1.2
+++ openacs-4/packages/notifications/www/request-change-frequency.tcl	14 Jul 2009 11:44:35 -0000	1.2.16.1
@@ -16,15 +16,16 @@
 
 db_1row select_notification_request {}
 
-set page_title "Edit Frequency of $object_name Notification"
-set context [list "Edit Frequency"]
+set doc(title) [_ notifications.Change_frequency]
+set context [list $doc(title)]
 
-set intervals [notification::get_intervals -type_id $type_id]
+set intervals [notification::get_intervals -localized -type_id $type_id]
 
 ad_form -name change_frequency -export {request_id return_url} -form {
-    {interval_id:integer(select)   {label "Notification Interval"}
-                                   {options $intervals}
-                                   {value $interval_id}}
+    {interval_id:integer(select)   
+        {label "[_ notifications.Frequency]"}
+        {options $intervals}
+        {value $interval_id}}
 } -on_submit {
 
     db_dml update_notification_frequency {}
Index: openacs-4/packages/notifications/www/request-new.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/www/request-new.adp,v
diff -u -N -r1.6 -r1.6.4.1
--- openacs-4/packages/notifications/www/request-new.adp	15 May 2007 20:14:51 -0000	1.6
+++ openacs-4/packages/notifications/www/request-new.adp	14 Jul 2009 11:44:35 -0000	1.6.4.1
@@ -1,5 +1,6 @@
 <master>
-<property name="title">@page_title;noquote@</property>
+<property name="&doc">doc</property>
 <property name="context">@context;noquote@</property>
-<h1>@page_title;noquote@</h1>
+
+<h1>@page_title@</h1>
 <formtemplate id="subscribe"></formtemplate>
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 -N -r1.10 -r1.10.10.1
--- openacs-4/packages/notifications/www/request-new.tcl	1 Mar 2005 00:01:39 -0000	1.10
+++ openacs-4/packages/notifications/www/request-new.tcl	14 Jul 2009 11:44:35 -0000	1.10.10.1
@@ -17,22 +17,25 @@
 # Check that the object can be subcribed to
 notification::security::require_notify_object -object_id $object_id
 
+set doc(title) [_ notifications.Request_Notification]
+set context [list $doc(title)]
+
 if {[empty_string_p $pretty_name]} { 
-    set page_title "[_ notifications.Request_Notification]"
+    set page_title [_ notifications.Request_Notification]
 } else { 
-    set page_title "[_ notifications.lt_Request_Notification_]"
+    set page_title [_ notifications.lt_Request_Notification_]
 }
 
-set context [list "[_ notifications.Request_Notification]"]
-
-set intervals [notification::get_intervals -type_id $type_id]
+set intervals_pretty [notification::get_intervals -localized -type_id $type_id]
 set delivery_methods [notification::get_delivery_methods -type_id $type_id]
 
 ad_form -name subscribe -export {type_id object_id return_url} -form {
-    {interval_id:integer(select)           {label "[_ notifications.lt_Notification_Interval]"}
-                                           {options $intervals}}
-    {delivery_method_id:integer(select)    {label "[_ notifications.Delivery_Method]"}
-                                           {options $delivery_methods}
+    {interval_id:integer(select)           
+        {label "[_ notifications.lt_Notification_Interval]"}
+        {options $intervals_pretty}}
+    {delivery_method_id:integer(select)    
+        {label "[_ notifications.Delivery_Method]"}
+        {options $delivery_methods}
         {value {[lindex [lindex $delivery_methods 0] 1]}}
     }
 } -on_submit {