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.84 -r1.85
--- openacs-4/packages/xowiki/tcl/xowiki-portlet-procs.tcl	9 Aug 2007 11:45:17 -0000	1.84
+++ openacs-4/packages/xowiki/tcl/xowiki-portlet-procs.tcl	10 Aug 2007 10:55:01 -0000	1.85
@@ -114,7 +114,9 @@
     return $prefix$suffix
   }
 
-  ::xowiki::Portlet instproc locale_clause {r package_id locale} {
+  ::xowiki::Portlet instproc locale_clause {
+    -revisions -items package_id locale
+  } {
     set default_locale [$package_id default_locale]
     set system_locale ""
 
@@ -123,24 +125,24 @@
       set locale $default_locale
       set include_system_locale 0
     }
-    #my msg "with_system_locale=$with_system_locale, locale=$locale"
+    #my msg "with_system_locale=$with_system_locale, locale=$locale, default_locale=$default_locale "
 
     set locale_clause ""    
     if {$locale ne ""} {
-      set locale_clause " and $r.nls_language = '$locale'" 
+      set locale_clause " and $revisions.nls_language = '$locale'" 
       if {$with_system_locale} {
         set system_locale [lang::system::locale -package_id $package_id]
         #my msg "system_locale=$system_locale, default_locale=$default_locale"
         if {$system_locale ne $default_locale} {
-          set locale_clause " and ($r.nls_language = '$locale' 
-		or $r.nls_language = '$system_locale' and not exists
+          set locale_clause " and ($revisions.nls_language = '$locale' 
+		or $revisions.nls_language = '$system_locale' and not exists
 		  (select 1 from cr_items i where i.name = '[string range $locale 0 1]:' || 
-		  substring(ci.name,4) and i.parent_id = ci.parent_id))"
+		  substring($items.name,4) and i.parent_id = $items.parent_id))"
         }
       } 
     }
 
-    #my log "--locale $locale, def=$default_locale sys=$system_locale, cl=$locale_clause"
+    #my msg "--locale $locale, def=$default_locale sys=$system_locale, cl=$locale_clause locale_clause=$locale_clause"
     return [list $locale $locale_clause]
   }
 
@@ -341,7 +343,8 @@
     set open_item_id [expr {$open_page ne "" ?
                             [CrItem lookup -name $open_page -parent_id $folder_id] : 0}]
 
-    foreach {locale locale_clause} [my locale_clause r $package_id $locale] break
+    foreach {locale locale_clause} \
+        [my 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 ?
@@ -468,7 +471,8 @@
   
     set cattree [::xowiki::CatTree new -volatile -name "categories-recent"]
 
-    foreach {locale locale_clause} [my locale_clause r $package_id $locale] break
+    foreach {locale locale_clause} \
+        [my 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 ?
@@ -1152,7 +1156,7 @@
           {-expand_all false}
           {-remove_levels 0}
           {-category_id}
-          {-locale "default"}
+          {-locale ""}
         }}
       }
 
@@ -1185,8 +1189,10 @@
     if {[my exists category_id]} {
       foreach {cnames extra_where_clause} [my category_clause [my set category_id]] break
     }
-    foreach {locale locale_clause} [my locale_clause p $package_id $locale] break
+    foreach {locale locale_clause} \
+        [my locale_clause -revisions p -items p $package_id $locale] break
     #my msg locale_clause=$locale_clause
+
     set sql [::xo::db::sql select \
                  -vars "page_id,  page_order, name, title" \
                  -from "xowiki_page_live_revision p" \
@@ -1575,6 +1581,7 @@
         {parameter_declaration {
           {-category_id}
           {-menu_buttons edit-item-button}
+          {-locale ""}
         }}
       }
 
@@ -1591,11 +1598,15 @@
       foreach {cnames extra_where_clause} [my category_clause $category_id] break
     }
 
+    foreach {locale locale_clause} \
+        [my 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 \
 		from xowiki_page_live_revision p \
 		where parent_id = [$package_id folder_id] \
 		and not page_order is NULL $extra_where_clause \
+		$locale_clause \
 		[::xowiki::Page container_already_rendered item_id]" ]
     $pages mixin add ::xo::OrderedComposite::IndexCompare
     $pages orderby page_order
Index: openacs-4/packages/xowiki/tcl/xowiki-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-procs.tcl,v
diff -u -r1.163 -r1.164
--- openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	9 Aug 2007 18:05:53 -0000	1.163
+++ openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	10 Aug 2007 10:55:01 -0000	1.164
@@ -612,7 +612,7 @@
     regexp {^([^|]+)[|](.*)$} $label _ label options
     if {[string match "http*//*" $link] || [string match "//*" $link]} {
       if {[regsub {^//} $link / link]} {
-	my msg t=[::xowiki::guesstype $link]
+	#my msg t=[::xowiki::guesstype $link]
 	switch -glob -- [::xowiki::guesstype $link] {
 	  text/css {
 	    ::xowiki::Page requireCSS $link