From cba760b8b0815f704e4af79236f71758d3cec6c2 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Wed, 6 May 2015 15:01:26 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E3=80=81=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/courses/_course_members.html.erb        | 2 +-
 app/views/projects/_project_members.html.erb      | 2 +-
 app/views/projects/settings/_new_members.html.erb | 2 +-
 config/locales/projects/zh.yml                    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/courses/_course_members.html.erb b/app/views/courses/_course_members.html.erb
index 88ac405dc..78dc6c319 100644
--- a/app/views/courses/_course_members.html.erb
+++ b/app/views/courses/_course_members.html.erb
@@ -21,7 +21,7 @@
   <%= form_for(@member, {:as => :membership, :url => course_memberships_path(@course), :remote => true, :method => :post}) do |f| %>
       <div class="member_search">
         <input hidden="hidden" value="true" name="flag">
-        <input id="principal_search" class="member_search_input fl" type="text" placeholder="请输入用户名称来搜索好友">
+        <input id="principal_search" class="member_search_input fl" type="text" placeholder="<%= l(:label_invite_trustie_user_tips)%>">
         <%= javascript_tag "observeSearchfield('principal_search', null, '#{ escape_javascript autocomplete_course_memberships_path(@course, :format => 'js',:flag => true) }')" %>
         <div class="cl"></div>
 
diff --git a/app/views/projects/_project_members.html.erb b/app/views/projects/_project_members.html.erb
index 3f91f9269..fd121aad7 100644
--- a/app/views/projects/_project_members.html.erb
+++ b/app/views/projects/_project_members.html.erb
@@ -20,7 +20,7 @@
   <%= form_for(@member, {:as => :membership, :url => course_memberships_path(@project), :remote => true, :method => :post}) do |f| %>
       <div class="member_search">
         <input hidden="hidden" value="true" name="flag">
-        <input id="principal_search" class="member_search_input fl" type="text" placeholder="请输入用户名称来搜索好友">
+        <input id="principal_search" class="member_search_input fl" type="text" placeholder="<%= l(:label_invite_trustie_user_tips)%>">
         <%= javascript_tag "observeSearchfield('principal_search', null, '#{ escape_javascript autocomplete_course_memberships_path(@project, :format => 'js',:flag => true) }')" %>
         <div class="cl"></div>
 
diff --git a/app/views/projects/settings/_new_members.html.erb b/app/views/projects/settings/_new_members.html.erb
index 7abe6198c..2cdcd4cf5 100644
--- a/app/views/projects/settings/_new_members.html.erb
+++ b/app/views/projects/settings/_new_members.html.erb
@@ -91,7 +91,7 @@
       <p class="c_blue fb mt10 mb5"><%= l(:label_member_new) %></p>
       <%= form_for(@member, {:as => :membership, :url => project_memberships_path(@project), :remote => true, :method => :post}) do |f| %>
           <div class="member_search">
-            <input id="principal_search" class="member_search_input fl" type="text" placeholder="请输入用户名称来搜索好友">
+            <input id="principal_search" class="member_search_input fl" type="text" placeholder="<%= l(:label_invite_trustie_user_tips)%>">
             <%= javascript_tag "observeSearchfield('principal_search', null, '#{ escape_javascript autocomplete_project_memberships_path(@project, :format => 'js') }')" %>
             <div class="cl"></div>
 
diff --git a/config/locales/projects/zh.yml b/config/locales/projects/zh.yml
index c1850b7e4..1b17347c3 100644
--- a/config/locales/projects/zh.yml
+++ b/config/locales/projects/zh.yml
@@ -338,7 +338,7 @@ zh:
   label_input_email: 请输入邮箱地址
   
   label_invite_trustie_user: "邀请Trustie注册用户" 
-  label_invite_trustie_user_tips: "请输入用户名称来搜索好友"
+  label_invite_trustie_user_tips: "输入姓名、邮箱、昵称"
   label_user_role_null: 用户和角色不能留空！
   label_invite_project: 邀请您加入项目
   label_invite_success: 邀请成功