Merge branch 'master' into moderation

[rails.git] / app / views / notifier / changeset_comment_notification.html.erb

diff --git a/app/views/notifier/changeset_comment_notification.html.erb b/app/views/notifier/changeset_comment_notification.html.erb
index c2b552ed5e85367ef2e972858420c1908600451d..80f9d8aa11b35a6e438f0b640bfb08bb8aec86df 100644 (file)
--- a/app/views/notifier/changeset_comment_notification.html.erb
+++ b/app/views/notifier/changeset_comment_notification.html.erb
@@ -1,3 +1,6 @@
+<p>
+  <%= t 'notifier.changeset_comment_notification.hi', :to_user => @to_user %>
+</p>

 <p>
   <% if @owner %>
     <%= raw t "notifier.changeset_comment_notification.commented.your_changeset", :commenter => link_to_user(@commenter), :time => @time %>
 <p>
   <% if @owner %>
     <%= raw t "notifier.changeset_comment_notification.commented.your_changeset", :commenter => link_to_user(@commenter), :time => @time %>


@@ -16,11 +19,11 @@
 <% end %>
 
 <p>
 <% end %>
 
 <p>

-  <%= raw t 'notifier.changeset_comment_notification.details', :url => link_to(@changeset_url, @changeset_url, :style => "white-space: nowrap") %>
+  <%= raw t 'notifier.changeset_comment_notification.details', :url => link_to(@changeset_url, @changeset_url) %>

 </p>
 
 <% content_for :footer do %>
   <p>
 </p>
 
 <% content_for :footer do %>
   <p>

-    <%= raw t 'notifier.changeset_comment_notification.unsubscribe', :url => link_to(@changeset_url, @changeset_url, :style => "color: #222; white-space: nowrap") %>
+    <%= raw t 'notifier.changeset_comment_notification.unsubscribe', :url => link_to(@changeset_url, @changeset_url, :style => "color: #222") %>

   </p>
 <% end %>
   </p>
 <% end %>