Use _html suffix to avoid using raw when displaying translated strings

[rails.git] / app / controllers / users_controller.rb

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index a3c21cd3d7ac7aefc5414ad952cbb0262d27ceff..a61a10d94f5c098606a3dffd7d59e5854fc61a88 100644 (file)
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -376,7 +376,7 @@ class UsersController < ApplicationController
     @user = User.find_by(:display_name => params[:display_name])
 
     if @user &&
     @user = User.find_by(:display_name => params[:display_name])
 
     if @user &&

-       (@user.visible? || (current_user&.administrator?))
+       (@user.visible? || current_user&.administrator?)

       @title = @user.display_name
     else
       render_unknown_user params[:display_name]
       @title = @user.display_name
     else
       render_unknown_user params[:display_name]


@@ -520,11 +520,11 @@ class UsersController < ApplicationController
 
       if user
         case user.status
 
       if user
         case user.status

-        when "pending" then
+        when "pending"

           unconfirmed_login(user)
           unconfirmed_login(user)

-        when "active", "confirmed" then
+        when "active", "confirmed"

           successful_login(user, request.env["omniauth.params"]["referer"])
           successful_login(user, request.env["omniauth.params"]["referer"])

-        when "suspended" then
+        when "suspended"

           failed_login t("users.login.account is suspended", :webmaster => "mailto:#{Settings.support_email}").html_safe
         else
           failed_login t("users.login.auth failure")
           failed_login t("users.login.account is suspended", :webmaster => "mailto:#{Settings.support_email}").html_safe
         else
           failed_login t("users.login.auth failure")