From 289d9e4fe1b3cfcf5ce32a0750809a498249f729 Mon Sep 17 00:00:00 2001
From: Arpit Jalan <arpit@techapj.com>
Date: Sat, 30 Aug 2014 11:54:47 +0530
Subject: [PATCH] FIX: use short date format for topic summary

---
 config/locales/client.en.yml               | 4 ++--
 test/javascripts/lib/formatter-test.js.es6 | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index bd5dc27b774..cabf4a8c3ec 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -67,7 +67,7 @@ en:
         almost_x_years:
           one:   "1y"
           other: "%{count}y"
-        date_month: "D MMM"
+        date_month: "MMM D"
         date_year: "MMM 'YY"
       medium:
         x_minutes:
@@ -79,7 +79,7 @@ en:
         x_days:
           one: "1 day"
           other: "%{count} days"
-        date_year: "D MMM YYYY"
+        date_year: "MMM D, 'YY"
       medium_with_ago:
         x_minutes:
           one: "1 min ago"
diff --git a/test/javascripts/lib/formatter-test.js.es6 b/test/javascripts/lib/formatter-test.js.es6
index 0bcd609f067..74a163aaa68 100644
--- a/test/javascripts/lib/formatter-test.js.es6
+++ b/test/javascripts/lib/formatter-test.js.es6
@@ -29,7 +29,7 @@ var formatDays = function(days) {
 };
 
 var shortDate = function(days){
-  return moment().subtract(days, 'days').format('D MMM');
+  return moment().subtract(days, 'days').format('MMM D');
 };
 
 test("formating medium length dates", function() {
@@ -40,7 +40,7 @@ test("formating medium length dates", function() {
   };
 
   var shortDateYear = function(days){
-    return moment().subtract(days, 'days').format('D MMM YYYY');
+    return moment().subtract(days, 'days').format("MMM D, 'YY");
   };
 
   leaveAgo = true;