From 2e78ea3d58e6b0abc2fb1561aaf4a91f989ba9a2 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Sat, 18 Jul 2015 13:09:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8C=89=E6=9C=88=E6=8F=90=E4=BA=A4=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E6=AF=8F=E6=9C=88=E7=9A=84=E4=BB=A3=E7=A0=81=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E9=87=8F=EF=BC=88=E4=BB=A5=E5=89=8D=E6=98=AFASCII?=
 =?UTF-8?q?=E7=A0=81=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/locales/zh.yml | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 12797ea1f..595286f45 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -7,6 +7,26 @@ zh:
   direction: ltr
   jquery:
     locale: "zh-CN"
+  date:
+      formats:
+        # Use the strftime parameters for formats.
+        # When no format has been given, it uses default.
+        # You can provide other formats here if you like!
+        default: "%Y-%m-%d"
+        short: "%b%d日"
+        long: "%Y年%b%d日"
+
+      day_names: [星期天, 星期一, 星期二, 星期三, 星期四, 星期五, 星期六]
+      abbr_day_names: [日, 一, 二, 三, 四, 五, 六]
+
+      # Don't forget the nil at the beginning; there's no such thing as a 0th month
+      month_names: [~, 一月, 二月, 三月, 四月, 五月, 六月, 七月, 八月, 九月, 十月, 十一月, 十二月]
+      abbr_month_names: [~, 1月, 2月, 3月, 4月, 5月, 6月, 7月, 8月, 9月, 10月, 11月, 12月]
+      # Used in date_select and datime_select.
+      order:
+        - :year
+        - :month
+        - :day
 
   notice_account_updated: 帐号更新成功
   notice_account_wrong_password: 密码错误