Index: openacs-4/packages/xowiki/tcl/link-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/link-procs.tcl,v
diff -u -r1.62 -r1.63
--- openacs-4/packages/xowiki/tcl/link-procs.tcl	7 Feb 2009 20:35:11 -0000	1.62
+++ openacs-4/packages/xowiki/tcl/link-procs.tcl	9 Feb 2009 20:29:22 -0000	1.63
@@ -111,9 +111,7 @@
 	  set object_type ::xowiki::Page
 	}
       }
-      set name [my name]
-      set title [my label]
-      set new_link [$page new_link $package_id]
+      set new_link [$page new_link -name [my name] -title [my label] $package_id]
       #set href [export_vars -base [$package_id package_url] \
       #              {{edit-new 1} object_type name title}]
 
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 "<div class='errorMsg'>Error during processing of options [list $options] of link of type [[self]::link info class]:<blockquote>$errorMsg</blockquote></div>"
+      return "<div class='errorMsg'>Error during processing of anchor ${arg}:<blockquote>$errorMsg</blockquote></div>"
     }
     set html [$l render]
     $l destroy
Index: openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl,v
diff -u -r1.213 -r1.214
--- openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl	8 Feb 2009 12:58:56 -0000	1.213
+++ openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl	9 Feb 2009 20:29:22 -0000	1.214
@@ -225,7 +225,7 @@
 	
         set header_stuff [::xo::Page header_stuff]
 	if {[info command ::template::head::add_meta] ne ""} {
-          set meta(lang) [my lang]
+          set meta(lang) [string range [my nls_language] 0 1]
           set meta(description) [my description]
 	  set meta(keywords) ""
 	  if {[my istype ::xowiki::FormPage]} {
@@ -269,8 +269,9 @@
 
 
 namespace eval ::xowiki {
-  Page instproc new_link {page_package_id} {
-    return [$page_package_id make_link -with_entities 0 $page_package_id edit-new object_type return_url autoname]
+  Page instproc new_link {-name -title page_package_id} {
+    return [$page_package_id make_link -with_entities 0 $page_package_id \
+		edit-new object_type name title return_url autoname]
   }
 
   Page instproc edit {
@@ -480,10 +481,10 @@
 }
 
 namespace eval ::xowiki {
-  FormPage instproc new_link {page_package_id} {
+  FormPage instproc new_link {-name -title page_package_id} {
     set template_id [my page_template]
     set form [$page_package_id pretty_link [$template_id name]]
-    return [$page_package_id make_link -with_entities 0 -link $form $template_id create-new return_url]
+    return [$page_package_id make_link -with_entities 0 -link $form $template_id create-new return_url name title]
   }
 
   FormPage proc get_table_form_fields {