Index: openacs-4/packages/xowiki/xowiki.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/xowiki.info,v
diff -u -r1.178 -r1.179
--- openacs-4/packages/xowiki/xowiki.info	30 Jan 2019 13:49:18 -0000	1.178
+++ openacs-4/packages/xowiki/xowiki.info	5 Feb 2019 16:21:49 -0000	1.179
@@ -10,7 +10,7 @@
     <inherit-templates-p>t</inherit-templates-p>
     <auto-mount>xowiki</auto-mount>
 
-    <version name="5.10.0d20" url="http://openacs.org/repository/download/apm/xowiki-5.10.0d20.apm">
+    <version name="5.10.0d21" url="http://openacs.org/repository/download/apm/xowiki-5.10.0d21.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,7 +55,7 @@
         <license>BSD-Style</license>
         <maturity>2</maturity>
 
-        <provides url="xowiki" version="5.10.0d20"/>
+        <provides url="xowiki" version="5.10.0d21"/>
         <requires url="xotcl-core" version="5.10.0d11"/>
 	<requires url="acs-datetime" version="5.9.1"/>
         <requires url="acs-kernel" version="5.9.1"/>
@@ -119,6 +119,7 @@
             <parameter scope="instance" datatype="string"  min_n_values="1"  max_n_values="1"  name="template_file"  default="view-default" description="Name of the ADP file to be used for viewing xowiki pages. The default value is 'view-default'. Alternatively, one can use 'view-book' to view pages in book style (needs page_ordering) or e.g. 'oacs-view' for providing a view with the category-tree on the left, or any other tailored view"/>
             <parameter scope="instance" datatype="string"  min_n_values="1"  max_n_values="1"  name="top_includelet"  default="presence -interval &quot;10 minutes&quot;" description="Specify an xowiki includelet (defined in ::xowiki::includelet::*) to be included on top over every pages. In order or add e.g. on each page of this wiki instance a listing of the users currently active in this xowiki instance, set the value of this parameter e.g. to 'presence -interval &quot;10 minutes&quot;'. The valid parameters are defined by the xowiki includlets."/>
             <parameter scope="instance" datatype="number"  min_n_values="1"  max_n_values="1"  name="use_connection_locale"  default="0" description="When this flag is set, per-user specific information is used to determine the default language. Users with different language preferences will see under the same url different content. Per default this flag is turned off, and the package or system wide locale is used." section_name="URL"/>
+            <parameter scope="instance" datatype="number"  min_n_values="1"  max_n_values="1"  name="use_fallback_page_in_system_locale"  default="0" description="When this flag is set, use the page in the system locale as fallback rather than offering a link for creation of a page in that locale, when the page in the requested locale does not exist. Per default this flag is turned off." section_name="URL"/>
             <parameter scope="instance" datatype="string"  min_n_values="1"  max_n_values="1"  name="weblog_page"  default="en:weblog" description="name of the page to show weblog (when clicking on tags)" section_name="Pages"/>
             <parameter scope="instance" datatype="number"  min_n_values="1"  max_n_values="1"  name="with_delicious"  default="0" description="Add a delicious button to the page" section_name="Options"/>
             <parameter scope="instance" datatype="number"  min_n_values="1"  max_n_values="1"  name="with_digg"  default="0" description="Add a button to submit article to digg
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.330 -r1.331
--- openacs-4/packages/xowiki/tcl/package-procs.tcl	17 Dec 2018 17:54:38 -0000	1.330
+++ openacs-4/packages/xowiki/tcl/package-procs.tcl	5 Feb 2019 16:21:49 -0000	1.331
@@ -1033,6 +1033,7 @@
     # get the default language if not specified
     if {![info exists lang]} {
       set lang [:default_language]
+      :log "no lang specified for '$object', use default_language <$lang>"
     }
     #:log "resolve_page '$object', default-lang $lang"
 
@@ -1082,13 +1083,22 @@
     }
 
     #
-    # second, resolve object level, unless we got a value already
+    # Second, resolve on object level, unless we have already an
+    # item_id from above.
     #
     if {![info exists (item_id)]} {
       array set "" [:item_info_from_url -with_package_prefix false -default_lang $lang $object]
       #:log "item_info_from_url returns [array get {}]"
     }
 
+    if {$(item_id) == 0 && [:get_parameter use_fallback_page_in_system_locale 0] eq "1"} {
+      set system_lang [string range [lang::system::locale] 0 1]
+      if {$system_lang ne $lang} {
+        array set "" [:item_info_from_url -with_package_prefix false -default_lang $system_lang $object]
+        :log "item_info_from_url based on system_lang <$system_lang> returns [array get {}]"
+      }
+    }
+
     if {$(item_id) ne 0} {
       if {$(method) ne ""} { set method $(method) }
       set page [:get_page_from_item_or_revision_id $(item_id)]
@@ -1105,7 +1115,10 @@
 
       return $page
     }
-    if {$simple} { return ""}
+
+    if {$simple} {
+      return ""
+    }
     #:log "NOT found object=$object"
 
     # try standard page