Index: openacs-4/packages/xowiki/xowiki.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/xowiki.info,v
diff -u -N -r1.153.2.15 -r1.153.2.16
--- openacs-4/packages/xowiki/xowiki.info	24 Jun 2016 15:17:24 -0000	1.153.2.15
+++ openacs-4/packages/xowiki/xowiki.info	5 Jul 2016 15:46:07 -0000	1.153.2.16
@@ -10,7 +10,7 @@
     <inherit-templates-p>t</inherit-templates-p>
     <auto-mount>xowiki</auto-mount>
 
-    <version name="5.9.1d9" url="http://openacs.org/repository/download/apm/xowiki-5.9.1d9.apm">
+    <version name="5.9.1d10" url="http://openacs.org/repository/download/apm/xowiki-5.9.1d10.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>2015-10-04</release-date>
@@ -55,7 +55,7 @@
         <license>BSD-Style</license>
         <maturity>2</maturity>
 
-        <provides url="xowiki" version="5.9.1d9"/>
+        <provides url="xowiki" version="5.9.1d10"/>
         <requires url="acs-datetime" version="5.9.0"/>
         <requires url="acs-kernel" version="5.9.0"/>
 	<requires url="acs-tcl" version="5.9.1d1"/>
Index: openacs-4/packages/xowiki/catalog/xowiki.de_DE.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/catalog/xowiki.de_DE.ISO-8859-1.xml,v
diff -u -N -r1.45.2.1 -r1.45.2.2
--- openacs-4/packages/xowiki/catalog/xowiki.de_DE.ISO-8859-1.xml	12 Sep 2015 18:57:12 -0000	1.45.2.1
+++ openacs-4/packages/xowiki/catalog/xowiki.de_DE.ISO-8859-1.xml	5 Jul 2016 15:46:07 -0000	1.45.2.2
@@ -79,6 +79,7 @@
   <msg key="FormPage_parameters_title">Wiki Einstellungen</msg>
   <msg key="FormPage_pretty_name">Wiki FormPage</msg>
   <msg key="FormPage_pretty_plural">Wiki FormPages</msg>
+  <msg key="future_interval">in %time%</msg>
   <msg key="has_modified_this_page">hat diese Seite ver�ndert w�hrend sie von Ihnen bearbeitet wurde</msg>
   <msg key="hour">Stunde</msg>
   <msg key="hours">Stunden</msg>
Index: openacs-4/packages/xowiki/catalog/xowiki.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/catalog/xowiki.en_US.ISO-8859-1.xml,v
diff -u -N -r1.68.2.1 -r1.68.2.2
--- openacs-4/packages/xowiki/catalog/xowiki.en_US.ISO-8859-1.xml	23 Mar 2016 10:13:03 -0000	1.68.2.1
+++ openacs-4/packages/xowiki/catalog/xowiki.en_US.ISO-8859-1.xml	5 Jul 2016 15:46:07 -0000	1.68.2.2
@@ -106,6 +106,7 @@
   <msg key="FormPage_parameters_title">Wiki parameters</msg>
   <msg key="FormPage_pretty_name">Wiki FormPage</msg>
   <msg key="FormPage_pretty_plural">Wiki FormPages</msg>
+  <msg key="future_interval">in %time%</msg>
   <msg key="has_modified_this_page">has modified this page while you were editing it</msg>
   <msg key="height">Height</msg>
   <msg key="hour">hour</msg>
Index: openacs-4/packages/xowiki/tcl/form-field-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/form-field-procs.tcl,v
diff -u -N -r1.248.2.22 -r1.248.2.23
--- openacs-4/packages/xowiki/tcl/form-field-procs.tcl	24 Jun 2016 15:17:24 -0000	1.248.2.22
+++ openacs-4/packages/xowiki/tcl/form-field-procs.tcl	5 Jul 2016 15:46:07 -0000	1.248.2.23
@@ -173,6 +173,7 @@
         set cl [namespace tail [lindex $proc_info 0]]
         #my msg "__langPkg?[info exists __langPkg]"
         if {![info exists __langPkg]} {set __langPkg "xowiki"}
+        ns_log notice "calling $__langPkg.$cl-validate_$validator with [list value $value errorMsg $errorMsg] on level [info level] -- [lsort [info vars]]"
         return [_ $__langPkg.$cl-validate_$validator [list value $value errorMsg $errorMsg]]
         #return [::lang::message::lookup "" xowiki.$cl-validate_$validator %errorMsg% [list value $value errorMsg $errorMsg] 1]
       }
Index: openacs-4/packages/xowiki/tcl/xowiki-utility-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-utility-procs.tcl,v
diff -u -N -r1.37.2.9 -r1.37.2.10
--- openacs-4/packages/xowiki/tcl/xowiki-utility-procs.tcl	26 May 2016 16:00:31 -0000	1.37.2.9
+++ openacs-4/packages/xowiki/tcl/xowiki-utility-procs.tcl	5 Jul 2016 15:46:07 -0000	1.37.2.10
@@ -576,11 +576,19 @@
     if {![info exists timestamp_base]} {set timestamp_base [clock seconds]}
     set age_seconds [expr {$timestamp_base - $timestamp}]
     
+    if {$age_seconds < 0} {
+      set msg_key xowiki.future_interval
+      set age_seconds [expr {0 - $age_seconds}]
+    } else {
+      set msg_key xowiki.ago
+    }
+
     set pos 0
     set msg ""
     my instvar age
     foreach {interval unit unit_plural} $age {
       set base [expr {int($age_seconds / $interval)}]
+
       if {$base > 0} {
         set label [expr {$base == 1 ? $unit : $unit_plural}]
         set localized_label [::lang::message::lookup $locale xowiki.$label]
@@ -599,7 +607,7 @@
           }
         }
         set time $msg
-        set msg [::lang::message::lookup $locale xowiki.ago [list [list time $msg]]]
+        set msg [::lang::message::lookup $locale $msg_key [list [list time $msg]]]
         break
       }
       incr pos