Bug 1058806 - Part 3: Fixed logic to display month and date.

* Review nits corrected