From df910a9c2d181e110b5d9daac458044863089cf1 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 26 Jun 2015 14:44:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E9=82=AE=E4=BB=B6=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E8=AF=AD=EF=BC=88=E5=90=8C=E6=AD=A5=E5=9B=BD=E9=99=85?=
 =?UTF-8?q?=E5=8C=96=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mailer/send_for_user_activities.html.erb  | 11 +++++-----
 .../mailer/send_for_user_activities.text.erb  | 20 +++++++++----------
 config/locales/en.yml                         | 19 ++++++++++--------
 config/locales/zh.yml                         |  6 +++++-
 4 files changed, 32 insertions(+), 24 deletions(-)

diff --git a/app/views/mailer/send_for_user_activities.html.erb b/app/views/mailer/send_for_user_activities.html.erb
index 6ff436fc8..a8c9336f8 100644
--- a/app/views/mailer/send_for_user_activities.html.erb
+++ b/app/views/mailer/send_for_user_activities.html.erb
@@ -25,7 +25,7 @@
                               :style => "color:#2E8DD7; float:left;display:block; margin-right:5px; margin-left:5px;  overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
                   <span class="wmail_txt" style="float:left; margin-right:5px;color:#ACAEB1;"><%= l(:label_project_notice) %></span>
 
-                  <%= link_to truncate(course_new.title,length: 30,omission: '...'), news_url(course_new,:token => @token.value),
+                  <%= link_to truncate(course_new.title.html_safe,length: 30,omission: '...'), news_url(course_new,: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;"
                   %>
@@ -47,7 +47,7 @@
 
                   <%= link_to course_news_comment.author, user_activities_url(course_news_comment.author,:token => @token.value), :class => "wmail_name",
                               :style => "color:#2E8DD7; float:left;display:block; margin-right:5px; margin-left:5px;  overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
-                  <span class="wmail_txt" style="float:left; margin-right:5px;color:#ACAEB1;"><%= l(:label_project_notice) %></span>
+                  <span class="wmail_txt" style="float:left; margin-right:5px;color:#ACAEB1;"><%= l(:label_project_notice_reply) %></span>
 
                   <%= link_to truncate(course_news_comment.comments.html_safe,length: 30,omission: '...'), news_url(course_news_comment.commented,:token => @token.value),
                               :class => 'wmail_info',
@@ -156,7 +156,7 @@
       <% unless @attachments.first.nil? %>
           <ul class="wmail_ul" style="margin-left:10px; border-bottom:1px dashed #cfcfcf; padding-bottom:15px; width:1020px; margin-bottom:15px;">
             <span class="wmail_h4" style="color:#666; font-size:14px; margin-bottom:5px;" >
-              <%= l(:label_course_attendingcontestwork_download) %>
+              <%= l(:label_course_mail_files) %>
             </span>
             <% @attachments.each do |attachment|%>
                 <li style="clear: both; list-style: none;">
@@ -223,7 +223,7 @@
                   <span class="wmail_b" style="color:#666; font-weight:bold; float:left;">]</span>
                   <%= link_to issues_journal.user, user_activities_url(issues_journal.user,:token => @token.value), :class => "wmail_name",
                               :style => "color:#2E8DD7; float:left;display:block; margin-right:5px; margin-left:5px;  overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
-                  <span class="wmail_txt" style="float:left; margin-right:5px;color:#ACAEB1;"><%= l(:label_project_issue) %></span>
+                  <span class="wmail_txt" style="float:left; margin-right:5px;color:#ACAEB1;"><%= l(:label_project_issue_update) %></span>
                   <% if issues_journal.notes.blank? || issues_journal.notes.nil? %>
                       <%= link_to truncate(l(:label_isuue_mail_status),length: 30,omission: '...'),issue_url(issues_journal.issue,  :token => @token.value),
                                   :style => "color:#2E8DD7;float:left; font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
@@ -327,6 +327,7 @@
                 </li>
             <% end %>
             <div class="cl"></div>
+            <!--新闻回复-->
             <% @project_news_comments.each do |project_news_comment|%>
                 <li style="clear: both; list-style: none;">
                   <span class="wmail_dis" style="float:left; color:#000000; margin-right:5px;">▪</span>
@@ -339,7 +340,7 @@
                   <span class="wmail_b" style="color:#666; font-weight:bold; float:left;">]</span>
                   <%= link_to project_news_comment.author, user_activities_url(project_news_comment.author,:token => @token.value), :class => "wmail_name",
                               :style => "color:#2E8DD7; float:left;display:block; margin-right:5px; margin-left:5px;  overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
-                  <span class="wmail_txt" style="float:left; margin-right:5px;color:#ACAEB1;"><%= l(:label_project_mail_notice) %></span>
+                  <span class="wmail_txt" style="float:left; margin-right:5px;color:#ACAEB1;"><%= l(:lable_project_mail_notice_reply) %></span>
 
                   <%= link_to truncate(project_news_comment.comments.html_safe,length: 30,omission: '...'), news_url(project_news_comment.commented,:token => @token.value),
                               :class => 'wmail_info',
diff --git a/app/views/mailer/send_for_user_activities.text.erb b/app/views/mailer/send_for_user_activities.text.erb
index bcafb896f..f86dec62d 100644
--- a/app/views/mailer/send_for_user_activities.text.erb
+++ b/app/views/mailer/send_for_user_activities.text.erb
@@ -23,7 +23,7 @@
             <% end %>
             ]
             <%= link_to course_news_comment.author, user_activities_url(course_news_comment.author,:token => @token.value) %>
-            <%= l(:label_project_notice) %>
+            <%= l(:label_project_notice_reply) %>
             <%= link_to truncate(course_news_comment.comments,length: 30,omission: '...'), news_url(course_news_comment.commented,:token => @token.value) %>
             <%= format_time(course_news_comment.created_on) %>
         <% end %>
@@ -49,7 +49,7 @@
             [ <%= link_to truncate(course_journal_message.course.name,length: 30,omission: '...'), course_url(course_journal_message.course, :token => @token.value) %>]
             <%= link_to course_journal_message.user, user_activities_url(course_journal_message.user,:token => @token.value) %>
             <%= l(:label_send_course_journals_for_messages) %>
-            <%= link_to truncate(course_journal_message.notes,length: 30,omission: '...'), course_feedback_url(course_journal_message.course,:token => @token.value) %>
+            <%= link_to truncate(course_journal_message.notes.html_safe,length: 30,omission: '...'), course_feedback_url(course_journal_message.course,:token => @token.value) %>
             <%= format_time(course_journal_message.created_on) %>
         <% end %>
     <% end %>
@@ -66,7 +66,7 @@
     <% end %>
 
     <% unless @attachments.first.nil? %>
-        <%= l(:label_course_attendingcontestwork_download) %>
+        <%= l(:label_course_mail_files) %>
         <% @attachments.each do |attachment|%>
             ▪[<%= link_to truncate(attachment.course.name,length: 30,omission: '...'), course_url(attachment.course, :token => @token.value) %>]
             <%= link_to attachment.author, user_activities_url(attachment.author,:token => @token.value) %>
@@ -101,11 +101,11 @@
         <% @issues_journals.each do |issues_journal| %>
             ▪[<%= link_to truncate(issues_journal.issue.project.name,length: 30,omission: '...'), project_url(issues_journal.issue.project, :token => @token.value) %>]
             <%= link_to issues_journal.user, user_activities_url(issues_journal.user,:token => @token.value) %>
-            <%= l(:label_project_issue) %>
+            <%= l(:label_project_issue_update) %>
             <% if issues_journal.notes.nil? %>
                 <%= link_to truncate(issues_journal.issue.subject,length: 30,omission: '...'),issue_url(issue,  :token => @token.value) %>
             <% else %>
-                <%= link_to truncate(issues_journal.notes,length: 30,omission: '...'),issue_url(issues_journal.issue,  :token => @token.value) %>
+                <%= link_to truncate(issues_journal.notes.html_safe,length: 30,omission: '...'),issue_url(issues_journal.issue,  :token => @token.value) %>
             <% end %>
             <%= format_time(issues_journal.created_on) %>
         <% end %>
@@ -148,7 +148,7 @@
             ▪[<%= link_to truncate(project_new.project.name,length: 30,omission: '...'), project_url(project_new.project, :token => @token.value) %> ]
             <%= link_to project_new.author, user_activities_url(project_new.author,:token => @token.value) %>
             <%= l(:label_project_mail_notice) %>
-            <%= link_to truncate(project_new.title,length: 30,omission: '...'), news_url(project_new,:token => @token.value) %>
+            <%= link_to truncate(project_new.title.html_safe,length: 30,omission: '...'), news_url(project_new,:token => @token.value) %>
             <%= format_time(project_new.created_on) %>
         <% end %>
     <% end %>
@@ -161,7 +161,7 @@
                 <%= link_to truncate(project_news_comment.commented.project.name,length: 30,omission: '...'), project_url(project_news_comment.commented.project, :token => @token.value) %>
             <% end %>]
             <%= link_to project_news_comment.author, user_activities_url(project_news_comment.author,:token => @token.value) %>
-            <%= l(:label_project_mail_notice) %>
+            <%= 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) %>
             <%= format_time(project_news_comment.created_on) %>
         <% end %>
@@ -204,7 +204,7 @@
     <% @user_journal_messages.each do |user_journal_message|%>
         ▪ <%= link_to user_journal_message.user, user_activities_url(user_journal_message.user,:token => @token.value)%>
         <%= l(:label_show_your_message) %>
-        <%= link_to truncate(user_journal_message.notes,length: 30,omission: '...'), feedback_url(@user,:token => @token.value) %>
+        <%= link_to truncate(user_journal_message.notes.html_safe,length: 30,omission: '...'), feedback_url(@user,:token => @token.value) %>
         <%= format_time(user_journal_message.created_on) %>
     <% end %>
 <% end %>
@@ -216,7 +216,7 @@
         <% @forums.each do |forum|%>
             ▪<%= link_to forum.creator, user_activities_url(forum.creator,:token => @token.value) %>
             <%= l(:label_forum_new) %>
-            <%= link_to truncate(forum.name,length: 30,omission: '...'),forum_url(forum,:token => @token.value) %>
+            <%= link_to truncate(forum.name.html_safe,length: 30,omission: '...'),forum_url(forum,:token => @token.value) %>
             <%= format_time(forum.created_at) %>
         <% end %>
         <!-- 新建贴吧 end-->
@@ -226,7 +226,7 @@
         <% @memos.each do |memo|%>
             ▪<%= link_to memo.author, user_activities_url(memo.author,:token => @token.value)%>
             <%= memo.parent_id.nil? ? l(:label_memo_new_from_forum) : l(:label_reply) %>
-            <%= link_to truncate(memo.subject,length: 30,omission: '...'),forum_memo_url(memo.forum, (memo.parent_id.nil? ? memo : memo.parent_id))%>
+            <%= link_to truncate(memo.subject.html_safe,length: 30,omission: '...'),forum_memo_url(memo.forum, (memo.parent_id.nil? ? memo : memo.parent_id))%>
             <%= format_time(memo.created_at) %>
         <% end %>
      <!-- 新建贴吧 end-->
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 8419ae188..f532f5cbc 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -183,10 +183,10 @@ en:
   setting_bcc_recipients: Blind carbon copy recipients (bcc)
   setting_plain_text_mail: Plain text mail (no HTML)
   setting_host_name: Host name and path
-  setting_host_course: Host course and path
-  setting_host_contest: Host contest and path
-  setting_host_user: Host user and path
-  setting_host_repository: Host repository and path
+  setting_host_course: Host course and path
+  setting_host_contest: Host contest and path
+  setting_host_user: Host user and path
+  setting_host_repository: Host repository and path
   setting_text_formatting: Text formatting
   setting_wiki_compression: Wiki history compression
   setting_feeds_limit: Maximum number of items in Atom feeds
@@ -961,6 +961,8 @@ en:
   label_overview: "Overview"
   label_project_tool: "Tool"
   label_project_issues: "Issues"
+  label_project_issue: "Created the Issue:"
+  label_project_issue_update: "Upadated the Issue:"
   label_project_newother: "See other comments"
   label_project_newshare: "has shared"
   label_project_newadd: "added"
@@ -1469,6 +1471,7 @@ en:
   label_borad_course: Course-borad
 
   label_project_notice: release the notice
+  label_project_notice_reply: reply the notice
 
   label_forum_new: New forum
   label_memo_new_from_forum: Release memo
@@ -1524,7 +1527,7 @@ en:
   label_recently_updated_courseware: Recently updated the courseware
   label_no_courses: You do not participate in any course, please search the curriculum, course, or create a course!
   label_commit_failed: commit failed
-  #api end
-  error_upload_avatar_to_large: "too big (%{max_size})"
-  not_valid_image_file: not a valid image file
-
+  #api end
+  error_upload_avatar_to_large: "too big (%{max_size})"
+  not_valid_image_file: not a valid image file
+
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index b327b1d5f..a37c3882a 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -783,8 +783,11 @@ zh:
   label_project_newother: "查看其他评论"
   label_project_newshare: "分享了"
   label_project_notice: "发布了通知："
+  label_project_notice_reply: "回复了通知："
   label_project_mail_notice: "发布了新闻："
-  label_project_issue: "发布了问题:"
+  lable_project_mail_notice_reply: "回复了新闻："
+  label_project_issue: "发布了问题："
+  label_project_issue_update: "更新了问题："
   label_project_newadd: "添加了"
   label_project_unadd: "暂无项目，赶快去创建吧！"
   label_project_un: "该用户暂未参与任何项目！"
@@ -1845,6 +1848,7 @@ zh:
   label_attendingcontestwork_adaptive_system: 系统支持
   label_attendingcontestwork_download: 作品下载
   label_course_attendingcontestwork_download: 课件下载
+  label_course_mail_files: 课程资源
   label_attendingcontestwork_developers: 开发人员
   label_attendingcontestwork_average_scores: 平均评分
   label_attendingcontestwork_release_time: 发布时间