Skip to content

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

FEATURE: Manage theme translations in Site texts (#44042)

Natalie Tayf7be7d7b8a5d
diff --git a/app/assets/stylesheets/admin/admin_base.scss b/app/assets/stylesheets/admin/admin_base.scss
index 9f23cccd60e..0f458d512e5 100644
--- a/app/assets/stylesheets/admin/admin_base.scss
+++ b/app/assets/stylesheets/admin/admin_base.scss
@@ -250,6 +250,12 @@ $mobile-breakpoint: 700px;
min-width: 0;
}
+ .site-texts__theme {
+ grid-column: 1 / -1;
+ width: min(100%, 20em);
+ min-width: 0;
+ }
+
label {
display: block;
margin-bottom: var(--space-2);
@@ -257,7 +263,8 @@ $mobile-breakpoint: 700px;
font-size: var(--font-down-1);
}
- .locale-search {
+ .locale-search,
+ .theme-search {
width: 100%;
}
@@ -271,7 +278,8 @@ $mobile-breakpoint: 700px;
}
.d-filter-controls__dropdowns {
- display: flex;
+ display: grid;
+ grid-template-columns: minmax(0, 1fr) auto;
gap: var(--space-4);
align-items: start;
padding: var(--space-4);
diff --git a/app/controllers/admin/site_texts_controller.rb b/app/controllers/admin/site_texts_controller.rb
index 7112267a2d7..af7f6e0c815 100644
--- a/app/controllers/admin/site_texts_controller.rb
+++ b/app/controllers/admin/site_texts_controller.rb
@@ -28,18 +28,43 @@ class Admin::SiteTextsController < Admin::AdminController
outdated = params[:outdated] == "true"
untranslated = params[:untranslated] == "true"
only_selected_locale = params[:only_selected_locale] == "true"
- extras = {}
+ extras = { themes: Theme.order(:name).pluck(:id, :name).map { |id, name| { id:, name: } } }
+ theme = Theme.find(params[:theme_id]) if params[:theme_id].present?
query = params[:q] || ""
locale = fetch_locale(params[:locale])
- if query.blank? && !overridden && !outdated && !untranslated
+ if query.blank? && !overridden && !outdated && !untranslated && !theme
extras[:recommended] = true
results = PREFERRED_KEYS.map { |key| record_for(key:, locale:) }
else
results =
- find_translations(query, overridden, outdated, locale, untranslated, only_selected_locale)
+ (
+ if theme
+ []
+ else
+ find_translations(
+ query,
+ overridden,
+ outdated,
+ locale,
+ untranslated,
+ only_selected_locale,
+ )
+ end
+ )
+ results.concat(
+ ThemeTranslationManager.search_site_texts(
+ query,
+ locale:,
+ theme:,
+ overridden:,
+ outdated:,
+ untranslated:,
+ only_selected_locale:,
+ ),
+ )
results.reject! { |r| RESTRICTED_KEYS.include?(r[:id]) }
@@ -72,24 +97,31 @@ class Admin::SiteTextsController < Admin::AdminController
end
overridden = overridden_keys(locale)
- render_serialized(
- results[first..last - 1],
- SiteTextSerializer,
- root: "site_texts",
- rest_serializer: true,
- extras:,
- overridden_keys: overridden,
- )
+ records =
+ (results[first..last - 1] || []).map do |record|
+ if ThemeTranslationManager::SITE_TEXT_ID_PATTERN.match?(record[:id])
+ record
+ else
+ serialize_data(record, SiteTextSerializer, root: false, overridden_keys: overridden)
+ end
+ end
+ render_json_dump({ site_texts: records }, rest_serializer: true, extras:)
end
def show
locale = fetch_locale(params[:locale])
+ if theme_site_text?
+ text = ThemeTranslationManager.find_site_text(params[:id], locale:)
+ raise Discourse::NotFound unless text
+ return render_json_dump({ site_text: text.site_text }, rest_serializer: true)
+ end
site_text = find_site_text(locale)
render_serialized(site_text, SiteTextSerializer, root: "site_text", rest_serializer: true)
end
def update
locale = fetch_locale(params.dig(:site_text, :locale))
+ return update_theme_text(locale) if theme_site_text?
site_text = find_site_text(locale)
value = site_text[:value] = params.dig(:site_text, :value)
@@ -119,6 +151,7 @@ class Admin::SiteTextsController < Admin::AdminController
def revert
locale = fetch_locale(params[:locale])
+ return update_theme_text(locale, revert: true) if theme_site_text?
site_text = find_site_text(locale)
id = site_text[:id]
@@ -175,6 +208,30 @@ class Admin::SiteTextsController < Admin::AdminController
protected
+ def theme_site_text?
+ ThemeTranslationManager::SITE_TEXT_ID_PATTERN.match?(params[:id])
+ end
+
+ def update_theme_text(locale, revert: false)
+ text = ThemeTranslationManager.find_site_text(params[:id], locale:)
+ raise Discourse::NotFound unless text
+
+ old_value = text.value
+ if revert
+ text.revert!
+ else
+ value = params.require(:site_text)[:value]
+ raise Discourse::InvalidParameters.new(:value) unless value.is_a?(String)
+ text.theme.with_lock do
+ text.theme.theme_translation_overrides.reload
+ text.value = value
+ end
+ end
+ record = text.site_text
+ StaffActionLogger.new(current_user).log_site_text_change(record[:id], record[:value], old_value)
+ render_json_dump({ site_text: record }, rest_serializer: true)
+ end
+
def is_badge_title?(id = "")
badge_parts = id.split(".")
badge_parts[0] == "badges" && badge_parts[2] == "name"
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 9c86b21b32b..4a3029301e3 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -10395,6 +10395,8 @@ en:
description: "You can customize any of the text on your forum."
search: "Search text or translation keys"
search_label: "Search"
+ theme: "Theme or component"
+ all_themes: "All site texts"
filters: "Filters"
filters_active:
one: "Filters (%{count})"
diff --git a/docs/developer-guides/docs/05-themes-components/14-localizable-strings.md b/docs/developer-guides/docs/05-themes-components/14-localizable-strings.md
index 7085172e3e9..5b9f1507339 100644
--- a/docs/developer-guides/docs/05-themes-components/14-localizable-strings.md
+++ b/docs/developer-guides/docs/05-themes-components/14-localizable-strings.md
@@ -29,6 +29,8 @@ en:
Administrators can override individual keys on a per-theme basis in the /admin/customize/themes user interface. Fallback is handled in the same way as core, so it is ok to have incomplete translations for non-english languages will make use of the english keys.
+Administrators can also manage these translations in **Appearance → Site texts**. Select a theme or component to search its locale-file strings, edit a translation in the selected language, or revert an override to the locale-file default. The selection is linkable using `/admin/customize/site_texts?theme_id=THEME_ID`. Site texts identifies these entries as `js.theme_translations.THEME_ID.KEY`; edits use the same theme translation overrides as the theme editor.
+
![39|690x388,50%](/assets/localizable-strings-1.png)
In the background, these translations are stored alongside the core translations, under a theme-specific namespace. For example:
diff --git a/frontend/discourse/admin/controllers/admin-site-text/edit.js b/frontend/discourse/admin/controllers/admin-site-text/edit.js
index be6002868a8..a843dc70f1c 100644
--- a/frontend/discourse/admin/controllers/admin-site-text/edit.js
+++ b/frontend/discourse/admin/controllers/admin-site-text/edit.js
@@ -12,8 +12,9 @@ export default class AdminSiteTextEdit extends Controller {
@service dialog;
@tracked siteText;
+ @tracked themeId = null;
saved = false;
- queryParams = ["locale"];
+ queryParams = ["locale", { themeId: "theme_id" }];
#activeTextarea = null;
#lastCursorPos = null;
diff --git a/frontend/discourse/admin/controllers/admin-site-text/index.js b/frontend/discourse/admin/controllers/admin-site-text/index.js
index 6d59ee5773c..90b4767d7b1 100644
--- a/frontend/discourse/admin/controllers/admin-site-text/index.js
+++ b/frontend/discourse/admin/controllers/admin-site-text/index.js
@@ -17,6 +17,7 @@ export default class AdminSiteTextIndexController extends Controller {
@service modal;
@service store;
+ @tracked themeId = null;
@tracked locale;
@tracked q;
@tracked overridden;
@@ -31,6 +32,7 @@ export default class AdminSiteTextIndexController extends Controller {
@tracked canLoadMore = true;
queryParams = [
+ { themeId: "theme_id" },
"q",
"overridden",
"outdated",
@@ -44,6 +46,7 @@ export default class AdminSiteTextIndexController extends Controller {
get activeFilterCount() {
return [
+ this.themeId,
this.resolvedOverridden,
this.resolvedOutdated,
this.resolvedOnlySelectedLocale,
@@ -63,6 +66,10 @@ export default class AdminSiteTextIndexController extends Controller {
: i18n("admin.site_text.filters");
}
+ get availableThemes() {
+ return this.extras.themes ?? [];
+ }
+
get siteTexts() {
return this.#results.flat();
}
@@ -123,6 +130,7 @@ export default class AdminSiteTextIndexController extends Controller {
this.router.transitionTo("adminSiteText.edit", siteText.get("id"), {
queryParams: {
locale: this.resolvedLocale,
+ theme_id: this.themeId,
},
});
}
@@ -153,6 +161,7 @@ export default class AdminSiteTextIndexController extends Controller {
@action
resetFilters() {
+ this.themeId = null;
this.overridden = null;
this.outdated = null;
this.untranslated = null;
@@ -175,6 +184,12 @@ export default class AdminSiteTextIndexController extends Controller {
}
}
+ @action
+ updateTheme(value) {
+ this.themeId = value;
+ this.resetSearch();
+ }
+
@action
updateLocale(value) {
this.locale = value;
@@ -200,6 +215,7 @@ export default class AdminSiteTextIndexController extends Controller {
try {
this.model = await this.store.find("site-text", {
q: this.q,
+ theme_id: this.themeId,
overridden: this.resolvedOverridden,
outdated: this.resolvedOutdated,
locale: this.resolvedLocale,
diff --git a/frontend/discourse/admin/routes/admin-site-text/edit.js b/frontend/discourse/admin/routes/admin-site-text/edit.js
index 4e267c287f2..5229ccc1505 100644
--- a/frontend/discourse/admin/routes/admin-site-text/edit.js
+++ b/frontend/discourse/admin/routes/admin-site-text/edit.js
@@ -4,6 +4,7 @@ import { ajax } from "discourse/lib/ajax";
export default class AdminSiteTextEditRoute extends Route {
queryParams = {
locale: { replace: true },
+ themeId: { replace: true },
};
async model(params) {
diff --git a/frontend/discourse/admin/routes/admin-site-text/index.js b/frontend/discourse/admin/routes/admin-site-text/index.js
index 7945c3d5d07..e1b5e74e6e2 100644
--- a/frontend/discourse/admin/routes/admin-site-text/index.js
+++ b/frontend/discourse/admin/routes/admin-site-text/index.js
@@ -4,6 +4,7 @@ import { disableImplicitInjections } from "discourse/lib/implicit-injections";
@disableImplicitInjections
export default class AdminSiteTextIndexRoute extends Route {
queryParams = {
+ themeId: { replace: true },
q: { replace: true },
overridden: { replace: true },
outdated: { replace: true },
diff --git a/frontend/discourse/admin/templates/admin-site-text/edit.gjs b/frontend/discourse/admin/templates/admin-site-text/edit.gjs
index 62ccec26b34..18245f08cc7 100644
--- a/frontend/discourse/admin/templates/admin-site-text/edit.gjs
+++ b/frontend/discourse/admin/templates/admin-site-text/edit.gjs
@@ -29,7 +29,7 @@ export default <template>
</DPageHeader>
<LinkTo
class="go-back"
- @query={{hash [email protected]}}
@route="adminSiteText.index"
>
{{dIcon "arrow-left"}}
diff --git a/frontend/discourse/admin/templates/admin-site-text/index.gjs b/frontend/discourse/admin/templates/admin-site-text/index.gjs
index 00c4d55b875..9031d28f354 100644
--- a/frontend/discourse/admin/templates/admin-site-text/index.gjs
+++ b/frontend/discourse/admin/templates/admin-site-text/index.gjs
@@ -126,6 +126,22 @@ export default <template>
@disabled={{not @controller.hasActiveFilters}}
@label="filter_controls.reset"
/>
+ <div class="site-texts__theme">
+ <label>{{i18n "admin.site_text.theme"}}</label>
+ <ComboBox
+ class="theme-search"
+ @content={{@controller.availableThemes}}
+ @onChange={{@controller.updateTheme}}
+ @options={{hash
+ filterable=true
+ castInteger=true
+ clearable=true
+ none="admin.site_text.all_themes"
+ headerAriaLabel=(i18n "admin.site_text.theme")
+ }}
+ @value={{@controller.themeId}}
+ />
+ </div>
</:additionalFilters>
</DFilterControls>
</div>
diff --git a/lib/theme_translation_manager.rb b/lib/theme_translation_manager.rb
index 3cec678893d..74f704c96a7 100644
--- a/lib/theme_translation_manager.rb
+++ b/lib/theme_translation_manager.rb
@@ -4,6 +4,62 @@ class ThemeTranslationManager
include ActiveModel::Serialization
attr_reader :key, :default, :theme
+ SITE_TEXT_ID_PATTERN = /\Ajs\.theme_translations\.(-?\d+)\.(.+)\z/
+
+ def self.find_site_text(id, locale:)
+ match = SITE_TEXT_ID_PATTERN.match(id)
+ return unless match
+
+ I18n.with_locale(locale) do
+ theme = Theme.includes(:locale_fields, :theme_translation_overrides).find_by(id: match[1])
+ theme&.translations&.find { |entry| entry.key == match[2] }
+ end
+ end
+
+ def self.search_site_texts(
+ query,
+ locale:,
+ theme: nil,
+ overridden: false,
+ outdated: false,
+ untranslated: false,
+ only_selected_locale: false
+ )
+ return [] if outdated || (untranslated && locale.to_s == "en")
+
+ regexp = I18n::Backend::DiscourseI18n.create_search_regexp(query)
+ themes = Theme.includes(:locale_fields, :theme_translation_overrides)
+ themes = themes.where(id: theme.id) if theme
+ I18n.with_locale(locale) do
+ themes.flat_map do |selected_theme|
+ english_entries = I18n.with_locale(:en) { selected_theme.translations.to_a.index_by(&:key) }
+ translated_keys = locale_translation_keys(selected_theme, locale:) if untranslated
+ selected_theme.translations.filter_map do |entry|
+ next if overridden && !entry.has_record?
+ next if untranslated && (entry.has_record? || translated_keys.include?(entry.key))
+
+ record = entry.site_text
+ if regexp.match?(record[:id]) || regexp.match?(record[:value])
+ record
+ elsif (english_value = english_entries[entry.key]&.value) && regexp.match?(english_value)
+ record[:value] = english_value unless only_selected_locale
+ record
+ end
+ end
+ end
+ end
+ end
+
+ def self.locale_translation_keys(theme, locale:)
+ field = theme.locale_fields.find { |candidate| candidate.name == locale.to_s }
+ data = field&.raw_translation_data&.fetch(locale.to_sym, {}) || {}
+ list_from_hash(locale:, hash: data, theme:).map(&:key).to_set
+ rescue ThemeTranslationParser::InvalidYaml
+ Set.new
+ end
+
+ private_class_method :locale_translation_keys
+
def self.list_from_hash(locale:, hash:, theme:, parent_keys: [])
hash
.map do |key, value|
@@ -24,6 +80,27 @@ class ThemeTranslationManager
@theme = theme
end
+ def site_text
+ {
+ id: "js.theme_translations.#{theme.id}.#{key}",
+ value: value,
+ status: "up_to_date",
+ old_default: nil,
+ new_default: default,
+ overridden: has_record?,
+ can_revert: has_record?,
+ interpolation_keys: I18nInterpolationKeysFinder.find(default).sort,
+ }
+ end
+
+ def revert!
+ theme.with_lock do
+ theme.theme_translation_overrides.reload
+ db_record&.destroy!
+ theme.theme_translation_overrides.reset
+ end
+ end
+
def value
has_record? ? db_record.value : default
end
@@ -42,6 +119,8 @@ class ThemeTranslationManager
end
record.value
end
+ ensure
+ theme.theme_translation_overrides.reset
end
def db_record
diff --git a/spec/requests/admin/theme_site_texts_controller_spec.rb b/spec/requests/admin/theme_site_texts_controller_spec.rb
new file mode 100644
index 00000000000..b955f4aaffb
--- /dev/null
+++ b/spec/requests/admin/theme_site_texts_controller_spec.rb
@@ -0,0 +1,208 @@
+# frozen_string_literal: true
+
+RSpec.describe Admin::SiteTextsController do
+ fab!(:admin)
+ fab!(:theme) { Fabricate(:theme, component: true) }
+ fab!(:other_theme) { Fabricate(:theme, component: true) }
+
+ before do
+ theme.set_field(
+ target: :translations,
+ name: "en",
+ value: {
+ en: {
+ resource_intro: "Explore resources",
+ greeting: "Hello %{name}",
+ },
+ }.deep_stringify_keys.to_yaml,
+ )
+ theme.set_field(
+ target: :translations,
+ name: "ja",
+ value: { ja: { resource_intro: "リソースを見る" } }.deep_stringify_keys.to_yaml,
+ )
+ theme.save!
+ other_theme.set_field(
+ target: :translations,
+ name: "en",
+ value: { en: { resource_intro: "Other resources" } }.deep_stringify_keys.to_yaml,
+ )
+ other_theme.save!
+ sign_in(admin)
+ end
+
+ let(:text_id) { "js.theme_translations.#{theme.id}.resource_intro" }
+ let(:path) { "/admin/customize/site_texts/#{text_id}.json" }
+
+ describe "#index" do
+ it "lists the selected component's defaults before any overrides exist" do
+ get "/admin/customize/site_texts.json", params: { theme_id: theme.id, locale: "en" }
+ expect(response.status).to eq(200)
+ expect(response.parsed_body["site_texts"].map { |text| text["id"] }).to contain_exactly(
+ text_id,
+ "js.theme_translations.#{theme.id}.greeting",
+ )
+ expect(response.parsed_body["extras"]["themes"]).to include(
+ "id" => theme.id,
+ "name" => theme.name,
+ )
+ end
+
+ it "searches theme texts and displays the selected language" do
+ get "/admin/customize/site_texts.json",
+ params: {
+ theme_id: theme.id,
+ q: "resource_intro",
+ locale: "ja",
+ }
+ expect(response.parsed_body["site_texts"]).to contain_exactly(
+ include("id" => text_id, "value" => "リソースを見る"),
+ )
+ get "/admin/customize/site_texts.json", params: { q: text_id, locale: "en" }
+ expect(response.parsed_body["site_texts"]).to contain_exactly(include("id" => text_id))
+ end
+
+ it "filters overrides by the selected theme and locale" do
+ ThemeTranslationOverride.create!(
+ theme: theme,
+ locale: "ja",
+ translation_key: "resource_intro",
+ value: "Custom intro",
+ )
+ get "/admin/customize/site_texts.json",
+ params: {
+ theme_id: theme.id,
+ locale: "en",
+ overridden: true,
+ }
+ expect(response.parsed_body["site_texts"]).to eq([])
+ get "/admin/customize/site_texts.json",
+ params: {
+ theme_id: theme.id,
+ locale: "ja",
+ overridden: true,
+ }
+ expect(response.parsed_body["site_texts"]).to contain_exactly(
+ include("id" => text_id, "value" => "Custom intro", "overridden" => true),
+ )
+ end
+
+ it "treats locale-file translations as translated and fallback texts as untranslated" do
+ get "/admin/customize/site_texts.json",
+ params: {
+ theme_id: theme.id,
+ locale: "ja",
+ untranslated: true,
+ }
+ expect(response.parsed_body["site_texts"].map { |text| text["id"] }).to eq(
+ ["js.theme_translations.#{theme.id}.greeting"],
+ )
+ end
+
+ it "paginates within the selected theme" do
+ values = 55.times.to_h { |index| ["label_#{index}", "Resource #{index}"] }
+ theme.set_field(target: :translations, name: "en", value: { "en" => values }.to_yaml)
+ theme.save!
+ get "/admin/customize/site_texts.json", params: { theme_id: theme.id, locale: "en" }
+ first_page = response.parsed_body["site_texts"].map { |text| text["id"] }
+ expect(first_page.size).to eq(50)
+ expect(response.parsed_body["extras"]["has_more"]).to eq(true)
+ get "/admin/customize/site_texts.json", params: { theme_id: theme.id, locale: "en", page: 1 }
+ second_page = response.parsed_body["site_texts"].map { |text| text["id"] }
+ expect(second_page.size).to eq(5)
+ expect(first_page & second_page).to be_empty
+ get "/admin/customize/site_texts.json", params: { theme_id: theme.id, locale: "en", page: 99 }
+ expect(response.parsed_body["site_texts"]).to eq([])
+ end
+
+ it "can display a target-language value when searching by English text" do
+ get "/admin/customize/site_texts.json",
+ params: {
+ theme_id: theme.id,
+ q: "Explore resources",
+ locale: "ja",
+ only_selected_locale: true,
+ }
+ expect(response.parsed_body["site_texts"]).to contain_exactly(
+ include("id" => text_id, "value" => "リソースを見る"),
+ )
+ end
+
+ it "returns not found for a missing theme" do
+ get "/admin/customize/site_texts.json", params: { theme_id: 999_999, locale: "en" }
+ expect(response.status).to eq(404)
+ end
+ end
+
+ describe "#update" do
+ it "edits and reverts a theme text without creating a site override" do
+ put path, params: { site_text: { locale: "ja", value: "Custom intro" } }
+ expect(response.status).to eq(200)
+ expect(response.parsed_body["site_text"]).to include(
+ "value" => "Custom intro",
+ "can_revert" => true,
+ "new_default" => "リソースを見る",
+ )
+ expect(
+ ThemeTranslationOverride.find_by!(
+ theme: theme,
+ locale: "ja",
+ translation_key: "resource_intro",
+ ).value,
+ ).to eq("Custom intro")
+ expect(TranslationOverride.exists?(translation_key: text_id)).to eq(false)
+ get path, params: { locale: "ja" }
+ expect(response.parsed_body["site_text"]["value"]).to eq("Custom intro")
+ delete path, params: { locale: "ja" }
+ expect(response.status).to eq(200)
+ expect(response.parsed_body["site_text"]).to include(
+ "value" => "リソースを見る",
+ "can_revert" => false,
+ "overridden" => false,
+ )
+ expect(ThemeTranslationOverride.where(theme: theme)).to be_empty
+ end
+
+ it "removes an override when saving the locale-file default" do
+ ThemeTranslationOverride.create!(
+ theme: theme,
+ locale: "en",
+ translation_key: "resource_intro",
+ value: "Custom intro",
+ )
+ put path, params: { site_text: { locale: "en", value: "Explore resources" } }
+ expect(response.status).to eq(200)
+ expect(response.parsed_body["site_text"]).to include(
+ "value" => "Explore resources",
+ "can_revert" => false,
+ )
+ expect(ThemeTranslationOverride.where(theme: theme)).to be_empty
+ end
+
+ it "rejects unknown keys and malformed values" do
+ put "/admin/customize/site_texts/js.theme_translations.#{theme.id}.missing.json",
+ params: {
+ site_text: {
+ locale: "en",
+ value: "No",
+ },
+ }
+ expect(response.status).to eq(404)
+ put path, params: { site_text: { locale: "en", value: { bad: "value" } } }
+ expect(response.status).to eq(400)
+ expect(ThemeTranslationOverride.where(theme: theme)).to be_empty
+ end
+
+ it "requires an admin for reading and editing theme texts" do
+ sign_in(Fabricate(:moderator))
+ get "/admin/customize/site_texts.json", params: { theme_id: theme.id, locale: "en" }
+ expect(response.status).to eq(404)
+ get path, params: { locale: "en" }
+ expect(response.status).to eq(404)
+ put path, params: { site_text: { locale: "en", value: "No" } }
+ expect(response.status).to eq(404)
+ delete path, params: { locale: "en" }
+ expect(response.status).to eq(404)
+ end
+ end
+end
diff --git a/spec/system/admin_site_texts_spec.rb b/spec/system/admin_site_texts_spec.rb
index 032e3a7ab7c..ab7b282240f 100644
--- a/spec/system/admin_site_texts_spec.rb
+++ b/spec/system/admin_site_texts_spec.rb
@@ -126,6 +126,53 @@ describe "Admin Site Texts Page" do
expect(page.all(".d-modal label span").map(&:text)).to eq(["Uncategorized"])
end
+ it "can filter, edit, and revert a component translation in the selected language" do
+ theme = Fabricate(:theme, component: true)
+ theme.set_field(
+ target: :translations,
+ name: "en",
+ value: "en:\n resource_intro: Explore resources",
+ )
+ theme.set_field(
+ target: :translations,
+ name: "it",
+ value: "it:\n resource_intro: Esplora le risorse",
+ )
+ theme.save!
+ key = "js.theme_translations.#{theme.id}.resource_intro"
+
+ site_texts_page.visit
+ expect(site_texts_page).to have_no_theme_filter
+ site_texts_page.select_theme(theme)
+ site_texts_page.select_locale("it")
+ site_texts_page.search("resource_intro")
+ expect(site_texts_page).to have_translation_value("Esplora le risorse")
+ expect(page).to have_current_path(
+ "/admin/customize/site_texts?locale=it&q=resource_intro&theme_id=#{theme.id}",
+ )
+ page.refresh
+ expect(site_texts_page).to have_translation_key(key)
+ expect(site_texts_page).to have_selected_theme(theme)
+
+ site_texts_page.edit_translation(key, locale: "it", theme_id: theme.id)
+ site_texts_page.override_translation("Le nostre risorse")
+ site_texts_page.back_to_results
+ expect(page).to have_current_path(
+ "/admin/customize/site_texts?locale=it&q=resource_intro&theme_id=#{theme.id}",
+ )
+ expect(site_texts_page).to have_translation_value("Le nostre risorse")
+ page.refresh
+ expect(site_texts_page).to have_translation_value("Le nostre risorse")
+
+ site_texts_page.edit_translation(key, locale: "it", theme_id: theme.id)
+ site_texts_page.revert_translation
+ site_texts_page.back_to_results
+ expect(site_texts_page).to have_translation_value("Esplora le risorse")
+ site_texts_page.reset_filters
+ expect(site_texts_page).to have_all_site_texts_selected
+ expect(page).to have_current_path("/admin/customize/site_texts?locale=it&q=resource_intro")
+ end
+
it "can load more results" do
site_texts_page.visit
site_texts_page.search("e")
diff --git a/spec/system/page_objects/pages/admin_site_texts.rb b/spec/system/page_objects/pages/admin_site_texts.rb
index bbdb8aadfa6..00038d0ddf3 100644
--- a/spec/system/page_objects/pages/admin_site_texts.rb
+++ b/spec/system/page_objects/pages/admin_site_texts.rb
@@ -28,6 +28,46 @@ module PageObjects
locale_selector.collapse
end
+ def select_theme(theme)
+ expand_filters
+ selector = PageObjects::Components::SelectKit.new(".theme-search")
+ selector.expand
+ selector.select_row_by_value(theme.id)
+ selector.collapse
+ end
+
+ def has_no_theme_filter?
+ has_no_css?(".theme-search")
+ end
+
+ def has_selected_theme?(theme)
+ has_css?(".d-filter-controls__dropdowns .theme-search .select-kit-header", text: theme.name)
+ end
+
+ def has_all_site_texts_selected?
+ has_css?(
+ ".theme-search .select-kit-header",
+ text: I18n.t("admin_js.admin.site_text.all_themes"),
+ )
+ end
+
+ def back_to_results
+ find(".go-back").click
+ self
+ end
+
+ def revert_translation
+ find(".revert-site-text").click
+ PageObjects::Components::Dialog.new.click_yes
+ self
+ end
+
+ def reset_filters
+ expand_filters
+ find(".site-texts__reset-filters").click
+ self
+ end
+
def toggle_only_show_overridden
expand_filters
find("#toggle-overridden").click
@@ -43,12 +83,10 @@ module PageObjects
find("#toggle-only-locale").click
end
- def edit_translation(key)
+ def edit_translation(key, locale: I18n.locale, theme_id: nil)
find(".site-text[data-site-text-id='#{key}']").find(".site-text-edit").click
- has_current_path?(
- "/admin/customize/site_texts/#{key}?locale=#{I18n.locale}",
- ignore_query: false,
- )
+ query = { locale:, theme_id: }.compact.to_query
+ has_current_path?("/admin/customize/site_texts/#{key}?#{query}", ignore_query: false)
end
def override_translation(value)