diff --git a/app/views/account/show.html.erb b/app/views/account/show.html.erb index a0a782f2b..871e2de0d 100644 --- a/app/views/account/show.html.erb +++ b/app/views/account/show.html.erb @@ -33,7 +33,7 @@
<%= f.label :public_activity do %> - <%= f.check_box :public_activity, title: t('account.show.public_activity_label'), label: false %> + <%= f.check_box :public_activity, title: t("account.show.public_activity_label"), label: false %> <%= t("account.show.public_activity_label") %> @@ -42,7 +42,7 @@
<%= f.label :public_interests do %> - <%= f.check_box :public_interests, title: t('account.show.public_interests_label'), label: false %> + <%= f.check_box :public_interests, title: t("account.show.public_interests_label"), label: false %> <%= t("account.show.public_interests_label") %> @@ -55,7 +55,7 @@
<%= f.label :email_on_comment do %> - <%= f.check_box :email_on_comment, title: t('account.show.email_on_comment_label'), label: false %> + <%= f.check_box :email_on_comment, title: t("account.show.email_on_comment_label"), label: false %> <%= t("account.show.email_on_comment_label") %> @@ -64,7 +64,7 @@
<%= f.label :email_on_comment_reply do %> - <%= f.check_box :email_on_comment_reply, title: t('account.show.email_on_comment_reply_label'), label: false %> + <%= f.check_box :email_on_comment_reply, title: t("account.show.email_on_comment_reply_label"), label: false %> <%= t("account.show.email_on_comment_reply_label") %> @@ -73,7 +73,7 @@
<%= f.label :email_newsletter_subscribed do %> - <%= f.check_box :newsletter, title: t('account.show.subscription_to_website_newsletter_label'), label: false %> + <%= f.check_box :newsletter, title: t("account.show.subscription_to_website_newsletter_label"), label: false %> <%= t("account.show.subscription_to_website_newsletter_label") %> @@ -82,7 +82,7 @@
<%= f.label :email_digest do %> - <%= f.check_box :email_digest, title: t('account.show.email_digest_label'), label: false %> + <%= f.check_box :email_digest, title: t("account.show.email_digest_label"), label: false %> <%= t("account.show.email_digest_label") %> @@ -91,7 +91,7 @@
<%= f.label :email_on_direct_message do %> - <%= f.check_box :email_on_direct_message, title: t('account.show.email_on_direct_message_label'), label: false %> + <%= f.check_box :email_on_direct_message, title: t("account.show.email_on_direct_message_label"), label: false %> <%= t("account.show.email_on_direct_message_label") %> @@ -103,7 +103,7 @@
<%= f.label :official_position_badge do %> <%= f.check_box :official_position_badge, - title: t('account.show.official_position_badge_label'), + title: t("account.show.official_position_badge_label"), label: false %> <%= t("account.show.official_position_badge_label") %> diff --git a/app/views/comments/_actions.html.erb b/app/views/comments/_actions.html.erb index 80302a70a..235344c75 100644 --- a/app/views/comments/_actions.html.erb +++ b/app/views/comments/_actions.html.erb @@ -1,17 +1,17 @@ - <%= render 'comments/flag_actions', comment: comment %> + <%= render "comments/flag_actions", comment: comment %> - + <% if can? :hide, comment %>  •  <%= link_to t("admin.actions.hide").capitalize, hide_moderation_comment_path(comment), - method: :put, remote: true, data: { confirm: t('admin.actions.confirm') } %> + method: :put, remote: true, data: { confirm: t("admin.actions.confirm") } %> <% end %> <% if can? :hide, comment.user %>  •  <%= link_to t("admin.actions.hide_author").capitalize, hide_moderation_user_path(comment.user_id), - method: :put, data: { confirm: t('admin.actions.confirm') } %> + method: :put, data: { confirm: t("admin.actions.confirm") } %> <% end %> diff --git a/app/views/comments/_comment.html.erb b/app/views/comments/_comment.html.erb index e60570b8b..886a39aaa 100644 --- a/app/views/comments/_comment.html.erb +++ b/app/views/comments/_comment.html.erb @@ -73,12 +73,12 @@
<% if allow_votes %>
- <%= render 'comments/votes', comment: comment %> + <%= render "comments/votes", comment: comment %>
<% end %> <% if comment.children.size > 0 %> - <%= link_to "", class: "js-toggle-children relative", data: {'id': "#{dom_id(comment)}"} do %> + <%= link_to "", class: "js-toggle-children relative", data: {"id": "#{dom_id(comment)}"} do %> <%= t("shared.hide") %> <%= t("comments.comment.responses", count: comment.children.size) %> @@ -90,14 +90,14 @@ <% if user_signed_in? && !comments_closed_for_commentable?(comment.commentable) && !require_verified_resident_for_commentable?(comment.commentable, current_user) %>  |  <%= link_to(comment_link_text(comment), "", - class: "js-add-comment-link", data: {'id': dom_id(comment)}) %> + class: "js-add-comment-link", data: {"id": dom_id(comment)}) %> <% if allow_actions %> - <%= render 'comments/actions', { comment: comment } %> + <%= render "comments/actions", { comment: comment } %> <% end %> <% if allow_comments %> - <%= render 'comments/form', {commentable: comment.commentable, + <%= render "comments/form", {commentable: comment.commentable, parent_id: comment.id, toggeable: true, valuation: valuation } %> @@ -111,7 +111,7 @@
    <% child_comments_of(comment).each do |child| %>
  • - <%= render 'comments/comment', { comment: child, + <%= render "comments/comment", { comment: child, valuation: valuation, allow_votes: allow_votes, allow_actions: allow_actions, diff --git a/app/views/comments/_comment_tree.html.erb b/app/views/comments/_comment_tree.html.erb index e9ea09a9b..c75bcf2a7 100644 --- a/app/views/comments/_comment_tree.html.erb +++ b/app/views/comments/_comment_tree.html.erb @@ -12,7 +12,7 @@ <% end %> - <%= render 'shared/wide_order_selector', i18n_namespace: "comments" %> + <%= render "shared/wide_order_selector", i18n_namespace: "comments" %> <% if user_signed_in? %> <% if comments_closed_for_commentable?(commentable) %> @@ -26,7 +26,7 @@ <%= t("comments.verified_only", verify_account: link_to(t("comments.verify_account"), verification_path )).html_safe %>
<% elsif allow_comments %> - <%= render 'comments/form', { commentable: commentable, + <%= render "comments/form", { commentable: commentable, parent_id: nil, toggeable: false, valuation: valuation } %> @@ -41,7 +41,7 @@ <% end %> <% comment_tree.root_comments.each do |comment| %> - <%= render 'comments/comment', { comment: comment, + <%= render "comments/comment", { comment: comment, comment_flags: comment_flags, valuation: valuation, allow_votes: !valuation, diff --git a/app/views/comments/_commentable_tree.html.erb b/app/views/comments/_commentable_tree.html.erb index 7c6a9366f..f6631ea4c 100644 --- a/app/views/comments/_commentable_tree.html.erb +++ b/app/views/comments/_commentable_tree.html.erb @@ -9,10 +9,10 @@ (<%= @investment.comments_count %>) - <%= render 'shared/wide_order_selector', i18n_namespace: "comments" %> + <%= render "shared/wide_order_selector", i18n_namespace: "comments" %> <% if user_signed_in? && allow_comments %> - <%= render 'comments/form', { commentable: @investment, + <%= render "comments/form", { commentable: @investment, parent_id: nil, toggeable: false, valuation: valuation } %> @@ -27,7 +27,7 @@ <% end %> <% @comment_tree.root_comments.each do |comment| %> - <%= render 'comments/comment', { comment: comment, + <%= render "comments/comment", { comment: comment, valuation: valuation, allow_comments: allow_comments } %> <% end %> diff --git a/app/views/comments/_form.html.erb b/app/views/comments/_form.html.erb index d56556100..e862c8688 100644 --- a/app/views/comments/_form.html.erb +++ b/app/views/comments/_form.html.erb @@ -14,13 +14,13 @@ <% if can? :comment_as_moderator, commentable %>
- <%= f.check_box :as_moderator, title: t('comments.form.comment_as_moderator'), id: "comment-as-moderator-#{css_id}", label: false %> + <%= f.check_box :as_moderator, title: t("comments.form.comment_as_moderator"), id: "comment-as-moderator-#{css_id}", label: false %> <%= label_tag "comment-as-moderator-#{css_id}", t("comments.form.comment_as_moderator"), class: "checkbox" %>
<% end %> <% if can? :comment_as_administrator, commentable %>
- <%= f.check_box :as_administrator, title: t('comments.form.comment_as_admin'), id: "comment-as-administrator-#{css_id}",label: false %> + <%= f.check_box :as_administrator, title: t("comments.form.comment_as_admin"), id: "comment-as-administrator-#{css_id}",label: false %> <%= label_tag "comment-as-administrator-#{css_id}", t("comments.form.comment_as_admin"), class: "checkbox" %>
<% end %> diff --git a/app/views/comments/_votes.html.erb b/app/views/comments/_votes.html.erb index 5b97d2242..2b377ce4e 100644 --- a/app/views/comments/_votes.html.erb +++ b/app/views/comments/_votes.html.erb @@ -1,20 +1,20 @@
<% if user_signed_in? %> - <%= t('comments.comment.votes', count: comment.total_votes) %> + <%= t("comments.comment.votes", count: comment.total_votes) %>  |  <% if can?(:vote, comment) %> - <%= link_to vote_comment_path(comment, value: 'yes'), - method: "post", remote: true, title: t('votes.agree') do %> + <%= link_to vote_comment_path(comment, value: "yes"), + method: "post", remote: true, title: t("votes.agree") do %> - <%= t('votes.agree') %> + <%= t("votes.agree") %> <% end %> <% else %> <%= link_to new_user_session_path do %> - <%= t('votes.agree') %> + <%= t("votes.agree") %> <% end %> <% end %> @@ -23,15 +23,15 @@ <% if can?(:vote, comment) %> - <%= link_to vote_comment_path(comment, value: 'no'), - method: "post", remote: true, title: t('votes.disagree') do %> + <%= link_to vote_comment_path(comment, value: "no"), + method: "post", remote: true, title: t("votes.disagree") do %> - <%= t('votes.disagree') %> + <%= t("votes.disagree") %> <% end %> <% else %> - <%= t('votes.disagree') %> + <%= t("votes.disagree") %> <% end %> <%= comment.total_dislikes %> @@ -40,21 +40,21 @@ <% elsif !user_signed_in? %>
- <%= t('comments.comment.votes', count: comment.total_votes) %> + <%= t("comments.comment.votes", count: comment.total_votes) %>  |  <% if can?(:vote, comment) %> - <%= link_to vote_comment_path(comment, value: 'yes'), - method: "post", remote: true, title: t('votes.agree') do %> + <%= link_to vote_comment_path(comment, value: "yes"), + method: "post", remote: true, title: t("votes.agree") do %> - <%= t('votes.agree') %> + <%= t("votes.agree") %> <% end %> <% else %> <%= link_to new_user_session_path do %> - <%= t('votes.agree') %> + <%= t("votes.agree") %> <% end %> <% end %> @@ -63,16 +63,16 @@ <% if can?(:vote, comment) %> - <%= link_to vote_comment_path(comment, value: 'no'), - method: "post", remote: true, title: t('votes.disagree') do %> + <%= link_to vote_comment_path(comment, value: "no"), + method: "post", remote: true, title: t("votes.disagree") do %> - <%= t('votes.disagree') %> + <%= t("votes.disagree") %> <% end %> <% else %> <%= link_to new_user_session_path do %> - <%= t('votes.disagree') %> + <%= t("votes.disagree") %> <% end %> <% end %> @@ -80,7 +80,7 @@
-