Fix swapped date/time

Let's recover the original "<time> on <date>" format
Merge pull request #1783 from mlocati/fix-formatting-datetime-attribute

Fix swapped date/time