diff --git a/app/controllers/follows_controller.rb b/app/controllers/follows_controller.rb index 4331a52eb..08753024f 100644 --- a/app/controllers/follows_controller.rb +++ b/app/controllers/follows_controller.rb @@ -4,14 +4,14 @@ class FollowsController < ApplicationController def create @follow = Follow.create(user: current_user, followable: find_followable) - flash.now[:notice] = t("shared.followable.#{followable_translation_key(@follow.followable)}.create.notice_html") + flash.now[:notice] = t("shared.followable.#{followable_translation_key(@follow.followable)}.create.notice") render :refresh_follow_button end def destroy @follow = Follow.find(params[:id]) @follow.destroy - flash.now[:notice] = t("shared.followable.#{followable_translation_key(@follow.followable)}.destroy.notice_html") + flash.now[:notice] = t("shared.followable.#{followable_translation_key(@follow.followable)}.destroy.notice") render :refresh_follow_button end diff --git a/app/models/budget/investment.rb b/app/models/budget/investment.rb index 5456636d6..5b73520fa 100644 --- a/app/models/budget/investment.rb +++ b/app/models/budget/investment.rb @@ -267,12 +267,12 @@ class Budget end def reason_for_not_being_ballotable_by(user, ballot) - return permission_problem(user) if permission_problem?(user) - return :not_selected unless selected? - return :no_ballots_allowed unless budget.balloting? - return :different_heading_assigned_html unless ballot.valid_heading?(heading) - return :not_enough_money_html if ballot.present? && !enough_money?(ballot) - return :casted_offline if ballot.casted_offline? + return permission_problem(user) if permission_problem?(user) + return :not_selected unless selected? + return :no_ballots_allowed unless budget.balloting? + return :different_heading_assigned unless ballot.valid_heading?(heading) + return :not_enough_money if ballot.present? && !enough_money?(ballot) + return :casted_offline if ballot.casted_offline? end def permission_problem(user) diff --git a/app/views/mailer/budget_investment_created.html.erb b/app/views/mailer/budget_investment_created.html.erb index 2ba7ef5c1..c7a866112 100644 --- a/app/views/mailer/budget_investment_created.html.erb +++ b/app/views/mailer/budget_investment_created.html.erb @@ -16,7 +16,7 @@

- <%= sanitize(t("mailers.budget_investment_created.follow_html", + <%= sanitize(t("mailers.budget_investment_created.follow", link: link_to(t("mailers.budget_investment_created.follow_link"), budgets_url))) %>

diff --git a/app/views/management/document_verifications/invalid_document.html.erb b/app/views/management/document_verifications/invalid_document.html.erb index 2f7101ca0..936e946c6 100644 --- a/app/views/management/document_verifications/invalid_document.html.erb +++ b/app/views/management/document_verifications/invalid_document.html.erb @@ -11,6 +11,6 @@ permissions: [:debates, :create_proposals] %>

- <%= sanitize(t("management.document_verifications.has_no_account_html", + <%= sanitize(t("management.document_verifications.has_no_account", link: link_to(t("management.document_verifications.link"), root_path, target: "_blank"))) %>

diff --git a/app/views/pages/help/_debates.html.erb b/app/views/pages/help/_debates.html.erb index bc6a3d6d4..c90a58038 100644 --- a/app/views/pages/help/_debates.html.erb +++ b/app/views/pages/help/_debates.html.erb @@ -11,7 +11,7 @@