Skip to content

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

UX: move post language selector to toolbar, deprioritize for AI (#39208)

Kris662908830968
diff --git a/app/assets/stylesheets/common/components/post-translations.scss b/app/assets/stylesheets/common/components/post-translations.scss
index 75c20c68970..b21c483c164 100644
--- a/app/assets/stylesheets/common/components/post-translations.scss
+++ b/app/assets/stylesheets/common/components/post-translations.scss
@@ -26,8 +26,9 @@
}
.post-language-selector-trigger {
- .d-button-label {
+ .toolbar-popup-menu-options__trigger-label {
margin-left: var(--space-1);
+ font-size: var(--font-down-2);
text-transform: uppercase;
color: var(--primary-high);
}
diff --git a/app/assets/stylesheets/common/toolbar-popup-menu-options.scss b/app/assets/stylesheets/common/toolbar-popup-menu-options.scss
index 37c22e59d97..3d03b0bf4bf 100644
--- a/app/assets/stylesheets/common/toolbar-popup-menu-options.scss
+++ b/app/assets/stylesheets/common/toolbar-popup-menu-options.scss
@@ -69,6 +69,12 @@
}
}
+.fk-d-menu[class*="toolbar-menu"] .dropdown-menu__header {
+ padding: var(--space-2) 0.35em;
+ color: var(--primary-medium);
+ font-size: var(--font-down-1-rem);
+}
+
.toolbar-menu__options-content,
.toolbar-menu__list-content,
.toolbar-menu__heading-content {
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index ecc903e3d39..50197124456 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -4518,8 +4518,9 @@ en:
confirm_delete: "Are you sure you want to delete translations for '%{languageCode}'?"
success: "Translations have been updated successfully"
post_language_selector:
- title: "Post Language"
- none: "None"
+ title: "Post language"
+ header: "This post is in…"
+ none: "Not set"
edit_warning:
message: "This is a translated post.<br><br>Do you want to edit the original post in %{language} or edit this specific translation?"
action_original: "Edit original post"
diff --git a/frontend/discourse/app/components/composer-action-title.gjs b/frontend/discourse/app/components/composer-action-title.gjs
index 5f1f1c8caca..a7c59f92292 100644
--- a/frontend/discourse/app/components/composer-action-title.gjs
+++ b/frontend/discourse/app/components/composer-action-title.gjs
@@ -2,10 +2,8 @@
import Component from "@ember/component";
import { hash } from "@ember/helper";
import { computed, set } from "@ember/object";
-import { service } from "@ember/service";
import { trustHTML } from "@ember/template";
import { tagName } from "@ember-decorators/component";
-import PostLanguageSelector from "discourse/components/post-language-selector";
import escape from "discourse/lib/escape";
import { iconHTML } from "discourse/lib/icon-library";
import {
@@ -30,9 +28,6 @@ const TITLES = {
@tagName("")
export default class ComposerActionTitle extends Component {
- @service currentUser;
- @service siteSettings;
-
// Note we update when some other attributes like tag/category change to allow
// text customizations to use those.
@@ -92,16 +87,6 @@ export default class ComposerActionTitle extends Component {
}
}
- @computed("action")
- get showPostLanguageSelector() {
- const allowedActions = [CREATE_TOPIC, EDIT, REPLY];
- return (
- this.currentUser &&
- this.siteSettings.content_localization_enabled &&
- allowedActions.includes(this.action)
- );
- }
-
_formatEditUserPost(userAvatar, userLink, postLink, originalUser) {
let editTitle = `
<a class="post-link" href="${postLink.href}">${postLink.anchor}</a>
@@ -155,12 +140,6 @@ export default class ComposerActionTitle extends Component {
{{this.actionTitle}}
</span>
- {{#if this.showPostLanguageSelector}}
- <PostLanguageSelector
- @composerModel={{this.model}}
- @selectedLanguage={{this.model.locale}}
- />
- {{/if}}
</div>
</template>
}
diff --git a/frontend/discourse/app/components/composer/toolbar-buttons.gjs b/frontend/discourse/app/components/composer/toolbar-buttons.gjs
index 59cc5d79e9d..181c7977203 100644
--- a/frontend/discourse/app/components/composer/toolbar-buttons.gjs
+++ b/frontend/discourse/app/components/composer/toolbar-buttons.gjs
@@ -46,11 +46,13 @@ export default class ComposerToolbarButtons extends Component {
@title={{button.title}}
@context={{@data.context}}
@content={{(button.popupMenu.options)}}
+ @header={{button.popupMenu.header}}
@onChange={{button.popupMenu.action}}
@onOpen={{button.action}}
@tabindex={{this.tabIndex button}}
@onKeydown={{this.rovingButtonBar}}
@icon={{button.icon}}
+ @triggerLabel={{button.popupMenu.triggerLabel}}
@class={{concatClass
button.className
(if (this.isButtonActive button) "--active")
diff --git a/frontend/discourse/app/components/post-language-selector.gjs b/frontend/discourse/app/components/post-language-selector.gjs
deleted file mode 100644
index c1e4e72fe16..00000000000
--- a/frontend/discourse/app/components/post-language-selector.gjs
+++ /dev/null
@@ -1,77 +0,0 @@
-import Component from "@glimmer/component";
-import { fn } from "@ember/helper";
-import { action } from "@ember/object";
-import { service } from "@ember/service";
-import DButton from "discourse/components/d-button";
-import DropdownMenu from "discourse/components/dropdown-menu";
-import DMenu from "discourse/float-kit/components/d-menu";
-import { i18n } from "discourse-i18n";
-
-export default class PostLanguageSelector extends Component {
- @service siteSettings;
- @service languageNameLookup;
-
- get selectedLanguage() {
- return (
- this.siteSettings.available_content_localization_locales.find(
- (locale) => locale.value === this.args.composerModel.locale
- )?.value || ""
- );
- }
-
- get content() {
- return this.siteSettings.available_content_localization_locales.map(
- ({ value }) => ({
- name: this.languageNameLookup.getLanguageName(value),
- value,
- })
- );
- }
-
- @action
- selectPostLanguage(locale) {
- this.args.composerModel.locale = locale;
- this.dMenu.close();
- }
-
- @action
- onRegisterApi(api) {
- this.dMenu = api;
- }
-
- <template>
- <DMenu
- @identifier="post-language-selector"
- @title={{i18n "post.localizations.post_language_selector.title"}}
- @icon="language"
- @label={{this.selectedLanguage}}
- @modalForMobile={{true}}
- @onRegisterApi={{this.onRegisterApi}}
- @triggerClass="btn-transparent"
- >
- <:content>
- <DropdownMenu as |dropdown|>
- {{#each this.content as |locale|}}
- <dropdown.item
- class="locale-options"
- data-menu-option-id={{locale.value}}
- >
- <DButton
- @translatedLabel={{locale.name}}
- @title={{locale.value}}
- @action={{fn this.selectPostLanguage locale.value}}
- />
- </dropdown.item>
- {{/each}}
- <dropdown.divider />
- <dropdown.item>
- <DButton
- @label="post.localizations.post_language_selector.none"
- @action={{fn this.selectPostLanguage null}}
- />
- </dropdown.item>
- </DropdownMenu>
- </:content>
- </DMenu>
- </template>
-}
diff --git a/frontend/discourse/app/components/toolbar-popup-menu-options.gjs b/frontend/discourse/app/components/toolbar-popup-menu-options.gjs
index c476f8fff13..435fc455edc 100644
--- a/frontend/discourse/app/components/toolbar-popup-menu-options.gjs
+++ b/frontend/discourse/app/components/toolbar-popup-menu-options.gjs
@@ -162,6 +162,15 @@ export default class ToolbarPopupMenuOptions extends Component {
return config.icon;
}
+ get triggerLabel() {
+ const label = this.args.triggerLabel;
+ if (typeof label === "function") {
+ return label({ state: this.textManipulationState });
+ }
+
+ return label;
+ }
+
<template>
<DMenu
@identifier={{concat "toolbar-menu__" @class}}
@@ -180,9 +189,17 @@ export default class ToolbarPopupMenuOptions extends Component {
>
<:trigger>
{{icon (this.getIcon this.args)}}
+ {{#if this.triggerLabel}}
+ <span class="toolbar-popup-menu-options__trigger-label">
+ {{this.triggerLabel}}
+ </span>
+ {{/if}}
</:trigger>
<:content>
<DropdownMenu {{this.trackScrollability}} as |dropdown|>
+ {{#if @header}}
+ <li class="dropdown-menu__header">{{@header}}</li>
+ {{/if}}
{{#each this.convertedContent as |option|}}
<dropdown.item>
<DButton
diff --git a/frontend/discourse/app/instance-initializers/post-language-selector.js b/frontend/discourse/app/instance-initializers/post-language-selector.js
new file mode 100644
index 00000000000..89aa280649f
--- /dev/null
+++ b/frontend/discourse/app/instance-initializers/post-language-selector.js
@@ -0,0 +1,77 @@
+import { withPluginApi } from "discourse/lib/plugin-api";
+import { applyValueTransformer } from "discourse/lib/transformer";
+import { CREATE_TOPIC, EDIT, REPLY } from "discourse/models/composer";
+import { i18n } from "discourse-i18n";
+
+const ALLOWED_ACTIONS = [CREATE_TOPIC, EDIT, REPLY];
+
+export default {
+ initialize(owner) {
+ const siteSettings = owner.lookup("service:site-settings");
+
+ if (!siteSettings.content_localization_enabled) {
+ return;
+ }
+
+ const languageNameLookup = owner.lookup("service:language-name-lookup");
+
+ withPluginApi((api) => {
+ api.onToolbarCreate((toolbar) => {
+ const composerService = api.container.lookup("service:composer");
+ const priority = applyValueTransformer(
+ "post-language-selector-priority",
+ "first",
+ { action: composerService.model?.action }
+ );
+
+ const group = priority === "last" ? "extras" : "locale";
+
+ if (priority !== "last") {
+ toolbar.groups.unshift({ group: "locale", buttons: [] });
+ }
+
+ toolbar.addButton({
+ id: "post-language-selector",
+ group,
+ icon: "language",
+ title: "post.localizations.post_language_selector.title",
+ className: "post-language-selector-trigger",
+ condition: () => {
+ const currentUser = api.getCurrentUser();
+ return (
+ currentUser &&
+ ALLOWED_ACTIONS.includes(composerService.model?.action)
+ );
+ },
+ popupMenu: {
+ header: i18n("post.localizations.post_language_selector.header"),
+ triggerLabel: () => {
+ return composerService.model?.locale?.toUpperCase() || "";
+ },
+ action: (option) => {
+ composerService.model.locale = option.locale;
+ },
+ options: () => {
+ const locales =
+ siteSettings.available_content_localization_locales.map(
+ ({ value }) => ({
+ name: value,
+ translatedLabel: languageNameLookup.getLanguageName(value),
+ locale: value,
+ })
+ );
+
+ locales.push({
+ name: "none",
+ label: "post.localizations.post_language_selector.none",
+ locale: null,
+ });
+
+ return locales;
+ },
+ },
+ });
+ });
+ });
+ },
+};
diff --git a/frontend/discourse/app/lib/registry/transformers.js b/frontend/discourse/app/lib/registry/transformers.js
index 1068537856b..c532a0c2a02 100644
--- a/frontend/discourse/app/lib/registry/transformers.js
+++ b/frontend/discourse/app/lib/registry/transformers.js
@@ -84,6 +84,7 @@ export const VALUE_TRANSFORMERS = Object.freeze([
"post-event-listener",
"post-flag-available-flags",
"post-flag-title",
+ "post-language-selector-priority",
"post-menu-buttons",
"post-menu-collapsed",
"post-menu-like-button-icon",
diff --git a/frontend/discourse/tests/acceptance/transformers/post-language-selector-priority-test.js b/frontend/discourse/tests/acceptance/transformers/post-language-selector-priority-test.js
new file mode 100644
index 00000000000..437ec70c6b8
--- /dev/null
+++ b/frontend/discourse/tests/acceptance/transformers/post-language-selector-priority-test.js
@@ -0,0 +1,59 @@
+import { visit } from "@ember/test-helpers";
+import { test } from "qunit";
+import { withPluginApi } from "discourse/lib/plugin-api";
+import { acceptance } from "discourse/tests/helpers/qunit-helpers";
+
+acceptance("post-language-selector-priority transformer", function (needs) {
+ needs.user();
+ needs.settings({
+ content_localization_enabled: true,
+ available_content_localization_locales: [{ value: "en" }, { value: "fr" }],
+ available_locales: [{ name: "English", value: "en" }],
+ allow_uncategorized_topics: true,
+ });
+
+ function toolbarButtonClasses() {
+ return [
+ ...document.querySelectorAll(
+ ".d-editor-button-bar .toolbar__button, .d-editor-button-bar .toolbar-popup-menu-options"
+ ),
+ ].map((b) => b.classList);
+ }
+
+ function buttonIndex(classes, name) {
+ return classes.findIndex((c) => c.contains(name));
+ }
+
+ test("language selector is in the first group by default", async function (assert) {
+ await visit("/new-topic");
+
+ const buttons = toolbarButtonClasses();
+ const languageIdx = buttonIndex(buttons, "post-language-selector-trigger");
+ const boldIdx = buttonIndex(buttons, "bold");
+
+ assert.true(
+ languageIdx < boldIdx,
+ "language selector appears before formatting buttons"
+ );
+ });
+
+ test("language selector moves to the last group when transformer deprioritizes it", async function (assert) {
+ withPluginApi((api) => {
+ api.registerValueTransformer(
+ "post-language-selector-priority",
+ () => "last"
+ );
+ });
+
+ await visit("/new-topic");
+
+ const buttons = toolbarButtonClasses();
+ const languageIdx = buttonIndex(buttons, "post-language-selector-trigger");
+ const boldIdx = buttonIndex(buttons, "bold");
+
+ assert.true(
+ languageIdx > boldIdx,
+ "language selector appears after formatting buttons"
+ );
+ });
+});
diff --git a/plugins/discourse-ai/assets/javascripts/discourse/initializers/translation.js b/plugins/discourse-ai/assets/javascripts/discourse/initializers/translation.js
index 3ce954af888..42bce5f202a 100644
--- a/plugins/discourse-ai/assets/javascripts/discourse/initializers/translation.js
+++ b/plugins/discourse-ai/assets/javascripts/discourse/initializers/translation.js
@@ -8,6 +8,9 @@ export default apiInitializer((api) => {
return;
}
+ // When AI translation is enabled, deprioritize the manual language selector since language is auto-detected
+ api.registerValueTransformer("post-language-selector-priority", () => "last");
+
api.registerCustomPostMessageCallback(
"localized",
(topicController, data) => {
diff --git a/spec/system/page_objects/components/composer.rb b/spec/system/page_objects/components/composer.rb
index ca64b5a2697..549d168a710 100644
--- a/spec/system/page_objects/components/composer.rb
+++ b/spec/system/page_objects/components/composer.rb
@@ -154,11 +154,11 @@ module PageObjects
end
def locale
- find("#{@composer_id} #{POST_LANGUAGE_SELECTOR}")
+ find("#{@composer_id} .d-editor-button-bar #{POST_LANGUAGE_SELECTOR}")
end
def set_locale(locale)
- Components::DMenu.new(POST_LANGUAGE_SELECTOR).expand
+ click_toolbar_button("post-language-selector-trigger")
within("#d-menu-portals", visible: false) { find("button", text: locale).click }
end
diff --git a/spec/system/post_translation_spec.rb b/spec/system/post_translation_spec.rb
index 8db84e26efc..e6e69c1cd88 100644
--- a/spec/system/post_translation_spec.rb
+++ b/spec/system/post_translation_spec.rb
@@ -1,7 +1,7 @@
# frozen_string_literal: true
describe "Post translations" do
- POST_LANGUAGE_SWITCHER_SELECTOR = "button[data-identifier='post-language-selector']"
+ POST_LANGUAGE_SWITCHER_SELECTOR = ".d-editor-button-bar .post-language-selector-trigger"
fab!(:admin)
fab!(:topic)
@@ -12,7 +12,10 @@ describe "Post translations" do
PageObjects::Components::SelectKit.new(".translation-selector-dropdown")
end
let(:post_language_selector) do
- PageObjects::Components::DMenu.new(POST_LANGUAGE_SWITCHER_SELECTOR)
+ PageObjects::Components::DMenu.new(
+ POST_LANGUAGE_SWITCHER_SELECTOR,
+ "toolbar-menu__post-language-selector-trigger",
+ )
end
let(:view_translations_modal) { PageObjects::Modals::ViewTranslationsModal.new }
@@ -201,7 +204,7 @@ describe "Post translations" do
visit("/latest")
page.find("#create-topic").click
post_language_selector.expand
- post_language_selector.option(".dropdown-menu__item[data-menu-option-id='fr']").click
+ post_language_selector.option("[data-name='fr']").click
composer.fill_title("Ceci est un sujet de test 1")
composer.fill_content("Bonjour le monde")
composer.submit
@@ -213,7 +216,11 @@ describe "Post translations" do
it "should not have a locale set by default" do
visit("/latest")
page.find("#create-topic").click
- expect(page.has_no_css?("#{POST_LANGUAGE_SWITCHER_SELECTOR} .d-button-label")).to be true
+ expect(
+ page.has_no_css?(
+ "#{POST_LANGUAGE_SWITCHER_SELECTOR} .toolbar-popup-menu-options__trigger-label",
+ ),
+ ).to be true
end
end