diff --git a/app/views/layouts/_base_softapplication_index_top_content.html.erb b/app/views/layouts/_base_softapplication_index_top_content.html.erb index d029d27e4..7fa65bec4 100644 --- a/app/views/layouts/_base_softapplication_index_top_content.html.erb +++ b/app/views/layouts/_base_softapplication_index_top_content.html.erb @@ -1,7 +1,7 @@
- +
创新竞赛社区<%=l(:label_contest_innovate_community)%> <%= l(:label_user_location) %> :
diff --git a/app/views/layouts/_base_softapplication_top_content.html.erb b/app/views/layouts/_base_softapplication_top_content.html.erb index 064e84cf0..71c708d63 100644 --- a/app/views/layouts/_base_softapplication_top_content.html.erb +++ b/app/views/layouts/_base_softapplication_top_content.html.erb @@ -1,7 +1,7 @@
- + diff --git a/app/views/layouts/base_contest.html.erb b/app/views/layouts/base_contest.html.erb index 2bda701fe..94d55238a 100644 --- a/app/views/layouts/base_contest.html.erb +++ b/app/views/layouts/base_contest.html.erb @@ -26,7 +26,7 @@
创新竞赛社区<%=l(:label_contest_innovate_community)%> <%= l(:label_user_location) %> :
- +
创新竞赛社区<%=l(:label_contest_innovate_community)%> <%= l(:label_user_location) %> :
diff --git a/app/views/layouts/base_newcontest.html.erb b/app/views/layouts/base_newcontest.html.erb index 0ac197348..a4522d289 100644 --- a/app/views/layouts/base_newcontest.html.erb +++ b/app/views/layouts/base_newcontest.html.erb @@ -27,7 +27,7 @@
- +
创新竞赛社区<%=l(:label_contest_innovate_community)%> <%= l(:label_user_location) %> :
@@ -123,7 +123,7 @@
- + diff --git a/config/locales/en.yml b/config/locales/en.yml index 82a01af1c..5421db83a 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1178,7 +1178,7 @@ en: label_message: message board field_add: Add before %{time} button_more: More - label_user_response: Feedbacks # modified by bai + label_user_response: Feedback # modified by bai label_bidding_project: projects button_bidding: I will participate in it label_new_call: New call @@ -1207,9 +1207,9 @@ en: label_follow_people: following # modified by bai #modify by men label_x_follow_people: - zero: follower - one: follower - other: followers + zero: Follower + one: Follower + other: Followers #end label_member_since: joined label_contribute_to: Participates %{project_count} projects： @@ -1250,9 +1250,9 @@ en: other: comments #end label_x_followers: #modified by men - zero: follower - one: follower - other: followers + zero: Follower + one: Follower + other: Followers #end @@ -1385,7 +1385,7 @@ en: label_bid_project: projects label_project_no_follow: The project hasn't been followed now！ label_no_bid_project: has no participate project - label_bids_reward_method: reward： + label_bids_reward_method: Reward： label_bids_reward_what: input what for reward label_call_bonus: bonus label_bids_form_new_description: Publish a requirement,a competition or a course work. @@ -1691,6 +1691,7 @@ en: label_softapplication_name_condition: Less than 50 characters label_softapplication_description_condition: Less than 250 characters label_user_login_softapplication_board: You are not logged in, please log in and then participate in the evaluation! + label_user_login_attending_contest: You are not logged in, please log in and then join the competition! label_contest_description_no: No description label_no_contest_softapplication: No application label_button_ok: Ok @@ -1706,7 +1707,7 @@ en: label_contest_delete: Delete contest label_noawards_current: No awards label_softapplication: Application software - label_attending_contest: Attengding contest + label_attending_contest: Joining label_new_attendingcontest_work: New competition work label_workname_lengthlimit: Less than 50 characters label_workdescription_lengthlimit: Less than 250 characters @@ -1724,13 +1725,23 @@ en: notice_attendingcontest_work_successfully_created: Congratulations, competition work successfully created! notice_softapplication_was_successfully_updated: Congratulations, competition work successfully updated! - label_contest_notification: Competition notification + label_contest_notification: Notice + lable_contest_user: Release person + label_contest_innovate_community: Competition community label_user_login_score_and_comment: You are not logged in, please log in and then score and comment the work! label_contest_work_list: Competition work list + label_borad_project: Project-borad + label_search_intimation: please input the searching keywords! + label_update_time: Update time + label_project_notice: release the notice + label_user_grade: Individual score + label_active_homework: homework + label_course_term: Semester + label_comment_time: Comment time #end # ajax异步验证 diff --git a/config/locales/zh.yml b/config/locales/zh.yml index 6812d6a63..f24d7467a 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -540,7 +540,7 @@ zh: label_enterprise_into: 进入企业 label_college_into: 进入高校 label_investor: 投资人： - lable_contest_user: 竞赛发布人： #huang + lable_contest_user: 竞赛发布人 label_user_home: 创客空间 label_user_location: 当前位置 label_course_term: 开课学期 @@ -1962,7 +1962,7 @@ zh: label_attendingcontestwork_sorting_intimation: 您可以重新打分，打分结果以最后一次打分为主！ label_contest_notification: 竞赛通知 - + label_contest_innovate_community: 创新竞赛社区 #english site translation label_current_hot_contest: 最新热门竞赛 label_current_attendingcontest_work: 最新参赛作品
<%= l(:lable_contest_user) %><%= link_to(@user.name, user_path(@user))%><%= l(:lable_contest_user) %>: <%= link_to(@user.name, user_path(@user))%>
<%= l(:label_bids_reward_method) %><%= @contest.budget%>