diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2018-06-17 18:57:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-17 18:57:31 +0200 |
| commit | a58ec29631f74259364dc71b408a8d66df657149 (patch) | |
| tree | edc8613a80d7e762d96f2ea1a25273276618aa32 /app/controllers | |
| parent | bb21c6414db64739637b4ea81526efe8e539cce0 (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/controllers')
| -rw-r--r-- | app/controllers/api/v1/accounts/credentials_controller.rb | 1 | ||||
| -rw-r--r-- | app/controllers/settings/preferences_controller.rb | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/app/controllers/api/v1/accounts/credentials_controller.rb b/app/controllers/api/v1/accounts/credentials_controller.rb index 259d07be8..2d0737ee4 100644 --- a/app/controllers/api/v1/accounts/credentials_controller.rb +++ b/app/controllers/api/v1/accounts/credentials_controller.rb @@ -32,6 +32,7 @@ class Api::V1::Accounts::CredentialsController < Api::BaseController { 'setting_default_privacy' => source_params.fetch(:privacy, @account.user.setting_default_privacy), 'setting_default_sensitive' => source_params.fetch(:sensitive, @account.user.setting_default_sensitive), + 'setting_default_language' => source_params.fetch(:language, @account.user.setting_default_language), } end end diff --git a/app/controllers/settings/preferences_controller.rb b/app/controllers/settings/preferences_controller.rb index 851e62d1b..e2cb13167 100644 --- a/app/controllers/settings/preferences_controller.rb +++ b/app/controllers/settings/preferences_controller.rb @@ -35,6 +35,7 @@ class Settings::PreferencesController < ApplicationController params.require(:user).permit( :setting_default_privacy, :setting_default_sensitive, + :setting_default_language, :setting_unfollow_modal, :setting_boost_modal, :setting_delete_modal, |