From 7a014e1f798f8c5301cf102cf77e990f2cc34049 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 17 Sep 2015 15:24:12 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3bug=EF=BC=9A=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E6=B3=A8=E5=86=8C=E7=94=A8=E6=88=B7=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E9=82=AE=E7=AE=B1=E5=90=8D=E8=BF=87=E9=95=BF=E8=B6=85=E8=BF=87?=
 =?UTF-8?q?login=E9=99=90=E5=88=B6=20=E8=A7=A3=E5=86=B3=E6=96=B9=E6=B3=95?=
 =?UTF-8?q?=EF=BC=9Alogin=E9=95=BF=E5=BA=A6=E5=92=8C=E9=82=AE=E7=AE=B1?=
 =?UTF-8?q?=E9=95=BF=E5=BA=A6=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/projects/invite_members_by_mail.html.erb | 4 ++--
 config/locales/projects/zh.yml                     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/views/projects/invite_members_by_mail.html.erb b/app/views/projects/invite_members_by_mail.html.erb
index d590c1608..bb41a685d 100644
--- a/app/views/projects/invite_members_by_mail.html.erb
+++ b/app/views/projects/invite_members_by_mail.html.erb
@@ -31,9 +31,9 @@
             $("#valid_email").text("<%= l(:label_email_format_error)%>");
             return false;
         }
-        else if(email.split('@')[0].length > 20)
+        else if(email.length > 25)
         {
-            $("#valid_email").text("邮箱名过长,最长为20个字符");
+            $("#valid_email").text("邮箱名过长,最长为25个字符");
             return false;
         }
         else
diff --git a/config/locales/projects/zh.yml b/config/locales/projects/zh.yml
index fe26aee1d..599b51c30 100644
--- a/config/locales/projects/zh.yml
+++ b/config/locales/projects/zh.yml
@@ -347,7 +347,7 @@ zh:
   #
   #  邀请
   #    
-  label_invite_new_user: "发送邮件邀请新用户"
+  label_invite_new_user: "邀请用户加入项目"
   label_invite_join: 邀请加入
   label_invite_email_tips: 输入好友的邮箱地址，Trustie会自动为该好友注册平台账号！
   notice_registed_error: 您输入的邮箱地址为空或者该邮箱已被注册!