From 8adb00fccb70e5f865fd3f6f78c3ae1a38cd1b55 Mon Sep 17 00:00:00 2001 From: huang Date: Fri, 5 Jun 2015 15:26:14 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A8=E8=AE=BA=E5=8C=BA?= =?UTF-8?q?=E9=82=AE=E4=BB=B6=E4=B8=AD=E6=A0=B7=E5=BC=8F=E5=92=8C=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E4=B8=8D=E4=B8=80=E8=87=B4=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/mailer/message_posted.html.erb | 2 +- app/views/mailer/send_invite_in_project.html.erb | 2 +- app/views/mailer/wiki_content_added.html.erb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/mailer/message_posted.html.erb b/app/views/mailer/message_posted.html.erb index dbe41976a..2be4e486e 100644 --- a/app/views/mailer/message_posted.html.erb +++ b/app/views/mailer/message_posted.html.erb @@ -23,7 +23,7 @@
  • <%= l(:mail_issue_content)%> - <%= @message.content %> + <%= @message.content.html_safe? %>
    • diff --git a/app/views/mailer/send_invite_in_project.html.erb b/app/views/mailer/send_invite_in_project.html.erb index 51b189f37..ec559732f 100644 --- a/app/views/mailer/send_invite_in_project.html.erb +++ b/app/views/mailer/send_invite_in_project.html.erb @@ -5,7 +5,7 @@
  • <%= l(:mail_issue_content)%>

    <%= @subject %>

    -

    点击链接激活账号，系统会依据给出的密码和账号自动登录Trustie平台。

    +

    点击下面的链接即可激活账号，系统会根据给出的密码和账号自动登录Trustie平台。

    <%= link_to @project_url, @project_url%>

    您的账号为:<%= @email %>

    密码为： <%= @password %>

    diff --git a/app/views/mailer/wiki_content_added.html.erb b/app/views/mailer/wiki_content_added.html.erb index 8c83f62c8..c4f6929a8 100644 --- a/app/views/mailer/wiki_content_added.html.erb +++ b/app/views/mailer/wiki_content_added.html.erb @@ -1,3 +1,3 @@

    <%= l(:mail_body_wiki_content_added, :id => link_to(h(@wiki_content.page.pretty_title), @wiki_content_url), :author => h(@wiki_content.author)).html_safe %>
    -<%=h @wiki_content.comments %>

    +<%=h @wiki_content.comments.html_safe? %>