From c0b78198700562b0a442e51c0d839ea2c51fd3e9 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Wed, 6 May 2015 14:20:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B5=84=E6=96=99=E6=97=B6?=
 =?UTF-8?q?=E6=98=B5=E7=A7=B0=E6=8F=90=E7=A4=BA=E4=BB=A5=E5=8F=8A=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/my/account.html.erb | 2 +-
 config/locales/account/zh.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/my/account.html.erb b/app/views/my/account.html.erb
index 785286eea..6c0c3a78a 100644
--- a/app/views/my/account.html.erb
+++ b/app/views/my/account.html.erb
@@ -117,7 +117,7 @@
 
     <div>
     <!-- 昵称 -->
-    <p style="width:630px;padding-left: 40px;">
+    <p style="width:730px;padding-left: 40px;">
       <%= f.text_field :login, :required => true, :size => 25, :name => "login", :style =>  'border:1px solid #d3d3d3;'%>
       <span class='font_lighter'><%= l(:label_max_number) %></span>
       <br/>
diff --git a/config/locales/account/zh.yml b/config/locales/account/zh.yml
index 97e6ae444..69edc7aa3 100644
--- a/config/locales/account/zh.yml
+++ b/config/locales/account/zh.yml
@@ -11,7 +11,7 @@ zh:
   #
   #  公共变量
   #
-  label_max_number: "登录名是在网站中显示的您的公开标识，只能为英文和数字。"
+  label_max_number: "登录名是在网站中显示的您的公开标识，只能为下划线、@、.以及英文和数字。"
   field_login: 登录名
   
   field_password: 密码