Commit 9c915ddd authored by Kevin Deldycke's avatar Kevin Deldycke

Forgotten commit.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@6103 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent d66ff16d
No related merge requests found
...@@ -72,7 +72,7 @@ if not date :\n ...@@ -72,7 +72,7 @@ if not date :\n
return \'\'\n return \'\'\n
\n \n
try :\n try :\n
order = context.getPortalObject().portal_preferences.getPreferredDateInputOrder()\n order = context.getPortalObject().portal_preferences.getPreferredDateOrder()\n
except AttributeError :\n except AttributeError :\n
order = \'ymd\'\n order = \'ymd\'\n
\n \n
...@@ -93,7 +93,7 @@ if hour_minute or seconds : \n ...@@ -93,7 +93,7 @@ if hour_minute or seconds : \n
hour_minute_text = "%02dh%02dmn%02ds" % (date.hour(), date.minute(), date.second())\n hour_minute_text = "%02dh%02dmn%02ds" % (date.hour(), date.minute(), date.second())\n
else : \n else : \n
hour_minute_text = "%02dh%02dmn" % (date.hour(), date.minute())\n hour_minute_text = "%02dh%02dmn" % (date.hour(), date.minute())\n
result = context.Base_TranslateString("${date} at ${hour_minute_text}", \n result = context.Base_translateString("${date} at ${hour_minute_text}", \n
mapping = {\'date\' : result, \'hour_minute_text\' : hour_minute_text })\n mapping = {\'date\' : result, \'hour_minute_text\' : hour_minute_text })\n
\n \n
\n \n
......
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
2006-03-08 JPS 2006-03-08 JPS
* Make sure group membership is acquired through careers and subordination * Make sure group membership is acquired through careers and subordination
* Make sure role is acquired from Career * Make sure role is acquired from Career
2006-03-07 Kevin 2006-03-07 Kevin
* Fix mass workflow status modification (Folder_modifyWorkflowStatus and Base_callViewDialogMethod updated). * Fix mass workflow status modification (Folder_modifyWorkflowStatus and Base_callViewDialogMethod updated).
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment