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/services | |
| 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/services')
| -rw-r--r-- | app/services/post_status_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/post_status_service.rb b/app/services/post_status_service.rb index a5a21c359..735985725 100644 --- a/app/services/post_status_service.rb +++ b/app/services/post_status_service.rb @@ -30,7 +30,7 @@ class PostStatusService < BaseService sensitive: (options[:sensitive].nil? ? account.user&.setting_default_sensitive : options[:sensitive]) || options[:spoiler_text].present?, spoiler_text: options[:spoiler_text] || '', visibility: options[:visibility] || account.user&.setting_default_privacy, - language: language_from_option(options[:language]) || LanguageDetector.instance.detect(text, account), + language: language_from_option(options[:language]) || account.user&.setting_default_language&.presence || LanguageDetector.instance.detect(text, account), application: options[:application]) end |