about summary refs log tree commit diff
path: root/app/lib/user_settings_decorator.rb
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2018-06-17 18:57:31 +0200
committerGitHub <noreply@github.com>2018-06-17 18:57:31 +0200
commita58ec29631f74259364dc71b408a8d66df657149 (patch)
treeedc8613a80d7e762d96f2ea1a25273276618aa32 /app/lib/user_settings_decorator.rb
parentbb21c6414db64739637b4ea81526efe8e539cce0 (diff)
Allow selecting default posting language instead of auto-detect (#7828)
* Allow selecting default posting language instead of auto-detect

* Enable default language setting in credentials API

* Fix form saving
Diffstat (limited to 'app/lib/user_settings_decorator.rb')
-rw-r--r--app/lib/user_settings_decorator.rb5
1 files changed, 5 insertions, 0 deletions
diff --git a/app/lib/user_settings_decorator.rb b/app/lib/user_settings_decorator.rb
index a82f8974b..833959397 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['delete_modal']            = delete_modal_preference if change?('setting_delete_modal')
@@ -87,6 +88,10 @@ class UserSettingsDecorator
     settings['setting_theme']
   end
 
+  def default_language_preference
+    settings['setting_default_language']
+  end
+
   def boolean_cast_setting(key)
     ActiveModel::Type::Boolean.new.cast(settings[key])
   end