709f39c6ce
There was an edge case where a user could configure a locale and then the application would change the locales to that one would no longer be available. In that case, we were getting a `I18n::InvalidLocale` exception when accessing the subscriptions page. So now, we're defaulting to `I18n.locale`. Note we're using `I18n.locale`instead of `I18n.default_locale` because `set_user_locale` is called inside the `switch_locale` block in `ApplicationController`, which already sets `I18n.locale` based on `I18n.default_locale`.
44 lines
1.1 KiB
Ruby
44 lines
1.1 KiB
Ruby
class SubscriptionsController < ApplicationController
|
|
before_action :set_user
|
|
around_action :set_user_locale
|
|
skip_authorization_check
|
|
|
|
def edit
|
|
end
|
|
|
|
def update
|
|
@user.update!(subscriptions_params)
|
|
redirect_to edit_subscriptions_path(token: @user.subscriptions_token),
|
|
notice: t("flash.actions.save_changes.notice")
|
|
end
|
|
|
|
private
|
|
|
|
def set_user
|
|
@user = if params[:token].present?
|
|
User.find_by!(subscriptions_token: params[:token])
|
|
else
|
|
current_user || raise(CanCan::AccessDenied)
|
|
end
|
|
end
|
|
|
|
def subscriptions_params
|
|
params.require(:user).permit(allowed_params)
|
|
end
|
|
|
|
def allowed_params
|
|
[:email_on_comment, :email_on_comment_reply, :email_on_direct_message, :email_digest, :newsletter]
|
|
end
|
|
|
|
def set_user_locale(&action)
|
|
if params[:locale].blank?
|
|
session[:locale] = find_locale.to_s
|
|
end
|
|
I18n.with_locale(session[:locale], &action)
|
|
end
|
|
|
|
def find_locale
|
|
I18n.available_locales.find { |locale| locale == @user.locale&.to_sym } || I18n.locale
|
|
end
|
|
end
|