From 46b6a0a533fefd7356f00f8203da593f2cad9120 Mon Sep 17 00:00:00 2001
From: Naiqus <github@naiqus.com>
Date: Tue, 11 Jun 2013 02:17:04 +0300
Subject: [PATCH] Update client.zh_CN.yml

---
 config/locales/client.zh_CN.yml | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/config/locales/client.zh_CN.yml b/config/locales/client.zh_CN.yml
index f501986a2..2dcf27ea9 100644
--- a/config/locales/client.zh_CN.yml
+++ b/config/locales/client.zh_CN.yml
@@ -8,6 +8,9 @@
 zh_CN:
   js:
     dates:
+      short_date_no_year: "D MMM"
+      short_date: "D MMM, YYYY"
+      long_date: "MMMM D, YYYY h:mma"
       tiny:
         half_a_minute: "刚刚"
         less_than_x_seconds:
@@ -43,6 +46,26 @@ zh_CN:
         almost_x_years:
           one:   "1年"
           other: "%{count}年"
+      medium:
+        x_minutes:
+          one: "1分钟"
+          other: "%{count}分钟"
+        x_hours:
+          one: "1小时"
+          other: "%{count}小时"
+        x_days:
+          one: "1天"
+          other: "%{count}天"
+      medium_with_ago:
+        x_minutes:
+          one: "1分钟前"
+          other: "%{count}分钟前"
+        x_hours:
+          one: "1小时之前"
+          other: "%{count}小时之前"
+        x_days:
+          one: "1天前"
+          other: "%{count}天前"
     share:
       topic: '分享一个到本主题的链接'
       post: '分享一个到本帖的链接'