From d087c5231462359ddc12828f83a060db6a627e5f Mon Sep 17 00:00:00 2001 From: chenmin <19763783@qq.com> Date: Thu, 7 Aug 2014 16:20:46 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E4=B8=BA=E7=A9=BA=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/courses/show.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/courses/show.html.erb b/app/views/courses/show.html.erb index deb590d1f..d7d579dd1 100644 --- a/app/views/courses/show.html.erb +++ b/app/views/courses/show.html.erb @@ -1,4 +1,4 @@ -<% if @events_by_day.size >0 %> +<% if @events_by_day != nil && @events_by_day.size >0 %>

From d9a9867f964fb48546e52bfd6168fa42cc788b51 Mon Sep 17 00:00:00 2001 From: zhanghaitao <562681745@qq.com> Date: Thu, 7 Aug 2014 16:41:31 +0800 Subject: [PATCH 2/2] =?UTF-8?q?#815=20=E4=B8=AD=E8=8B=B1=E6=96=87=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/locales/zh.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/config/locales/zh.yml b/config/locales/zh.yml index ab754feaf..572862174 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -315,7 +315,7 @@ zh: field_auth_source: 认证模式 field_hide_mail: 隐藏我的邮件地址 field_comments: 注释 - field_url: URL + field_url: 路径 field_start_page: 起始页 field_subproject: 子项目 field_hours: 小时 @@ -979,7 +979,7 @@ zh: label_change_properties: 修改属性 label_general: 一般 label_more: 更多>> - label_scm: SCM + label_scm: 管理系统 label_plugins: 插件 label_ldap_authentication: LDAP 认证 label_downloads_abbr: D/L @@ -1552,6 +1552,7 @@ zh: label_have_respond: 进行了反馈 label_welcome: 欢迎 label_join: 加入Trustie！ + label_repository_path: 库路径 label_board_description: 七嘴八舌，汇聚众人智慧，为您排忧解难！ label_create_course_description: 课程小社区，创建新课程，让我们共同分享多到想不到的公共资源！ label_welcome_page_to: 参与了 %{project_count} 个项目！