From be5c7ac6dd688a6a56d15c517a6b1ae1e5cf0f23 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Wed, 22 Apr 2015 10:24:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E6=9C=AF=E8=AF=AD=20=E5=9B=BE=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/application_helper.rb        | 6 +++---
 app/views/layouts/base_projects.html.erb | 6 +++---
 config/locales/projects/zh.yml           | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 0163c8dd8..69a3a8398 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -51,11 +51,11 @@ module ApplicationHelper
 
   def get_project_type_css(value)
     if value == 1
-      "pr_friend"
-    elsif value == 1
+      "pr_kafa"
+    elsif value == 2
       "pr_keyan"
     else
-      "pr_kafa"
+      "pr_friend"
     end
   end
 
diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb
index ed7a5a4dc..06c9ea05e 100644
--- a/app/views/layouts/base_projects.html.erb
+++ b/app/views/layouts/base_projects.html.erb
@@ -225,9 +225,9 @@
       <div class=" mt10">
         <h3 class="mb10 c_blue">请选择项目类型：</h3>
         <ul class="mb10" id="project_type">
-          <li><input type="radio" name="project_type" <%= @project.project_new_type == 1 ? 'checked' : ''%> id="development_group"/><label >&nbsp;&nbsp;开发模式</label></li>
-          <li><input type="radio" name="project_type" <%= @project.project_new_type == 2 ? 'checked' : ''%> id="research_group"/><label >&nbsp;&nbsp;研讨模式</label></li>
-          <li><input type="radio" name="project_type" <%= @project.project_new_type == 3 ? 'checked' : ''%> id="friend_organization"/><label >&nbsp;&nbsp;圈子模式</label></li>
+          <li><input type="radio" name="project_type" <%= @project.project_new_type == 1 ? 'checked' : ''%> id="development_group"/><label >&nbsp;&nbsp;协同开发模式</label></li>
+          <li><input type="radio" name="project_type" <%= @project.project_new_type == 2 ? 'checked' : ''%> id="research_group"/><label >&nbsp;&nbsp;学术研讨模式</label></li>
+          <li><input type="radio" name="project_type" <%= @project.project_new_type == 3 ? 'checked' : ''%> id="friend_organization"/><label >&nbsp;&nbsp;朋友圈子模式</label></li>
         </ul>
         <a href="javascript:void(0)" class="orange_btn" onclick="click_ok('<%= change_project_type_project_path @project%>');" >确定</a>
 
diff --git a/config/locales/projects/zh.yml b/config/locales/projects/zh.yml
index 49fe0e19a..2ddb5aa16 100644
--- a/config/locales/projects/zh.yml
+++ b/config/locales/projects/zh.yml
@@ -55,9 +55,9 @@ zh:
   label_apply_project_waiting: 已处理申请，请等待管理员审核
   label_unapply_project: 取消申请
   lable_sure_exit_project: 是否确认退出该项目
-  label_friend_organization: 圈子模式
-  label_research_group: 研讨模式
-  label_development_team: 开发模式
+  label_friend_organization: 朋友圈子模式
+  label_research_group: 学术研讨模式
+  label_development_team: 协同开发模式
 
   label_member: 成员
   project_module_attachments: 资源