diff options
author | Jeong Arm <kjwonmail@gmail.com> | 2018-10-06 02:17:46 +0900 |
---|---|---|
committer | Eugen Rochko <eugen@zeonfederated.com> | 2018-10-05 19:17:46 +0200 |
commit | 144d73730de38da84d605f876157bc9bd45c25b4 (patch) | |
tree | efea67eaa19a8b4e8e53733310f692415da98789 /app | |
parent | 9a42b75f00c137f7e9b2e0904adc273dac871daa (diff) |
Leave unknown language as nil if account is remote (#8861)
* Force use language detector if account is remote * Set unknown remote toot's language as nil
Diffstat (limited to 'app')
-rw-r--r-- | app/lib/language_detector.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/lib/language_detector.rb b/app/lib/language_detector.rb index 688d21fd8..58c8e2069 100644 --- a/app/lib/language_detector.rb +++ b/app/lib/language_detector.rb @@ -12,6 +12,7 @@ class LanguageDetector def detect(text, account) input_text = prepare_text(text) return if input_text.blank? + detect_language_code(input_text) || default_locale(account) end @@ -33,6 +34,7 @@ class LanguageDetector def detect_language_code(text) return if unreliable_input?(text) + result = @identifier.find_language(text) iso6391(result.language.to_s).to_sym if result.reliable? end @@ -75,6 +77,6 @@ class LanguageDetector end def default_locale(account) - account.user_locale&.to_sym || I18n.default_locale + return account.user_locale&.to_sym || I18n.default_locale if account.local? end end |