From 0453da6fa5202d505c3362ee1cd75ae26f4000fe Mon Sep 17 00:00:00 2001
From: Arpit Jalan <arpit@techapj.com>
Date: Wed, 27 Aug 2014 11:38:17 +0530
Subject: [PATCH] FIX: use short date format for timestamp

---
 .../discourse/helpers/application_helpers.js       |  2 +-
 app/assets/javascripts/discourse/lib/formatter.js  | 14 +++++++++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/discourse/helpers/application_helpers.js b/app/assets/javascripts/discourse/helpers/application_helpers.js
index 958219769dd..033b26dce07 100644
--- a/app/assets/javascripts/discourse/helpers/application_helpers.js
+++ b/app/assets/javascripts/discourse/helpers/application_helpers.js
@@ -162,7 +162,7 @@ Handlebars.registerHelper('raw-date', function(property, options) {
   @for Handlebars
 **/
 Em.Handlebars.helper('bound-raw-date', function (date) {
-  return Discourse.Formatter.longDate(new Date(date));
+  return Discourse.Formatter.longDateNoYear(new Date(date));
 });
 
 /**
diff --git a/app/assets/javascripts/discourse/lib/formatter.js b/app/assets/javascripts/discourse/lib/formatter.js
index 8449fa23b23..f2688a2e457 100644
--- a/app/assets/javascripts/discourse/lib/formatter.js
+++ b/app/assets/javascripts/discourse/lib/formatter.js
@@ -1,7 +1,7 @@
 /* global BreakString:true */
 
 var updateRelativeAge, autoUpdatingRelativeAge, relativeAge, relativeAgeTiny,
-    relativeAgeMedium, relativeAgeMediumSpan, longDate, toTitleCase,
+    relativeAgeMedium, relativeAgeMediumSpan, longDate, longDateNoYear, toTitleCase,
     shortDate, shortDateNoYear, tinyDateYear, relativeAgeTinyShowsYear;
 
 /*
@@ -75,6 +75,17 @@ longDate = function(dt) {
   return moment(dt).longDate();
 };
 
+// suppress year, if current year
+longDateNoYear = function(dt) {
+  if (!dt) return;
+
+  if ((new Date()).getFullYear() !== dt.getFullYear()) {
+    return moment(dt).format("MMM D, 'YY LT");
+  } else {
+    return moment(dt).format("MMM D, LT");
+  }
+};
+
 updateRelativeAge = function(elems) {
   // jQuery .each
   elems.each(function(){
@@ -258,6 +269,7 @@ var number = function(val) {
 
 Discourse.Formatter = {
   longDate: longDate,
+  longDateNoYear: longDateNoYear,
   relativeAge: relativeAge,
   autoUpdatingRelativeAge: autoUpdatingRelativeAge,
   updateRelativeAge: updateRelativeAge,