Mercurial > moin > 1.9

changeset 5717:715479a7d692

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix timestamp in edit lock message to show the time when edit-locking ends
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Sun, 03 Oct 2010 23:07:30 +0200
parents 5b262b81c236
children 7a914f08d95d
files MoinMoin/PageEditor.py
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/PageEditor.py	Sun Oct 03 22:29:11 2010 +0200
+++ b/MoinMoin/PageEditor.py	Sun Oct 03 23:07:30 2010 +0200
@@ -1249,14 +1249,14 @@
         else:
             mins_valid = (secs_valid+59) / 60
             if self.locktype == 'lock':
-                # lout out user
+                # lock out user
+                timestamp_until = self.request.user.getFormattedDateTime(self.timestamp+secs_valid)
                 result = 0, _(
                     "This page is currently ''locked'' for editing by %(owner)s until %(timestamp)s,"
                     " i.e. for %(mins_valid)d minute(s).",
-                    wiki=True) % {'owner': owner, 'timestamp': timestamp, 'mins_valid': mins_valid}
+                    wiki=True) % {'owner': owner, 'timestamp': timestamp_until, 'mins_valid': mins_valid}
             else:
                 # warn user about existing lock
-
                 result = 1, _(
 """This page was opened for editing or last previewed at %(timestamp)s by %(owner)s.<<BR>>
 '''You should ''refrain from editing'' this page for at least another %(mins_valid)d minute(s),