From 65ee86bb4581aa39954c58f2a0669d37f3dfe583 Mon Sep 17 00:00:00 2001 From: huang Date: Fri, 26 Jun 2015 17:07:31 +0800 Subject: [PATCH] =?UTF-8?q?1=EF=BC=8C=E8=A7=A3=E5=86=B3git=E4=B8=AD?= =?UTF-8?q?=E8=8B=B1=E6=96=87500=E9=94=99=E8=AF=AF=202.=E8=A7=A3=E5=86=B3?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=99=A8=E8=BE=93=E5=85=A5=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E9=82=AE=E4=BB=B6=E6=98=BE=E7=A4=BA=E5=BC=82=E5=B8=B8=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/git_usage_controller.rb | 2 +- app/views/mailer/send_for_user_activities.html.erb | 4 ++-- config/locales/zh.yml | 2 ++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/controllers/git_usage_controller.rb b/app/controllers/git_usage_controller.rb index 0b97fd523..56aaa56f1 100644 --- a/app/controllers/git_usage_controller.rb +++ b/app/controllers/git_usage_controller.rb @@ -1,6 +1,6 @@ #added by baiyu class GitUsageController < ApplicationController - layout "base_projects" + layout "new_base" def ch_usage end diff --git a/app/views/mailer/send_for_user_activities.html.erb b/app/views/mailer/send_for_user_activities.html.erb index a8c9336f8..22eb23bf7 100644 --- a/app/views/mailer/send_for_user_activities.html.erb +++ b/app/views/mailer/send_for_user_activities.html.erb @@ -49,7 +49,7 @@ :style => "color:#2E8DD7; float:left;display:block; margin-right:5px; margin-left:5px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%> <%= l(:label_project_notice_reply) %> - <%= link_to truncate(course_news_comment.comments.html_safe,length: 30,omission: '...'), news_url(course_news_comment.commented,:token => @token.value), + <%= link_to truncate(l(:label_course_notice_point),length: 30,omission: '...'), news_url(course_news_comment.commented,:token => @token.value), :class => 'wmail_info', :style => "color:#2E8DD7;float:left; font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %> @@ -342,7 +342,7 @@ :style => "color:#2E8DD7; float:left;display:block; margin-right:5px; margin-left:5px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%> <%= l(:lable_project_mail_notice_reply) %> - <%= link_to truncate(project_news_comment.comments.html_safe,length: 30,omission: '...'), news_url(project_news_comment.commented,:token => @token.value), + <%= link_to truncate(l(:lable_project_notice_point),length: 30,omission: '...'), news_url(project_news_comment.commented,:token => @token.value), :class => 'wmail_info', :style => "color:#2E8DD7;float:left; font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %> <%= format_time(project_news_comment.created_on) %> diff --git a/config/locales/zh.yml b/config/locales/zh.yml index a37c3882a..568690638 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -784,6 +784,8 @@ zh: label_project_newshare: "分享了" label_project_notice: "发布了通知：" label_project_notice_reply: "回复了通知：" + label_course_notice_point: "通知有了新的回复！" + lable_project_notice_point: "新闻有了新的回复！" label_project_mail_notice: "发布了新闻：" lable_project_mail_notice_reply: "回复了新闻：" label_project_issue: "发布了问题："