diff --git a/app/controllers/admin/admin_users_controller.rb b/app/controllers/admin/admin_users_controller.rb index 372a9654a..17de2f97d 100644 --- a/app/controllers/admin/admin_users_controller.rb +++ b/app/controllers/admin/admin_users_controller.rb @@ -57,6 +57,7 @@ class Admin::AdminUsersController < AdminController end def admin_user_params - params.require(:admin_user).permit(:username, :password, :password_confirmation, :identity_code, :email, :country_code, { roles: [] }) + params.require(:admin_user).permit(:username, + :password, :password_confirmation, :identity_code, :email, :country_code, { roles: [] }) end end diff --git a/config/initializers/relaxed_i18n.rb b/config/initializers/relaxed_i18n.rb index ca9d0c034..fc9b94983 100644 --- a/config/initializers/relaxed_i18n.rb +++ b/config/initializers/relaxed_i18n.rb @@ -4,7 +4,7 @@ module I18n class << self alias_method :original_localize, :localize - def localize object, options = {} + def localize(object, options = {}) object.present? ? original_localize(object, options) : '' end end