From 1e5fac32b43bb68401b7c50f0802d3c2ad45a211 Mon Sep 17 00:00:00 2001
From: whimlex <whimlex@hotmail.com>
Date: Thu, 12 Mar 2015 17:48:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=82=AE=E7=AE=B1=E9=AA=8C?=
 =?UTF-8?q?=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../projects/invite_members_by_mail.html.erb    | 17 ++++++++++-------
 config/locales/projects/en.yml                  | 11 ++++++++++-
 config/locales/projects/zh.yml                  |  9 +++++----
 3 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/app/views/projects/invite_members_by_mail.html.erb b/app/views/projects/invite_members_by_mail.html.erb
index 2b7c23736..0119f53c2 100644
--- a/app/views/projects/invite_members_by_mail.html.erb
+++ b/app/views/projects/invite_members_by_mail.html.erb
@@ -1,13 +1,16 @@
 <script>
     function verifyAddress(obj) {
         var email = document.getElementsByName('mail');
-        var filter  = /^([a-zA-Z0-9_\.\-])+\@(([a-zA-Z0-9\-])+\.)+([a-zA-Z0-9]{2,4})+$/;
-        if (email.value==null||filter.test(email.value)) return true;
-        else {
-            document.getElementById('valid_email').innerHTML= <%= l(:label_email_format_error)%>;
-            document.getElementById('valid_email').style.color="#FF0000";
-            return false;}
-    }
+        var filter = /^([a-zA-Z0-9_\.\-])+\@(([a-zA-Z0-9\-])+\.)+([a-zA-Z0-9]{2,4})+$/;
+        if (filter.test(email.value)&& !(email.value == null)) return true;
+            else
+            {
+                document.getElementById('valid_email').innerHTML = "您所填写的电子邮件格式不正确";
+                document.getElementById('valid_email').style.color = "#FF0000";
+                return false;
+            }
+
+        }
 </script>
 <div class="project_r_h">
   <h2 class="project_h2"><%= l(:label_invite_join)%></h2>
diff --git a/config/locales/projects/en.yml b/config/locales/projects/en.yml
index a7c88eb19..bc4395df0 100644
--- a/config/locales/projects/en.yml
+++ b/config/locales/projects/en.yml
@@ -82,7 +82,16 @@ en:
   #
   #  邀请
   #    
-  notice_registed_success: 您输入的邮箱为空或者该邮箱已被注册!
+  label_invite_new_user: "发送邮件邀请新用户"
+  label_invite_join: 邀请加入
+  label_invite_email_tips: 输入好友邮箱地址，Trustie会自动为该邮箱注册用户！
+  label_email: 邮箱
+  notice_registed_success: 您所填写的电子邮件格式不正确或者该邮箱已被注册!
+  label_send_email_free: 免费发送
+  label_email_format_error: 您所填写的电子邮件格式不正确
+
+  
+  label_invite_trustie_user: "邀请Trustie注册用户" 
 
 
   #   
diff --git a/config/locales/projects/zh.yml b/config/locales/projects/zh.yml
index be99953b9..d6e03fc14 100644
--- a/config/locales/projects/zh.yml
+++ b/config/locales/projects/zh.yml
@@ -58,8 +58,7 @@ zh:
   project_module_code_review: 代码审查
   project_module_calendar: 日历
   project_module_gantt: 甘特图  
-  project_module_documents: 文档
-  project_module_files: 资源库
+  project_module_documents: 文档  
   label_project_tool_response: 用户反馈  
   label_module_share: DTS测试工具
 
@@ -84,12 +83,14 @@ zh:
   #  邀请
   #    
   label_invite_new_user: "发送邮件邀请新用户"
-  label_invite_trustie_user: "邀请Trustie注册用户"
   label_invite_join: 邀请加入
   label_invite_email_tips: 输入好友邮箱地址，Trustie会自动为该邮箱注册用户！
   notice_registed_success: 您输入的邮箱为空或者该邮箱已被注册!
+  label_send_email_free: 免费发送
+  label_email_format_error: 您所填写的电子邮件格式不正确
+
   
-  
+  label_invite_trustie_user: "邀请Trustie注册用户" 
   
   #   
   #  项目托管平台