Index: openacs-4/packages/xowiki/xowiki.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/xowiki.info,v
diff -u -r1.180.2.41 -r1.180.2.42
--- openacs-4/packages/xowiki/xowiki.info	13 Jul 2020 12:02:33 -0000	1.180.2.41
+++ openacs-4/packages/xowiki/xowiki.info	16 Jul 2020 17:11:19 -0000	1.180.2.42
@@ -10,7 +10,7 @@
     <inherit-templates-p>t</inherit-templates-p>
     <auto-mount>xowiki</auto-mount>
 
-    <version name="5.10.0d57" url="http://openacs.org/repository/download/apm/xowiki-5.10.0d57.apm">
+    <version name="5.10.0d58" url="http://openacs.org/repository/download/apm/xowiki-5.10.0d58.apm">
 	<owner url="mailto:neumann@wu-wien.ac.at">Gustaf Neumann</owner>
 	<summary>A xotcl-based enterprise wiki system with multiple object types</summary>
 	<release-date>2017-08-06</release-date>
@@ -55,8 +55,8 @@
 	<license>BSD-Style</license>
 	<maturity>2</maturity>
 
-	<provides url="xowiki" version="5.10.0d57"/>
-	<requires url="xotcl-core" version="5.10.0d25"/>
+	<provides url="xowiki" version="5.10.0d58"/>
+	<requires url="xotcl-core" version="5.10.0d33"/>
 	<requires url="acs-datetime" version="5.9.1"/>
 	<requires url="acs-kernel" version="5.9.1"/>
 	<requires url="acs-tcl" version="5.10.0d38"/>
Index: openacs-4/packages/xowiki/tcl/folder-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/folder-procs.tcl,v
diff -u -r1.55.2.34 -r1.55.2.35
--- openacs-4/packages/xowiki/tcl/folder-procs.tcl	12 May 2020 08:28:00 -0000	1.55.2.34
+++ openacs-4/packages/xowiki/tcl/folder-procs.tcl	16 Jul 2020 17:11:19 -0000	1.55.2.35
@@ -156,9 +156,11 @@
     set sql [:folder_query -form_id $folder_form_id \
                  -parent_id $parent_id \
                  -package_id $package_id]
+
     #ns_log notice "folder_pages:\n$sql"
     set folder_pages [::xowiki::FormPage instantiate_objects -sql $sql \
                           -named_objects true -object_named_after "item_id" \
+                          -keep_existing_objects true \
                           -object_class ::xowiki::FormPage -initialize true]
 
     #
@@ -266,7 +268,7 @@
     # Start with the "package's folder" as root folder
     set root_folder [::xo::db::CrClass get_instance_from_db \
                          -item_id [::$package_id folder_id]]
-    
+
     set mb [info commands ::__xowiki__MenuBar]
     if {$mb ne ""} {
       #
@@ -318,7 +320,6 @@
       set import_archive_link [::$package_id make_form_link -form en:import-archive.form \
                                    -parent_id $opt_parent_id]
 
-
       set index_link [::$package_id make_link -link $folder_link ${:current_folder} list]
 
       $mb add_menu_item -name Package.Startpage -item [list url $folder_link]
@@ -496,6 +497,7 @@
             {-skin:optional "yui-skin-sam"}
             {-show_types "::xowiki::Page,::xowiki::File,::xowiki::Form,::xowiki::FormPage"}
             {-regexp:optional}
+            {-language_specific:boolean false}
             {-with_subtypes:boolean,optional false}
             {-orderby:token,optional "last_modified,desc"}
             {-publish_status:wordchar "ready"}
@@ -659,7 +661,37 @@
     if {[info exists regexp]} {
       set extra_where_clause "(bt.title ~ '$regexp' OR ci.name ~ '$regexp' )"
     }
-
+    
+    if {$language_specific} {
+      #
+      # Setting the property language_specific does two things:
+      # a) filter the entries by this language
+      # b) change the title of the folder when a property ml_title is supplied.
+      #
+      set lang [string range [:locale] 0 1]
+      set extra_where_clause "ci.name like '${lang}:%'"
+      
+      #
+      # If the folder has a property "ml_title" assume that every line
+      # is a title in a different language and starts with a lang
+      # prefix.  If no matching title is found stick to the title of
+      # the folder object.
+      #
+      # One should define a form-field to make it easy for a true end
+      # user to provide ml titles.
+      #
+      set ml_title [$current_folder property ml_title]
+      if {$ml_title ne ""} {
+        foreach line [split $ml_title \n] {
+          set line [string trim $line]
+          if {[string range $line 0 1] eq $lang} {
+            $current_folder title [string range $line 2 end]
+            break
+          }
+        }
+      }
+    }
+    
     :log "child-resources of folder_id ${:current_folder_id}"
     set items [::xowiki::FormPage get_all_children \
                    -folder_id ${:current_folder_id} \