Index: openacs-4/packages/xowiki/tcl/weblog-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/weblog-procs.tcl,v
diff -u -r1.21 -r1.22
--- openacs-4/packages/xowiki/tcl/weblog-procs.tcl	12 Sep 2007 18:57:03 -0000	1.21
+++ openacs-4/packages/xowiki/tcl/weblog-procs.tcl	14 Sep 2007 20:48:52 -0000	1.22
@@ -12,6 +12,7 @@
     ptag
     category_id
     {entries_of ""}
+    {locale ""}
     filter_msg
     {sort_composite ""}
     {no_footer false}
@@ -23,14 +24,14 @@
     {entry_renderer ::xowiki::Weblog::Entry}
     {entry_flag}
   }
-  
+
   ::xowiki::Weblog instproc init {} {
     my instvar filter_msg package_id nr_items next_page_link prev_page_link
-    my instvar date category_id tag ptag page_number page_size summary items 
+    my instvar date category_id tag ptag page_number page_size summary items locale
     my instvar name_filter entry_label entries_of sort_composite summary_chars
     
     my log "--W starting"
-    set folder_id [::$package_id set folder_id]
+    set folder_id [::$package_id folder_id]
     set filter_msg  ""
     set query_parm ""
     
@@ -91,6 +92,14 @@
       set base_table xowiki_form_pagei
     }
 
+    if {$locale ne ""} {
+      #set locale "default+system"
+      foreach {locale locale_clause} \
+	  [::xowiki::Portlet locale_clause -revisions p -items ci $package_id $locale] break
+      #my msg "--L locale_clause=$locale_clause"
+      append extra_where_clause $locale_clause
+    }
+    
     # create an item container, which delegates rendering to its children
     set items [::xo::OrderedComposite new -proc render {} {
       set content ""
Index: openacs-4/packages/xowiki/tcl/xowiki-portlet-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/Attic/xowiki-portlet-procs.tcl,v
diff -u -r1.97 -r1.98
--- openacs-4/packages/xowiki/tcl/xowiki-portlet-procs.tcl	14 Sep 2007 09:32:25 -0000	1.97
+++ openacs-4/packages/xowiki/tcl/xowiki-portlet-procs.tcl	14 Sep 2007 20:48:52 -0000	1.98
@@ -124,8 +124,11 @@
     return $prefix$suffix
   }
 
-  ::xowiki::Portlet instproc locale_clause {
-    -revisions -items package_id locale
+  ::xowiki::Portlet proc locale_clause {
+    -revisions 
+    -items 
+    package_id 
+    locale
   } {
     set default_locale [$package_id default_locale]
     set system_locale ""
@@ -135,7 +138,7 @@
       set locale $default_locale
       set include_system_locale 0
     }
-    #my msg "with_system_locale=$with_system_locale, locale=$locale, default_locale=$default_locale "
+    #my msg "--L with_system_locale=$with_system_locale, locale=$locale, default_locale=$default_locale"
 
     set locale_clause ""    
     if {$locale ne ""} {
@@ -383,7 +386,7 @@
                 [::xo::db::CrClass lookup -name $open_page -parent_id $folder_id] : 0}]
 
     foreach {locale locale_clause} \
-        [my locale_clause -revisions r -items ci $package_id $locale] break
+        [::xowiki::Portlet locale_clause -revisions r -items ci $package_id $locale] break
 
     set have_locale [expr {[lsearch [info args category_tree::get_mapped_trees] locale] > -1}]
     set trees [expr {$have_locale ?
@@ -511,7 +514,7 @@
     set cattree [::xowiki::CatTree new -volatile -name "categories-recent"]
 
     foreach {locale locale_clause} \
-        [my locale_clause -revisions r -items ci $package_id $locale] break
+        [::xowiki::Portlet locale_clause -revisions r -items ci $package_id $locale] break
 
     set have_locale [expr {[lsearch [info args category_tree::get_mapped_trees] locale] > -1}]
     set trees [expr {$have_locale ?
@@ -1236,7 +1239,7 @@
       foreach {cnames extra_where_clause} [my category_clause [my set category_id]] break
     }
     foreach {locale locale_clause} \
-        [my locale_clause -revisions p -items p $package_id $locale] break
+        [::xowiki::Portlet locale_clause -revisions p -items p $package_id $locale] break
     #my msg locale_clause=$locale_clause
 
     if {$source ne ""} {
@@ -1666,7 +1669,7 @@
     }
 
     foreach {locale locale_clause} \
-        [my locale_clause -revisions p -items p $package_id $locale] break
+        [::xowiki::Portlet locale_clause -revisions p -items p $package_id $locale] break
 
     set pages [::xowiki::Page instantiate_objects -sql \
         "select page_id, page_order, name, title, item_id \
Index: openacs-4/packages/xowiki/www/prototypes/announcements.page
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/prototypes/Attic/announcements.page,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/xowiki/www/prototypes/announcements.page	28 Jul 2007 18:03:16 -0000	1.3
+++ openacs-4/packages/xowiki/www/prototypes/announcements.page	14 Sep 2007 20:48:52 -0000	1.4
@@ -66,9 +66,8 @@
              alt='Next Page' style='float: left;  top: 0px;'></a>"
     }
     set page [my set __page]
-    [my set __parent] instvar weblog_obj
     set rss [$page include_portlet \
-                 "rss-button -title {[$page title]} -entries_of [$weblog_obj entries_of]"]
+                 "rss-button -title {[$page title]} -entries_of [my entries_of]"]
     #set rss [list [self] [lsort [my info vars]]]
     return "<div class='weblog'> $filter [next] $prev $next <br>$rss</div>"
   }
@@ -102,6 +101,7 @@
                -page_number $page_number \
                -summary $summary \
                -date $date \
+	       -locale "default+system" \
                -category_id [ns_queryget category_id] \
                -tag $tag \
                -ptag $ptag \