mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-04 20:45:13 +00:00
ab5f450700
Conflicts: app/models/user.rb Resolved by adding :default_language to user settings fields
50 lines
1.2 KiB
Ruby
50 lines
1.2 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
class Settings::PreferencesController < Settings::BaseController
|
|
def show; end
|
|
|
|
def update
|
|
user_settings.update(user_settings_params.to_h)
|
|
|
|
if current_user.update(user_params)
|
|
I18n.locale = current_user.locale
|
|
redirect_to settings_preferences_path, notice: I18n.t('generic.changes_saved_msg')
|
|
else
|
|
render :show
|
|
end
|
|
end
|
|
|
|
private
|
|
|
|
def user_settings
|
|
UserSettingsDecorator.new(current_user)
|
|
end
|
|
|
|
def user_params
|
|
params.require(:user).permit(
|
|
:locale,
|
|
chosen_languages: []
|
|
)
|
|
end
|
|
|
|
def user_settings_params
|
|
params.require(:user).permit(
|
|
:setting_default_privacy,
|
|
:setting_default_sensitive,
|
|
:setting_default_language,
|
|
:setting_unfollow_modal,
|
|
:setting_boost_modal,
|
|
:setting_favourite_modal,
|
|
:setting_delete_modal,
|
|
:setting_auto_play_gif,
|
|
:setting_display_sensitive_media,
|
|
:setting_reduce_motion,
|
|
:setting_system_font_ui,
|
|
:setting_noindex,
|
|
:setting_hide_network,
|
|
notification_emails: %i(follow follow_request reblog favourite mention digest),
|
|
interactions: %i(must_be_follower must_be_following)
|
|
)
|
|
end
|
|
end
|