Merge pull request #971 from turt2live/travis/12hr-hotfixes

Support 12hr time in full date

src/DateUtils.js

@@ -83,7 +83,7 @@ module.exports = {
         return this.formatFullDate(date);
     },
 
-    formatFullDate: function(date) {
+    formatFullDate: function(date, showTwelveHour=false) {
         const days = getDaysArray();
         const months = getMonthsArray();
         return _t('%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s', {
@@ -91,7 +91,7 @@ module.exports = {
             monthName: months[date.getMonth()],
             day: date.getDate(),
             fullYear: date.getFullYear(),
-            time: this.formatTime(date),
+            time: showTwelveHour ? twelveHourTime(date) : this.formatTime(date),
         });
     },