From b2b15d1fd7bc2c9c5ee4609c641b4fd0dea66960 Mon Sep 17 00:00:00 2001
From: decabeza <alberto@decabeza.es>
Date: Tue, 1 Aug 2017 13:53:29 +0200
Subject: [PATCH 1/3] improves deleted elements on user activity

---
 app/helpers/users_helper.rb   | 7 ++++---
 config/locales/es/general.yml | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb
index d185aa7f1..f5210d846 100644
--- a/app/helpers/users_helper.rb
+++ b/app/helpers/users_helper.rb
@@ -16,9 +16,10 @@ module UsersHelper
     if commentable.nil?
       deleted_commentable_text(comment)
     elsif commentable.hidden?
-      "<abbr title='#{deleted_commentable_text(comment)}'>".html_safe +
-      commentable.title +
-      "</abbr>".html_safe
+      "<del>".html_safe + commentable.title.html_safe + "</del>".html_safe + ' ' +
+      '<span class="small">'.html_safe +
+      '(' + deleted_commentable_text(comment) + ')' +
+      "</span>".html_safe
     else
       link_to(commentable.title, comment)
     end
diff --git a/config/locales/es/general.yml b/config/locales/es/general.yml
index 3f21ed55f..6a3972128 100644
--- a/config/locales/es/general.yml
+++ b/config/locales/es/general.yml
@@ -649,8 +649,8 @@ es:
     show:
       deleted: Eliminado
       deleted_debate: Este debate ha sido eliminado
-      deleted_proposal: Este propuesta ha sido eliminada
-      deleted_budget_investment: Este propuesta de inversión ha sido eliminada
+      deleted_proposal: Esta propuesta ha sido eliminada
+      deleted_budget_investment: Esta propuesta de inversión ha sido eliminada
       filters:
         comments:
           one: 1 Comentario

From a18d86e8a700ca09e4bef6040458b1f8dfb3d337 Mon Sep 17 00:00:00 2001
From: decabeza <alberto@decabeza.es>
Date: Tue, 1 Aug 2017 14:32:25 +0200
Subject: [PATCH 2/3] replaces html to content_tag on users helper

---
 app/helpers/users_helper.rb | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb
index f5210d846..e7aeb5a21 100644
--- a/app/helpers/users_helper.rb
+++ b/app/helpers/users_helper.rb
@@ -16,10 +16,8 @@ module UsersHelper
     if commentable.nil?
       deleted_commentable_text(comment)
     elsif commentable.hidden?
-      "<del>".html_safe + commentable.title.html_safe + "</del>".html_safe + ' ' +
-      '<span class="small">'.html_safe +
-      '(' + deleted_commentable_text(comment) + ')' +
-      "</span>".html_safe
+      content_tag(:del, commentable.title) + ' ' +
+      content_tag(:span, '(' + deleted_commentable_text(comment) + ')', class: 'small')
     else
       link_to(commentable.title, comment)
     end

From b9eb6867d7babc803c0427b58d47c6cd899816a4 Mon Sep 17 00:00:00 2001
From: decabeza <alberto@decabeza.es>
Date: Tue, 1 Aug 2017 16:48:09 +0200
Subject: [PATCH 3/3] updates tags on specs

---
 spec/helpers/users_helper_spec.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/spec/helpers/users_helper_spec.rb b/spec/helpers/users_helper_spec.rb
index dcc92ba59..55ea8445b 100644
--- a/spec/helpers/users_helper_spec.rb
+++ b/spec/helpers/users_helper_spec.rb
@@ -17,7 +17,7 @@ describe UsersHelper do
 
       debate.hide
 
-      expect(comment_commentable_title(comment)).to eq "<abbr title='This debate has been deleted'>#{comment.commentable.title}</abbr>"
+      expect(comment_commentable_title(comment)).to eq '<del>' + comment.commentable.title + '</del> <span class="small">(This debate has been deleted)</span>'
     end
 
     it "should return the appropriate message for deleted proposals" do
@@ -26,7 +26,7 @@ describe UsersHelper do
 
       proposal.hide
 
-      expect(comment_commentable_title(comment)).to eq "<abbr title='This proposal has been deleted'>#{comment.commentable.title}</abbr>"
+      expect(comment_commentable_title(comment)).to eq '<del>' + comment.commentable.title + '</del> <span class="small">(This proposal has been deleted)</span>'
     end
 
     it "should return the appropriate message for deleted budget investment" do
@@ -35,7 +35,7 @@ describe UsersHelper do
 
       investment.hide
 
-      expect(comment_commentable_title(comment)).to eq "<abbr title='This investment has been deleted'>#{comment.commentable.title}</abbr>"
+      expect(comment_commentable_title(comment)).to eq '<del>' + comment.commentable.title + '</del> <span class="small">(This investment has been deleted)</span>'
     end
   end
 
@@ -48,7 +48,7 @@ describe UsersHelper do
     it "should return a hint if the commentable has been deleted" do
       comment = create(:comment)
       comment.commentable.hide
-      expect(comment_commentable_title(comment)).to eq "<abbr title='This debate has been deleted'>#{comment.commentable.title}</abbr>"
+      expect(comment_commentable_title(comment)).to eq '<del>' + comment.commentable.title + '</del> <span class="small">(This debate has been deleted)</span>'
     end
   end