sunoru/mastodon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Language detection defaults to nil (#3666)

Browse source 
* Default to nil for statuses.language

* Language detection defaults to nil instead of instance UI default
This commit is contained in:
Matt Jankowski 2017-06-09 12:09:37 -04:00 • committed by Eugen Rochko
parent a3715598cc
commit 022008a2a6
5 changed files with 21 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/lib/language_detector.rb
View file

@ -10,7 +10,7 @@ class LanguageDetector
end
def to_iso_s
detected_language_code || default_locale.to_sym
detected_language_code || default_locale
end
def prepared_text
@ -43,6 +43,6 @@ class LanguageDetector
end
def default_locale
account&.user_locale || I18n.default_locale
account&.user_locale&.to_sym || nil
end
end

2
app/models/status.rb
View file

@ -20,7 +20,7 @@
# reply :boolean default(FALSE)
# favourites_count :integer default(0), not null
# reblogs_count :integer default(0), not null
# language :string default("en"), not null
# language :string
# conversation_id :integer
#