Merge remote-tracking branch 'upstream/pull/1973'

[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 19ca33d85e2041b5b9546c98d98e3dfe2ecde3f5..04bafb0d4e587baeb6a7fa82a5eb14bb2b67ae04 100644 (file)
--- a/app/views/notifier/changeset_comment_notification.html.erb
+++ b/app/views/notifier/changeset_comment_notification.html.erb
@@ -1,13 +1,16 @@
+<p>
+  <%= t '.hi', :to_user => @to_user %>
+</p>

 <p>
   <% if @owner %>
 <p>
   <% if @owner %>

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

   <% else %>
   <% else %>

-    <%= raw t "notifier.changeset_comment_notification.commented.commented_changeset", :commenter => link_to_user(@commenter), :time => @time, :changeset_author => @changeset_author %>
+    <%= raw t ".commented.commented_changeset", :commenter => link_to_user(@commenter), :time => @time, :changeset_author => @changeset_author %>

   <% end %>
   <% if @changeset_comment %>
   <% end %>
   <% if @changeset_comment %>

-    <%= raw t "notifier.changeset_comment_notification.commented.partial_changeset_with_comment", :changeset_comment => content_tag("em", @changeset_comment) %>
+    <%= raw t ".commented.partial_changeset_with_comment", :changeset_comment => content_tag("em", @changeset_comment) %>

   <% else %>
   <% else %>

-    <%= t "notifier.changeset_comment_notification.commented.partial_changeset_without_comment" %>
+    <%= t ".commented.partial_changeset_without_comment" %>

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


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

-  <%= raw t 'notifier.changeset_comment_notification.details', :url => link_to(@changeset_url, @changeset_url) %>
+  <%= raw t '.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") %>
+    <%= raw t '.unsubscribe', :url => link_to(@changeset_url, @changeset_url, :style => "color: #222") %>

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