From aee987d6346dc91205b0b37fd69b9a1e90211157 Mon Sep 17 00:00:00 2001
From: whimlex <whimlex@hotmail.com>
Date: Fri, 13 Mar 2015 17:47:58 +0800
Subject: [PATCH] =?UTF-8?q?=E9=82=80=E8=AF=B7Trustie=E7=94=A8=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/projects/invite_members.html.erb | 6 +++---
 config/locales/projects/en.yml             | 5 ++++-
 config/locales/projects/zh.yml             | 5 ++++-
 config/locales/zh.yml                      | 4 +---
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/app/views/projects/invite_members.html.erb b/app/views/projects/invite_members.html.erb
index 4b07b9b3e..55fa2487b 100644
--- a/app/views/projects/invite_members.html.erb
+++ b/app/views/projects/invite_members.html.erb
@@ -1,6 +1,6 @@
 
 <div class="project_r_h">
-  <h2 class="project_h2">邀请加入</h2>
+  <h2 class="project_h2"><%= l(:label_invite_join) %></h2>
 </div>
 <%#= render_flash_messages %>
 <%
@@ -20,12 +20,12 @@
     </div>
     <div class="cl"></div>
     <div class="box_main">
-      <h3 class="box_h3">邀请Trustie注册用户</h3>
+      <h3 class="box_h3"><%= l(:label_invite_trustie_user) %></h3>
       <% if roles.any? %>
           <%= form_for(@member, {:as => :membership, :url => project_memberships_path(@project), :method => :post}) do |f| %>
               <div class="invi_search">
                 <input hidden="hidden" value="true" name="flag">
-                <input id="principal_search" class="invi_search_input fl" type="text" placeholder="输入用户名称搜索好友">
+                <input id="principal_search" class="invi_search_input fl" type="text" placeholder="请输入用户名称来搜索好友">
                 <%= javascript_tag "observeSearchfield('principal_search', null, '#{ escape_javascript autocomplete_project_memberships_path(@project, :format => 'js',:flag => true) }')" %>
                 <div class="cl"></div>
 
diff --git a/config/locales/projects/en.yml b/config/locales/projects/en.yml
index fdc426ca5..56177bea3 100644
--- a/config/locales/projects/en.yml
+++ b/config/locales/projects/en.yml
@@ -90,8 +90,11 @@ en:
   label_send_email: Send
   label_input_email: Please input email address
 
-  
   label_invite_trustie_user: "Invite Trustie registered users" 
+  label_invite_trustie_user_tips: "Please enter the Trustie user name"
+  label_invite_project: "invites you to join the project"
+  label_invite_success: Successful invitation
+  label_invite_members: Invite
 
 
   #   
diff --git a/config/locales/projects/zh.yml b/config/locales/projects/zh.yml
index b0a122dd1..c70392171 100644
--- a/config/locales/projects/zh.yml
+++ b/config/locales/projects/zh.yml
@@ -95,7 +95,10 @@ zh:
   label_input_email: 请输入邮箱地址
   
   label_invite_trustie_user: "邀请Trustie注册用户" 
-  
+  label_invite_trustie_user_tips: "请输入用户名称来搜索好友"
+  label_invite_project: 邀请您加入项目
+  label_invite_success: 邀请成功
+  label_invite_members: 邀请用户  
   #   
   #  项目托管平台
   #
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 8fdd3ae67..b040d0da5 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -1714,9 +1714,7 @@ zh:
 
   label_bids_task_list: 作业列表
   label_join_course: 加入
-  label_invite_project: 邀请您加入项目
-  label_invite_success: 邀请成功
-  label_invite_members: 邀请用户
+
   label_exit_course: 退出
   label_exit_group: 退出当前分班
   label_new_join: 加入