diff --git a/app/assets/javascripts/discourse/lib/formatter.js b/app/assets/javascripts/discourse/lib/formatter.js
index b15e5819896..c9b0fda1aee 100644
--- a/app/assets/javascripts/discourse/lib/formatter.js
+++ b/app/assets/javascripts/discourse/lib/formatter.js
@@ -100,7 +100,7 @@ Discourse.Formatter = (function(){
   };
 
   tinyDateYear = function(date) {
-    return moment(date).format("D MMM 'YY");
+    return moment(date).format(I18n.t("dates.tiny.date_year"));
   };
 
   // http://stackoverflow.com/questions/196972/convert-string-to-title-case-with-javascript
diff --git a/config/locales/client.cs.yml b/config/locales/client.cs.yml
index 7492ecdde64..af219b2f692 100644
--- a/config/locales/client.cs.yml
+++ b/config/locales/client.cs.yml
@@ -59,6 +59,7 @@ cs:
           one:   "1r"
           few:   "%{count}r"
           other: "%{count}let"
+        date_year: "D MMM 'YY"
       medium:
         x_minutes:
           one: "1 minuta"
diff --git a/config/locales/client.de.yml b/config/locales/client.de.yml
index 1c627990651..293c646c641 100644
--- a/config/locales/client.de.yml
+++ b/config/locales/client.de.yml
@@ -49,6 +49,7 @@ de:
         almost_x_years:
           one:   "1J"
           other: "%{count}J"
+        date_year: "D MMM 'YY"
       medium:
         x_minutes:
           one: "1 Minute"
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 43aeb0abd99..4e011b3ef88 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -49,6 +49,7 @@ en:
         almost_x_years:
           one:   "1y"
           other: "%{count}y"
+        date_year: "D MMM 'YY"
       medium:
         x_minutes:
           one: "1 min"
diff --git a/config/locales/client.es.yml b/config/locales/client.es.yml
index 88e58802357..2b6771bfe5b 100644
--- a/config/locales/client.es.yml
+++ b/config/locales/client.es.yml
@@ -51,6 +51,7 @@ es:
         almost_x_years:
           one:   "1a"
           other: "%{count}a"
+        date_year: "D MMM 'YY"
       medium:
         x_minutes:
           one: "1 minuto"
diff --git a/config/locales/client.fr.yml b/config/locales/client.fr.yml
index cd15fd82054..25fcfc3857e 100644
--- a/config/locales/client.fr.yml
+++ b/config/locales/client.fr.yml
@@ -53,6 +53,7 @@ fr:
         almost_x_years:
           one: "1y"
           other: "%{count}a"
+        date_year: "D MMM 'YY"
       medium:
         x_minutes:
           one: "1 min"
diff --git a/config/locales/client.it.yml b/config/locales/client.it.yml
index 8ef356478bc..26471acf458 100644
--- a/config/locales/client.it.yml
+++ b/config/locales/client.it.yml
@@ -49,6 +49,7 @@ it:
         almost_x_years:
           one:   "1a"
           other: "%{count}a"
+        date_year: "D MMM 'YY"
       medium:
         x_minutes:
           one: "1 minuto"
diff --git a/config/locales/client.ja.yml b/config/locales/client.ja.yml
index aa8c850be20..ba2b6fa6b66 100644
--- a/config/locales/client.ja.yml
+++ b/config/locales/client.ja.yml
@@ -49,6 +49,7 @@ ja:
         almost_x_years:
           one:   "1y"
           other: "%{count}y"
+        date_year: "D MMM 'YY"
       medium:
         x_minutes:
           one: "1分"
diff --git a/config/locales/client.ko.yml b/config/locales/client.ko.yml
index c4c64fb1c96..1b64090b0c6 100644
--- a/config/locales/client.ko.yml
+++ b/config/locales/client.ko.yml
@@ -49,6 +49,7 @@ ko:
         almost_x_years:
           one:   "거의 1년"
           other: "거의 %{count}년"
+        date_year: "'YY M/D"
       medium:
         x_minutes:
           one: "1분"
diff --git a/config/locales/client.nl.yml b/config/locales/client.nl.yml
index 6aedb229637..1354712958f 100644
--- a/config/locales/client.nl.yml
+++ b/config/locales/client.nl.yml
@@ -53,6 +53,7 @@ nl:
         almost_x_years:
           one:   1j
           other: "%{count}j"
+        date_year: "D MMM 'YY"
       medium:
         x_minutes:
           one: 1 min
diff --git a/config/locales/client.pt_BR.yml b/config/locales/client.pt_BR.yml
index b8aa84cecae..3030ebb7326 100644
--- a/config/locales/client.pt_BR.yml
+++ b/config/locales/client.pt_BR.yml
@@ -49,6 +49,7 @@ pt_BR:
         almost_x_years:
           one: "1y"
           other: "%{count}y"
+        date_year: "D MMM 'YY"
       medium:
         x_minutes:
           one: "1 minuto"
diff --git a/config/locales/client.ru.yml b/config/locales/client.ru.yml
index 4c7543d7bef..3b3610677f8 100644
--- a/config/locales/client.ru.yml
+++ b/config/locales/client.ru.yml
@@ -72,6 +72,7 @@ ru:
           other: '%{count}лет'
           few: '%{count}лет'
           many: '%{count}лет'
+        date_year: "D MMM 'YY"
       medium:
         x_minutes:
           one: '1 минута'
diff --git a/config/locales/client.sv.yml b/config/locales/client.sv.yml
index 697a92db50a..6ef6fff3440 100644
--- a/config/locales/client.sv.yml
+++ b/config/locales/client.sv.yml
@@ -49,6 +49,7 @@ sv:
         almost_x_years:
           one:   "1y"
           other: "%{count}y"
+        date_year: "D MMM 'YY"
       medium:
         x_minutes:
           one: "1 min"
@@ -1456,4 +1457,4 @@ sv:
           uncategorized: 'Okategoriserat'
 
     lightbox:
-      download: "ladda ned"
\ No newline at end of file
+      download: "ladda ned"
diff --git a/config/locales/client.zh_CN.yml b/config/locales/client.zh_CN.yml
index b83b7d093e6..ddd11c96760 100644
--- a/config/locales/client.zh_CN.yml
+++ b/config/locales/client.zh_CN.yml
@@ -49,6 +49,7 @@ zh_CN:
         almost_x_years:
           one:   "1年"
           other: "%{count}年"
+        date_year: "D MMM 'YY"
       medium:
         x_minutes:
           one:   "1分钟"
diff --git a/config/locales/client.zh_TW.yml b/config/locales/client.zh_TW.yml
index 72c556a8af8..51325c11d33 100644
--- a/config/locales/client.zh_TW.yml
+++ b/config/locales/client.zh_TW.yml
@@ -49,6 +49,7 @@ zh_TW:
         almost_x_years:
           one: "1年"
           other: "%{count}年"
+        date_year: "D MMM 'YY"
       medium:
         x_minutes:
           one: "1 分鐘"