From 5afb09ebbe21874182dd570dd3095d27e6d6c182 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Thu, 30 Aug 2018 11:25:36 +0200
Subject: [PATCH] FEATURE: displays "today" if event is... today (#6336)

---
 .../assets/javascripts/discourse-local-dates.js            | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/plugins/discourse-local-dates/assets/javascripts/discourse-local-dates.js b/plugins/discourse-local-dates/assets/javascripts/discourse-local-dates.js
index 9e4583166e0..a92f6fe923b 100644
--- a/plugins/discourse-local-dates/assets/javascripts/discourse-local-dates.js
+++ b/plugins/discourse-local-dates/assets/javascripts/discourse-local-dates.js
@@ -42,7 +42,12 @@
         }
       });
 
-      relativeTime = relativeTime.tz(moment.tz.guess()).format(options.format);
+      var relativeTime = relativeTime.tz(moment.tz.guess());
+      if (moment(relativeTime).isSame(moment(), "day")) {
+        relativeTime = relativeTime.calendar();
+      } else {
+        relativeTime = relativeTime.format(options.format);
+      }
 
       var html = "<span>";
       html += "<i class='fa fa-globe d-icon d-icon-globe'></i>";