From e19816ede5e2bf29cd4f473035d71de55df37c76 Mon Sep 17 00:00:00 2001
From: manson <manson@rulingcom.com>
Date: Fri, 8 Aug 2014 16:41:31 +0800
Subject: [PATCH] fix member password note and birthday format

---
 app/views/admin/members/_member_basic.html.erb | 2 +-
 config/locales/zh_tw.yml                       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/admin/members/_member_basic.html.erb b/app/views/admin/members/_member_basic.html.erb
index ab5ff6c..df9d7fd 100644
--- a/app/views/admin/members/_member_basic.html.erb
+++ b/app/views/admin/members/_member_basic.html.erb
@@ -136,7 +136,7 @@
       <div class="control-group">
         <label for="birthday" class="control-label muted"><%= t("users.birthday")%></label>
         <div class="controls">
-          <%= f.datetime_picker :birthday, :no_label => true %>
+          <%= f.datetime_picker :birthday, :no_label => true, :format=>"yyyy/MM/dd" %>
         </div>
       </div>
 
diff --git a/config/locales/zh_tw.yml b/config/locales/zh_tw.yml
index 1d5ba01..1d204d2 100644
--- a/config/locales/zh_tw.yml
+++ b/config/locales/zh_tw.yml
@@ -627,7 +627,7 @@ zh_tw:
     name: 姓名
     valid_old_password: 目前的密碼不符合確認值
     new_password: 新密碼
-    new_password_note: 至少6個字元
+    new_password_note: 至少8個字元
     new_password_confirmation: 確認新密碼
     female: 女性
     unknown: 未知