From 33e9a3e326def600d594c81ee0824a2bd20d4ef7 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Wed, 4 Mar 2015 10:02:40 +0800
Subject: [PATCH] =?UTF-8?q?#1958=20=E5=85=B3=E6=B3=A8=E6=9C=89=E7=94=A8?=
 =?UTF-8?q?=E6=88=B70=E4=B8=AA=E5=90=8E=E8=BE=B9=E5=8F=96=E6=B6=88?=
 =?UTF-8?q?=E5=86=92=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/user_watchlist.html.erb | 100 ++++++++++++++----------
 config/locales/zh.yml                   |  12 +--
 2 files changed, 64 insertions(+), 48 deletions(-)

diff --git a/app/views/users/user_watchlist.html.erb b/app/views/users/user_watchlist.html.erb
index e58e35d27..b6e889b91 100644
--- a/app/views/users/user_watchlist.html.erb
+++ b/app/views/users/user_watchlist.html.erb
@@ -1,47 +1,63 @@
 <h3><%= l(:label_user_watcher)%></h3>
 <div class="inf_user_image">
 	<% for user in User.watched_by(@user.id) %>
-	<ul class="list_watch"><li>
-<table width="660px" border="0" align="center">
-  <tr>
- <td colspan="2" valign="top" width="50" ><%= link_to image_tag(url_to_avatar(user), :class => "avatar"), user_path(user), :title => "#{user.name}" %></td>
-     <td><table width="580px" border="0">
-      <tr>  <!-- modified by bai 增加了关注人的名字全称-->
-        <td colspan="2" valign="top"><strong><%= content_tag "div", link_to(user.name,user_path(user)), :class => "project_avatar_name" %></strong>
-        </td>
-        </tr>
-      <tr>  <!-- modified by bai 区别了“关注”里个人参与的项目与课程-->
-        <td colspan="2" width="580px" ><p class="font_description">
-			<%# unless user.memberships.empty? %>
-			<% cond = Project.visible_condition(User.current) + " AND projects.project_type <> 1" %>
-			<% memberships = user.memberships.all(:conditions => cond) %>
-			<%= l(:label_x_contribute_to, :count => memberships.count) %>
-			<% for member in memberships %>
-			<%= link_to_project(member.project) %><%= (user.memberships.last == member) ? '' : '，' %>
-			<% end %>
-			<%# end %>
-			</p>
-			<p class="font_description">
-			<%# unless user.memberships.empty? %>
-              <% user_courses = user_courses_list(user) %>
-              <%= l(:label_x_course_contribute_to, :count => user_courses.count) %>
-              <% for course in user_courses %>
-                  <%# if course.name != nil %>
-                  <%= link_to course.name,{:controller => 'courses',:action => 'show',id:course.id, host:  Setting.course_domain} %><%= (user_courses.last == course) ? '' : '，' %>
-                  <%# end %>
-              <% end %>
-			<%# end %>
-			</p>
-		</td>
-        </tr>
-        <!-- end -->
-        
-      <tr>        
-        <td width="200" align="right" class="font_lighter"><%= l(:label_user_joinin) %><%= format_date(user.created_on) %>
-        </td>
-      </tr>
-    </table></td>
-  </tr>
-</table></li></ul>
+	<ul class="list_watch">
+      <li>
+        <table width="660px" border="0" align="center">
+          <tr>
+             <td colspan="2" valign="top" width="50" >
+               <%= link_to image_tag(url_to_avatar(user), :class => "avatar"), user_path(user), :title => "#{user.name}" %>
+             </td>
+             <td>
+               <table width="580px" border="0">
+                <tr>  <!-- modified by bai 增加了关注人的名字全称-->
+                    <td colspan="2" valign="top">
+                      <strong>
+                        <%= content_tag "div", link_to(user.name,user_path(user)), :class => "project_avatar_name" %>
+                      </strong>
+                    </td>
+                </tr>
+                <tr>  <!-- modified by bai 区别了“关注”里个人参与的项目与课程-->
+                    <td colspan="2" width="580px" >
+                      <p class="font_description">
+                        <%# unless user.memberships.empty? %>
+                        <% cond = Project.visible_condition(User.current) + " AND projects.project_type <> 1" %>
+                        <% memberships = user.memberships.all(:conditions => cond) %>
+                        <%= l(:label_x_contribute_to, :count => memberships.count) %>
+                        <%= "：" unless memberships.empty? %>
+                        <% for member in memberships %>
+                            <%= link_to_project(member.project) %>
+                            <%= (user.memberships.last == member) ? '' : '，' %>
+                        <% end %>
+                        <%# end %>
+                      </p>
+                      <p class="font_description">
+                        <%# unless user.memberships.empty? %>
+                          <% user_courses = user_courses_list(user) %>
+                          <%= l(:label_x_course_contribute_to, :count => user_courses.count) %>
+                          <%= "：" unless user_courses.empty? %>
+                          <% for course in user_courses %>
+                              <%# if course.name != nil %>
+                              <%= link_to course.name,{:controller => 'courses',:action => 'show',id:course.id, host:  Setting.course_domain} %><%= (user_courses.last == course) ? '' : '，' %>
+                              <%# end %>
+                          <% end %>
+                        <%# end %>
+                      </p>
+                    </td>
+                </tr>
+                <!-- end -->
+
+                <tr>
+                    <td width="200" align="right" class="font_lighter">
+                      <%= l(:label_user_joinin) %>
+                      <%= format_date(user.created_on) %>
+                    </td>
+                </tr>
+              </table>
+            </td>
+          </tr>
+        </table>
+    </li>
+    </ul>
 <% end %>
 </div>
\ No newline at end of file
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 9ef20756f..aa153cda6 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -1420,9 +1420,9 @@ zh:
   label_contribute_to: 参与了 %{project_count} 个项目：
   #modify by men
   label_x_contribute_to:
-    zero: 参与了 %{count} 个项目：
-    one: 参与了 %{count} 个项目：
-    other: 参与了 %{count} 个项目：
+    zero: 参与了 %{count} 个项目
+    one: 参与了 %{count} 个项目
+    other: 参与了 %{count} 个项目
   #end
   label_total_commit: 共%{total_commit}次提交
   label_question_number: 第%{question_number}题：
@@ -1809,9 +1809,9 @@ zh:
 
   label_course_contribute_to: 参与了 %{project_count} 个项目：
   label_x_course_contribute_to:
-    zero: "参与了 %{count} 个课程："
-    one: "参与了 %{count} 个课程："
-    other: "参与了 %{count} 个课程："
+    zero: "参与了 %{count} 个课程"
+    one: "参与了 %{count} 个课程"
+    other: "参与了 %{count} 个课程"
 
   label_join_contest: 加入竞赛
   label_exit_contest: 退出竞赛