Skip to content

FIX: Set a stripped post's locale to site default locale #212

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 14, 2025
Merged

FIX: Set a stripped post's locale to site default locale #212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion app/services/discourse_translator/base.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,9 @@ def self.get_detected_locale(translatable)
end

def self.save_detected_locale(translatable)
detected_locale = yield
# sometimes we may have a user post that is just an emoji
# in that case, we will just indicate the post is in the default locale
detected_locale = yield.presence || SiteSetting.default_locale
translatable.set_detected_locale(detected_locale)

detected_locale
Expand Down
8 changes: 8 additions & 0 deletions spec/services/base_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,14 @@ class EmptyTranslator < DiscourseTranslator::Base
expect(TestTranslator.detect(post)).to eq("en")
end

it "saves the site default locale when detection is empty" do
SiteSetting.default_locale = "ja"

TestTranslator.save_detected_locale(post) { "" }

expect(post.detected_locale).to eq("ja")
end

it "performs detection if no cached result" do
TestTranslator.expects(:detect!).with(post).returns("es")

Expand Down
Loading