英文子站首页

app/views/welcome/contest.html.erb

@@ -118,13 +118,13 @@
 		</div>	
 	<div class="welcome_left" id="welcome_left">
 
-			<span class="font_welcome_trustie"><%= l(:label_welcome_trustie) %><%= l(:label_welcome_trustie_contest) %></span> <span class="font_welcome_tdescription">, <%= l(:label_welcome_trustie_contest_description) %></span>
+			<span class="font_welcome_trustie"><%= l(:label_welcome_trustie) %>&nbsp;<%= l(:label_welcome_trustie_contest) %></span> <span class="font_welcome_tdescription">, <%= l(:label_welcome_trustie_contest_description) %></span>
 	</div>
 
 <!--搜索框-->	
 	<div id="J_Slide" class="d-p-index-box d-p-index-hotproject" style="float: right;">		
 		<%= form_tag({controller: 'contests', action: 'index'}, method: :get) do %>	
-			<%= text_field_tag 'name', params[:name], placeholder:'请输入要搜索的关键字', name: "name", :class => 'blueinputbar', :style => 'width:240px; padding-right:50px;'%>
+			<%= text_field_tag 'name', params[:name], placeholder:<%=l(:label_searching_intimation)%>, name: "name", :class => 'blueinputbar', :style => 'width:240px; padding-right:50px;'%>
 			&nbsp;
 			<%= hidden_field_tag 'project_type', params[:project_type] %>
 			<%= submit_tag l(:label_search), :class => "enterprise" , :name => nil%>
@@ -139,8 +139,8 @@
 
 
 <div id="J_Slide" class="d-p-index-box d-p-index-hotproject">
-<h3 style="margin-left: 5px; color: #e8770d;"><strong>最新热门竞赛</strong></h3>
+<h3 style="margin-left: 5px; color: #e8770d;"><strong><%=l(:label_current_hot_contest)%></strong></h3>
-	<span style="margin-top: -20px;float: right; display: block;"><%= link_to "更多>>", {:controller => 'contests', :action => 'index', :host => Setting.contest_domain}, :target => "_blank" %></span>
+	<span style="margin-top: -20px;float: right; display: block;"><%= link_to l(:label_more_information), {:controller => 'contests', :action => 'index', :host => Setting.contest_domain}, :target => "_blank" %></span>
 	<div class="d-p-projectlist-box">
 		<div class="d-p-projectlist">
 			<% find_all_hot_contest.map do |contest| break if(contest == find_all_hot_contest[5]) %>
@@ -166,7 +166,7 @@
 				
 				<div style="padding-left: 57px; clear: left;">
 	
-					<span class="font_lighter">发布时间：<%=format_time contest.created_on %></span>
+					<span class="font_lighter"><%=l(:label_release_time)%>:&nbsp;<%=format_time contest.created_on %></span>
 				</div>
 				
 			</li>
@@ -179,11 +179,11 @@
 
 <div id="J_Slide" class="d-p-index-box d-p-index-hotproject" style="float: right;">
 <h3 style="margin-left: 5px; color: #e8770d;">
-	<strong>问题和反馈动态</strong>
+	<strong><%=l(:label_issue_feedback_activities)%></strong>
-	<%= link_to "我要提问" , newbie_send_path, {:class => 'orangeButton idea_btn', :style => "color: #EEEEEE" }%>
+	<%= link_to l(:label_my_question), newbie_send_path, {:class => 'orangeButton idea_btn', :style => "color: #EEEEEE" }%>
-	<%= link_to "我要反馈" , suggestion_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" }%>
 </h3>
-	<span style="margin-top: -20px;float: right; display: block;"><%= link_to "更多>>", forums_path %></span>
+	<span style="margin-top: -20px;float: right; display: block;"><%= link_to l(:label_more_information), forums_path %></span>
 	<div class="d-p-projectlist-box">
 		<ul class="d-p-projectlist">
 			<% find_new_forum_topics(11).each do |topic|%>
@@ -197,13 +197,13 @@
 						<%= "#{l(:label_updated_time, value: time_tag_welcome(topic_last_time topic))}".html_safe %>
 					</span>
 					<span class="memo_author">
-						楼主： <%= link_to_user(topic.author) %>
+						<%=l(:label_question_sponsor)%>:&nbsp;<%= link_to_user(topic.author) %>
 					</span>
 					<span class="memo_last_person">
-						最后回复：<%=link_to_user topic.last_reply.try(:author) %>
+						<%=l(:label_final_reply)%>:&nbsp;<%=link_to_user topic.last_reply.try(:author) %>
 					</span>
 					<span class="memo_reply">
-						回复(<%= link_to topic.try(:replies_count), topic.event_url %>)
+						<%=l(:label_reply)%>(<%= link_to topic.try(:replies_count), topic.event_url %>)
 					</span>
                   </div>
                 </div>
@@ -214,8 +214,8 @@
 </div>
 
 <div id="J_Slide" class="d-p-index-box d-p-index-hotproject">
-<h3 style="margin-left: 5px; color: #e8770d;"><strong>最新参赛作品</strong></h3>
+<h3 style="margin-left: 5px; color: #e8770d;"><strong><%=l(:label_current_attendingcontest_work)%></strong></h3>
-	<span style="margin-top: -20px;float: right; display: block;"><%= link_to "更多>>", {:controller => 'softapplications', :action => 'index', :host => Setting.contest_domain}, :target => "_blank" %></span>
+	<span style="margin-top: -20px;float: right; display: block;"><%= link_to l(:label_more_information), {:controller => 'softapplications', :action => 'index', :host => Setting.contest_domain}, :target => "_blank" %></span>
 	<div class="d-p-projectlist-box">
 		<% if Softapplication.count > 0%>
 			<div class="d-p-projectlist">
@@ -235,7 +235,7 @@
 					</div><br />
 					
 					<div style="padding-left: 55px; clear: left;">
-						<span class="font_lighter">发布时间：<%=format_time softapplication.created_at %></span>
+						<span class="font_lighter"><%=l(:label_release_time)%>:&nbsp;<%=format_time softapplication.created_at %></span>
 					</div>
 					
 				</li>

config/locales/en.yml

@@ -1402,7 +1402,7 @@ en:
   #end
   label_bids_published: published
   label_bids_published_ago: ago  
-  label_welcome_trustie: Trustie forge
+  label_welcome_trustie: Trustie
   label_welcome_trustie_project: Online projects hosting platform
   label_welcome_trustie_course: Online Courses practice platform
   label_welcome_trustie_project_description: Software for Chinese college students and practitioners to provide social-oriented project management, code hosting, resource sharing, cooperation and exchange.
@@ -1617,6 +1617,22 @@ en:
   label_class_hour: period
   label_activity_time: publish date
 
+#added by linchun as competition#
+  label_welcome_trustie_contest: Contest Platform
+  label_welcome_trustie_contest_description: For the University student and programming enthusiasts,providing social competition、application、coding management and so on.
+
+  label_current_hot_contest: Latest Hot Competition
+  label_current_attendingcontest_work: Latest Competition Work
+  label_issue_feedback_activities: Question&Feedback
+  label_more_information: More...
+  label_my_question: My-question
+  label_my_feedback: My-feedback
+  label_release_time: Release-time
+  label_question_sponsor: Sponsor
+  label_final_reply: Final-reply
+  label_reply: Reply  
+
+#end
 
   # ajax异步验证
   modal_valid_passing: can be used.

config/locales/zh.yml

@@ -1963,6 +1963,18 @@ zh:
   
   label_contest_notification: 竞赛通知
   
+  label_current_hot_contest: 最新热门竞赛
+  label_current_attendingcontest_work: 最新参赛作品
+  label_issue_feedback_activities: 问题和反馈动态
+  label_more_information: 更多...
+  label_my_question: 我要提问
+  label_my_feedback: 我要反馈
+  label_release_time: 发布时间
+  label_question_sponsor: 楼主
+  label_final_reply: 最后回复
+  label_reply: 回复
+  label_weixin:　微信扫码
+  label_searching_intimation: 请输入要搜索的关键字
   #end
   
   # ajax异步验证