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.329 -r1.330 --- openacs-4/packages/xowiki/tcl/xowiki-procs.tcl 7 Feb 2009 20:35:11 -0000 1.329 +++ openacs-4/packages/xowiki/tcl/xowiki-procs.tcl 9 Feb 2009 20:29:22 -0000 1.330 @@ -41,7 +41,6 @@ -spec user_id } \ -parameter { - {lang en} {render_adp 1} {do_substitutions 1} {absolute_links 0} @@ -829,6 +828,9 @@ Page instforward form_parameter {%my set package_id} %proc Page instforward exists_form_parameter {%my set package_id} %proc + Page instproc lang {} { + return [string range [my nls_language] 0 1] + } Page instproc build_name {{-nls_language ""}} { # # Build the name of the page, based on the provided nls_language @@ -853,7 +855,7 @@ #} #} if {$nls_language eq ""} {set nls_language [my nls_language]} - set name [string range $nls_language 0 1]:$stripped_name + set name [my lang]:$stripped_name } return $name } @@ -1158,7 +1160,7 @@ } set normalized_name [[my package_id] normalize_name $stripped_name] - #my msg "input: [self args]" + #my msg "input: [self args] - lang=[my lang], [my nls_language]" if {$lang eq ""} {set lang [my lang]} if {$name eq ""} {set name $lang:$normalized_name} #my msg result=[list name $name lang $lang normalized_name $normalized_name anchor $anchor] @@ -1278,7 +1280,7 @@ Page instproc anchor {arg} { if {[catch {set l [my create_link $arg]} errorMsg]} { - return "
Error during processing of options [list $options] of link of type [[self]::link info class]:
$errorMsg
" + return "
Error during processing of anchor ${arg}:
$errorMsg
" } set html [$l render] $l destroy