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.63 -r1.64
--- openacs-4/packages/xowiki/tcl/link-procs.tcl	9 Feb 2009 20:29:22 -0000	1.63
+++ openacs-4/packages/xowiki/tcl/link-procs.tcl	9 Feb 2009 21:04:17 -0000	1.64
@@ -111,7 +111,7 @@
 	  set object_type ::xowiki::Page
 	}
       }
-      set new_link [$page new_link -name [my name] -title [my label] $package_id]
+      set new_link [$page new_link -name [my name] -title [my label] -nls_language [$page nls_language] $package_id]
       #set href [export_vars -base [$package_id package_url] \
       #              {{edit-new 1} object_type name title}]
 
Index: openacs-4/packages/xowiki/tcl/package-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/package-procs.tcl,v
diff -u -r1.162 -r1.163
--- openacs-4/packages/xowiki/tcl/package-procs.tcl	8 Feb 2009 12:58:56 -0000	1.162
+++ openacs-4/packages/xowiki/tcl/package-procs.tcl	9 Feb 2009 21:04:17 -0000	1.163
@@ -1124,9 +1124,9 @@
       set source [$object_type get_instance_from_db -item_id $source_item_id]
       $page copy_content_vars -from_object $source
       set name "[::xowiki::autoname generate -parent_id $source_item_id -name [$source name]]"
-      my get_lang_and_name -name $name lang name
+      #my get_lang_and_name -name $name lang name
       $page set name $name
-      my msg nls=[$page nls_language],source-nls=[$source nls_language],page=$page,name=$name
+      #my msg nls=[$page nls_language],source-nls=[$source nls_language],page=$page,name=$name
     } else {
       $page set name ""
     }
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.214 -r1.215
--- openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl	9 Feb 2009 20:29:22 -0000	1.214
+++ openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl	9 Feb 2009 21:04:17 -0000	1.215
@@ -225,7 +225,7 @@
 	
         set header_stuff [::xo::Page header_stuff]
 	if {[info command ::template::head::add_meta] ne ""} {
-          set meta(lang) [string range [my nls_language] 0 1]
+          set meta(lang) [my lang]
           set meta(description) [my description]
 	  set meta(keywords) ""
 	  if {[my istype ::xowiki::FormPage]} {
@@ -269,9 +269,9 @@
 
 
 namespace eval ::xowiki {
-  Page instproc new_link {-name -title page_package_id} {
+  Page instproc new_link {-name -title -nls_language page_package_id} {
     return [$page_package_id make_link -with_entities 0 $page_package_id \
-		edit-new object_type name title return_url autoname]
+		edit-new object_type name title nls_language return_url autoname]
   }
 
   Page instproc edit {
@@ -285,7 +285,7 @@
     #my msg "--edit new=$new autoname=$autoname, valudation_errors=$validation_errors"
 
     # set some default values if they are provided
-    foreach key {name title page_order last_page_id} {
+    foreach key {name title page_order last_page_id nls_language} {
       if {[$package_id exists_query_parameter $key]} {
         my set $key [$package_id query_parameter $key]
       }
@@ -481,10 +481,11 @@
 }
 
 namespace eval ::xowiki {
-  FormPage instproc new_link {-name -title page_package_id} {
+  FormPage instproc new_link {-name -title -nls_language 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 name title]
+    return [$page_package_id make_link -with_entities 0 -link $form $template_id \
+		create-new return_url name title nls_language]
   }
 
   FormPage proc get_table_form_fields {
@@ -1733,8 +1734,9 @@
       my parent_id [$package_id folder_id]
     }
     if {$nls_language eq ""} {
-      set nls_language [my nls_language]
+      set nls_langauge [my query_parameter nls_language [my nls_language]]
     }
+
     set f [FormPage new -destroy_on_cleanup \
                -name $name \
                -text "" \
@@ -1772,7 +1774,7 @@
       #
       # set some default values from query parameters
       #
-      foreach key {name title page_order last_page_id} {
+      foreach key {name title page_order last_page_id nls_language} {
 	if {[my exists_query_parameter $key]} {
 	  $f set $key [my query_parameter $key]
 	}