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.5 -r1.6 --- openacs-4/packages/xowiki/tcl/xowiki-portlet-procs.tcl 21 Dec 2006 11:55:30 -0000 1.5 +++ openacs-4/packages/xowiki/tcl/xowiki-portlet-procs.tcl 22 Dec 2006 11:57:53 -0000 1.6 @@ -5,11 +5,14 @@ -parameter {{name ""} {title ""} {__decoration "portlet"}} ::xowiki::Portlet instproc locale_clause {package_id locale} { + set default_locale [$package_id default_locale] + set system_locale "" + set with_system_locale [regexp {(.*)[+]system} $locale _ locale] if {$locale eq "default"} { - set locale [$package_id default_locale] + set locale $default_locale set include_system_locale 0 - } + } set locale_clause "" if {$locale ne ""} { @@ -21,11 +24,11 @@ or r.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))" - } else - } else { - - } + } + } } + + #my log "--locale $locale, def=$default_locale sys=$system_locale, cl=$locale_clause" return [list $locale $locale_clause] }