From be2b3a78d69501a21753781bf25d4bad91e63cb6 Mon Sep 17 00:00:00 2001 From: huang Date: Sat, 4 Jul 2015 15:26:01 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=BC=95=E7=94=A8=E6=9C=AA=E9=80=89=E7=9D=80?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=97=B6=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/attachments_controller.rb | 2 +- config/locales/zh.yml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/controllers/attachments_controller.rb b/app/controllers/attachments_controller.rb index 09ca29178..a301a1e6c 100644 --- a/app/controllers/attachments_controller.rb +++ b/app/controllers/attachments_controller.rb @@ -388,7 +388,7 @@ class AttachmentsController < ApplicationController end rescue NoMethodError @save_flag = false - @save_message = [] << l(:label_course_empty_select) + @save_message = [] << l(:label_project_empty_select) respond_to do |format| format.js end diff --git a/config/locales/zh.yml b/config/locales/zh.yml index 1e3be5895..ffa60f1f3 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -1928,6 +1928,7 @@ zh: label_my_score: 我的评分 field_open_anonymous_evaluation: 是否使用匿评 label_course_empty_select: 尚未选择课程！ + label_project_empty_select: 尚未选择项目！ label_course_prompt: 课程： label_project_prompt: 项目： label_contain_resource: 已包含资源： From 602670b8419fadfc1f31824249edfb061316055e Mon Sep 17 00:00:00 2001 From: huang Date: Sat, 4 Jul 2015 15:42:03 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=82=AE=E4=BB=B6=E6=8C=89=E5=A4=A9?= =?UTF-8?q?=E9=80=9A=E7=9F=A5=EF=BC=9A=E4=BF=AE=E6=94=B9=E8=B4=B4=E5=90=A7?= =?UTF-8?q?=E5=8A=A8=E6=80=81=E5=92=8C=E4=B8=AA=E4=BA=BA=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E9=A2=9C=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/mailer/send_for_user_activities.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/mailer/send_for_user_activities.html.erb b/app/views/mailer/send_for_user_activities.html.erb index 264a420cb..59dc1e674 100644 --- a/app/views/mailer/send_for_user_activities.html.erb +++ b/app/views/mailer/send_for_user_activities.html.erb @@ -420,7 +420,7 @@ <% unless @user_journal_messages.first.nil? %>
-

<%= l(:label_activities) %>

+

<%= l(:label_activities) %>

    @@ -451,7 +451,7 @@ <% end %> <% if @forums.first || @memos.first %>
    -

    <%= l(:lable_bar_active) %>

    +

    <%= l(:lable_bar_active) %>

    <% unless @forums.first.nil? %>