diff --git a/app/views/layouts/_base_header.html.erb b/app/views/layouts/_base_header.html.erb index a22602f7b..c18d48fcb 100644 --- a/app/views/layouts/_base_header.html.erb +++ b/app/views/layouts/_base_header.html.erb @@ -7,7 +7,7 @@ @nav_dispaly_home_path_label = 1 @nav_dispaly_course_all_label = 1 @nav_dispaly_project_label = 1 - elsif (realUrl.match(/projects/)) + elsif (realUrl.match(/[projects|issues]/)) @nav_dispaly_project_label = 1 elsif (realUrl.match(/contest/)) @nav_dispaly_contest_label = 1 diff --git a/app/views/projects/new.html.erb b/app/views/projects/new.html.erb index 3e81482ef..7044d69dd 100644 --- a/app/views/projects/new.html.erb +++ b/app/views/projects/new.html.erb @@ -3,14 +3,14 @@ <% if @course_tag == '1' %>

<%=l(:label_course_new)%>

-

<%=raw l(:label_course_news_description)%>

+

<%=raw l(:label_course_news_description)%>

<%= render :partial => 'course_form', :locals => { :f => f } %> <%= submit_tag l(:button_create), :class => "enterprise"%> <% else %>

<%=l(:label_project_new)%>

-

<%=l(:label_project_new_description)%>

+

<%=raw l(:label_project_new_description)%>

<%= render :partial => 'form', :locals => { :f => f } %> <%= submit_tag l(:button_create), :class => "enterprise"%> diff --git a/config/locales/zh.yml b/config/locales/zh.yml index 3c9218683..a006ae53c 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -448,7 +448,7 @@ zh: project_module_time_tracking: 时间跟踪 project_module_news: 新闻 project_module_documents: 文档 - project_module_files: 版本下载 + project_module_files: 资料下载 project_module_wiki: Wiki project_module_repository: 版本库 project_module_boards: 讨论区 @@ -515,7 +515,7 @@ zh: label_requirement: 需求 label_new_course: 课程列表 label_course_practice: 课程实践 - label_course_all: 所有课程 + label_course_all: 课程列表 label_teacher_all: 所有教师 label_project_deposit: 项目托管 label_software_user: 软件创客