diff --git a/app/views/welcome/course.html.erb b/app/views/welcome/course.html.erb
index f57bc97d7..51f082ae6 100644
--- a/app/views/welcome/course.html.erb
+++ b/app/views/welcome/course.html.erb
@@ -39,30 +39,31 @@
- <% if @school_id.nil? and (User.current.user_extensions.nil? || User.current.user_extensions.school.nil?) %>
+ <% if @school_id.nil? and (User.current.user_extensions.nil? || User.current.user_extensions.school.nil?) %>
+ <% else %>
+ <% if @school_id == "0" %>
<% else %>
- <% if @school_id == "0" %>
- <% else %>
- <% if @school_id.nil? %>
- <%= link_to School.find(User.current.user_extensions.school.id).name, options={:action => 'course', :school_id => User.current.user_extensions.school.id}, html_options={:class => 'font_welcome_school', :method => 'get'} %>
-
- <% else %>
- <%= link_to School.find(@school_id).name, options={:action => 'course', :school_id => @school_id}, html_options={:class => 'font_welcome_school', :method => 'get'} %>
-
- <% end %>
- <% end %>
- <% end %>
+ <% if @school_id.nil? %>
+ <%= link_to School.find(User.current.user_extensions.school.id).name, options={:action => 'course', :school_id => User.current.user_extensions.school.id}, html_options={:class => 'font_welcome_school', :method => 'get'} %>
+
+ <% else %>
+ <%= link_to School.find(@school_id).name, options={:action => 'course', :school_id => @school_id}, html_options={:class => 'font_welcome_school', :method => 'get'} %>
+
+ <% end %>
+ <% end %>
+ <% end %>
+
<% unless @course_page.nil? %>
- <%= @course_page.title %>
+ <%= @course_page.title %>
- <% if @school_id.nil? and (User.current.user_extensions.nil? || User.current.user_extensions.school.nil?) %>
- , <%= @course_page.description %>
- <% else %>
- <% if @school_id == "0" %>
+ <% if @school_id.nil? and (User.current.user_extensions.nil? || User.current.user_extensions.school.nil?) %>
, <%= @course_page.description %>
+ <% else %>
+ <% if @school_id == "0" %>
+ , <%= @course_page.description %>
+ <% end %>
<% end %>
<% end %>
- <% end %>
<%= render :partial => "search_course", :locals => {:project_type => Project::ProjectType_course} %>
@@ -98,7 +99,7 @@
<% else %>
- <% if school_course.count < 10 %>
+ <% if school_course.count < 9 %>
<%= render :partial => 'more_course', :locals => {:school_id => nil}%>
@@ -110,7 +111,7 @@
<%= render :partial => 'course_list', :locals => {:course_list => school_course} %>
- <% if school_course.count < 10 %>
+ <% if school_course.count < 9 %>
-
<%= render :partial => 'no_course_title', :locals => {:course_title => l(:label_school_less_course)} %>
@@ -123,9 +124,9 @@
- 问题和反馈动态
- <%= link_to "我要提问", newbie_send_path, {:class => 'orangeButton idea_btn', :style => "color: #EEEEEE"} %>
- <%= link_to "我要反馈", suggestion_send_path, {:class => 'orangeButton idea_btn', :style => "color: #EEEEEE"} %>
+ <%= l(:label_issue_feedback_activities)%>
+ <%= link_to l(:label_my_question), newbie_send_path, {:class => 'orangeButton idea_btn', :style => "color: #EEEEEE"} %>
+ <%= link_to l(:label_my_feedback), suggestion_send_path, {:class => 'orangeButton idea_btn', :style => "color: #EEEEEE"} %>
<%= link_to "更多>>", forums_path %>
@@ -143,13 +144,13 @@
<%= "#{l(:label_updated_time, value: time_tag_welcome(topic_last_time topic))}".html_safe %>
- 楼主: <%= link_to topic.author.login.truncate(10, omission: '...'),user_path(topic.author),title: topic.author.login %>
+ <%= l(:label_question_sponsor)%>: <%= link_to topic.author.login.truncate(10, omission: '...'),user_path(topic.author),title: topic.author.login %>
- 最后回复:<% unless (topic.last_reply.nil? || topic.last_reply.author.nil?) %><%=link_to topic.last_reply.author.login.truncate(10, omission: '...'),user_path(topic.last_reply.author),title: topic.last_reply.author.login%><% end %>
+ <%= l(:label_final_reply)%>:<% unless (topic.last_reply.nil? || topic.last_reply.author.nil?) %><%=link_to topic.last_reply.author.login.truncate(10, omission: '...'),user_path(topic.last_reply.author),title: topic.last_reply.author.login%><% end %>
- 回复(<%= link_to topic.try(:replies_count), topic.event_url %>)
+ <%= l(:label_reply)%>(<%= link_to topic.try(:replies_count), topic.event_url %>)