File tree Expand file tree Collapse file tree 2 files changed +11
-1
lines changed
app/services/discourse_translator Expand file tree Collapse file tree 2 files changed +11
-1
lines changed Original file line number Diff line number Diff line change @@ -88,7 +88,9 @@ def self.get_detected_locale(translatable)
8888 end
8989
9090 def self . save_detected_locale ( translatable )
91- detected_locale = yield
91+ # sometimes we may have a user post that is just an emoji
92+ # in that case, we will just indicate the post is in the default locale
93+ detected_locale = yield . presence || SiteSetting . default_locale
9294 translatable . set_detected_locale ( detected_locale )
9395
9496 detected_locale
Original file line number Diff line number Diff line change @@ -115,6 +115,14 @@ class EmptyTranslator < DiscourseTranslator::Base
115115 expect ( TestTranslator . detect ( post ) ) . to eq ( "en" )
116116 end
117117
118+ it "saves the site default locale when detection is empty" do
119+ SiteSetting . default_locale = "ja"
120+
121+ TestTranslator . save_detected_locale ( post ) { "" }
122+
123+ expect ( post . detected_locale ) . to eq ( "ja" )
124+ end
125+
118126 it "performs detection if no cached result" do
119127 TestTranslator . expects ( :detect! ) . with ( post ) . returns ( "es" )
120128
You can’t perform that action at this time.
0 commit comments