Skip to content

A platform for community discussion. Free, open, simple.

FIX: Ensure saving saves 'show original' user preference (#39135)

Natalie Tay208a0be7d31c
diff --git a/app/assets/stylesheets/common/base/user.scss b/app/assets/stylesheets/common/base/user.scss
index e70fa10cd40..d59776355ff 100644
--- a/app/assets/stylesheets/common/base/user.scss
+++ b/app/assets/stylesheets/common/base/user.scss
@@ -1073,6 +1073,11 @@
.pref-second-factor {
margin-top: 0.5em;
}
+
+ .pref-show-original-content {
+ margin-top: var(--space-4);
+ margin-bottom: var(--space-4);
+ }
}
.user-upcoming-changes-table {
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index b4bdfcc1715..16d766e9e03 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -1721,7 +1721,7 @@ en:
enable_smart_lists: "Enable smart lists when writing in the composer"
enable_defer: "Enable mark topics as unread"
enable_markdown_monospace_font: "Use monospace font in composer's Markdown mode"
- show_original_content: "Always show original content instead of translated content"
+ show_original_content: "Show original content instead of translated content. Can also be toggled within topics."
experimental_sidebar:
enable: "Enable sidebar"
options: "Options"
diff --git a/frontend/discourse/app/models/user.js b/frontend/discourse/app/models/user.js
index 3a3b50ea8ec..0efa28636bb 100644
--- a/frontend/discourse/app/models/user.js
+++ b/frontend/discourse/app/models/user.js
@@ -140,6 +140,7 @@ let userOptionFields = [
"notification_level_when_replying",
"notify_on_linked_posts",
"seen_popups",
+ "show_original_content",
"sidebar_link_to_filtered_list",
"sidebar_show_count_of_new_items",
"skip_new_user_tips",
diff --git a/frontend/discourse/app/templates/preferences/interface.gjs b/frontend/discourse/app/templates/preferences/interface.gjs
index ff8a7386eb8..fcc529112f6 100644
--- a/frontend/discourse/app/templates/preferences/interface.gjs
+++ b/frontend/discourse/app/templates/preferences/interface.gjs
@@ -143,6 +143,14 @@ export default <template>
<label for="locale-selector" class="control-label">{{i18n
"user.locale.title"
}}</label>
+ {{#if @controller.siteSettings.content_localization_enabled}}
+ <PreferenceCheckbox
+ @labelKey="user.show_original_content"
+ @checked={{@controller.model.user_option.show_original_content}}
+ data-setting-name="user-show-original-content"
+ class="pref-show-original-content"
+ />
+ {{/if}}
<div class="controls">
<ComboBox
@id="locale-selector"
@@ -222,14 +230,6 @@ export default <template>
data-setting-name="user-enable-markdown-monospace-font"
class="pref-enable-markdown-monospace-font"
/>
- {{#if @controller.siteSettings.content_localization_enabled}}
- <PreferenceCheckbox
- @labelKey="user.show_original_content"
- @checked={{@controller.model.user_option.show_original_content}}
- data-setting-name="user-show-original-content"
- class="pref-show-original-content"
- />
- {{/if}}
<div
class="controls controls-dropdown pref-page-title"
data-setting-name="user-page-title"
diff --git a/spec/system/content_localization_spec.rb b/spec/system/content_localization_spec.rb
index cd66ad3a7e8..12ba00d8134 100644
--- a/spec/system/content_localization_spec.rb
+++ b/spec/system/content_localization_spec.rb
@@ -115,6 +115,26 @@ describe "Content Localization" do
expect(japanese_user.reload.user_option.show_original_content).to eq(true)
end
+ it "persists 'Show Original' preference from user preferences interface" do
+ sign_in(japanese_user)
+
+ visit("/u/#{japanese_user.username}/preferences/interface")
+ page.find(".pref-show-original-content input[type='checkbox']").click
+ page.find(".save-changes").click
+
+ I18n.with_locale(:ja) { expect(page).to have_content(I18n.t("js.saved")) }
+
+ expect(japanese_user.reload.user_option.show_original_content).to eq(true)
+
+ # preference persists after page reload
+ visit("/u/#{japanese_user.username}/preferences/interface")
+ expect(page).to have_css(".pref-show-original-content input[type='checkbox']:checked")
+
+ # and reflects on topic view
+ visit("/t/#{topic.id}")
+ expect(topic_page.has_topic_title?("Life strategies from The Art of War")).to eq(true)
+ end
+
it "allows users to set their post's locale when posting" do
sign_in(japanese_user)