diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb index d185aa7f1..e7aeb5a21 100644 --- a/app/helpers/users_helper.rb +++ b/app/helpers/users_helper.rb @@ -16,9 +16,8 @@ module UsersHelper if commentable.nil? deleted_commentable_text(comment) elsif commentable.hidden? - "".html_safe + - commentable.title + - "".html_safe + content_tag(:del, commentable.title) + ' ' + + content_tag(:span, '(' + deleted_commentable_text(comment) + ')', class: 'small') 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 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 "#{comment.commentable.title}" + expect(comment_commentable_title(comment)).to eq '' + comment.commentable.title + ' (This debate has been deleted)' 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 "#{comment.commentable.title}" + expect(comment_commentable_title(comment)).to eq '' + comment.commentable.title + ' (This proposal has been deleted)' 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 "#{comment.commentable.title}" + expect(comment_commentable_title(comment)).to eq '' + comment.commentable.title + ' (This investment has been deleted)' 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 "#{comment.commentable.title}" + expect(comment_commentable_title(comment)).to eq '' + comment.commentable.title + ' (This debate has been deleted)' end end