diff options
author | ThibG <thib@sitedethib.com> | 2018-06-22 00:10:43 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-06-22 00:10:43 +0200 |
commit | 03cfe366fd0146cb4c3ede4dcdeeb2228a513e7d (patch) | |
tree | 4ea4874b420a859b706b1187440e2ed103800396 /app/lib | |
parent | f0161702d857a2f91d2e51469e8480253ffcd86e (diff) | |
parent | 0c3a337e045dbd4b7be6ae6c3f07969b42f08857 (diff) |
Merge pull request #550 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/lib')
-rw-r--r-- | app/lib/user_settings_decorator.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/app/lib/user_settings_decorator.rb b/app/lib/user_settings_decorator.rb index f8bacb036..4bedfd680 100644 --- a/app/lib/user_settings_decorator.rb +++ b/app/lib/user_settings_decorator.rb @@ -19,6 +19,7 @@ class UserSettingsDecorator user.settings['interactions'] = merged_interactions if change?('interactions') user.settings['default_privacy'] = default_privacy_preference if change?('setting_default_privacy') user.settings['default_sensitive'] = default_sensitive_preference if change?('setting_default_sensitive') + user.settings['default_language'] = default_language_preference if change?('setting_default_language') user.settings['unfollow_modal'] = unfollow_modal_preference if change?('setting_unfollow_modal') user.settings['boost_modal'] = boost_modal_preference if change?('setting_boost_modal') user.settings['favourite_modal'] = favourite_modal_preference if change?('setting_favourite_modal') @@ -97,6 +98,10 @@ class UserSettingsDecorator boolean_cast_setting 'setting_hide_network' end + def default_language_preference + settings['setting_default_language'] + end + def boolean_cast_setting(key) ActiveModel::Type::Boolean.new.cast(settings[key]) end |