diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-02-08 19:43:59 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-08 19:43:59 +0100 |
| commit | 2fd1db7c9d0fe8c1cca159b9b0818c72e7c318aa (patch) | |
| tree | bc7319ae242a889bb1d05b7afdd365d78a43ac1d /app/services/post_status_service.rb | |
| parent | b1983623aec8e0b066d115736d2151e0c74407fa (diff) | |
| parent | 692963d43beb5e66a86e15d63b5aa3eeca82f0a1 (diff) | |
Merge pull request #1680 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/services/post_status_service.rb')
| -rw-r--r-- | app/services/post_status_service.rb | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/app/services/post_status_service.rb b/app/services/post_status_service.rb index 9d26e0f5b..c5061dd63 100644 --- a/app/services/post_status_service.rb +++ b/app/services/post_status_service.rb @@ -2,6 +2,7 @@ class PostStatusService < BaseService include Redisable + include LanguagesHelper MIN_SCHEDULE_OFFSET = 5.minutes.freeze @@ -118,10 +119,6 @@ class PostStatusService < BaseService raise Mastodon::ValidationError, I18n.t('media_attachments.validations.not_ready') if @media.any?(&:not_processed?) end - def language_from_option(str) - ISO_639.find(str)&.alpha2 - end - def process_mentions_service ProcessMentionsService.new end @@ -174,7 +171,7 @@ class PostStatusService < BaseService sensitive: @sensitive, spoiler_text: @options[:spoiler_text] || '', visibility: @visibility, - language: language_from_option(@options[:language]) || @account.user&.setting_default_language&.presence || LanguageDetector.instance.detect(@text, @account), + language: valid_locale_or_nil(@options[:language].presence || @account.user&.preferred_posting_language || I18n.default_locale), application: @options[:application], content_type: @options[:content_type] || @account.user&.setting_default_content_type, rate_limit: @options[:with_rate_limit], |