From 24b2e353a4bbff92dea5d15e2ee4b1e892ab1c47 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Tue, 11 Feb 2025 20:11:04 +0100
Subject: [PATCH] FIX: correctly display label (#31282)

A regression introduced in 32c8aa0aad880bcab372ffd75bce3c857060d721
incorrectly passes label to the trigger component, but also passes
translatedLabel instead of label to the menu.

The existing test was checking for the presence of "label", but it was
actually returning true because the test was showing "en.label". The
test has been modified in consequences.
---
 .../tests/integration/components/float-kit/d-menu-test.js    | 2 +-
 app/assets/javascripts/float-kit/addon/components/d-menu.gjs | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/discourse/tests/integration/components/float-kit/d-menu-test.js b/app/assets/javascripts/discourse/tests/integration/components/float-kit/d-menu-test.js
index 2bf93777749..dc575ee7296 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/float-kit/d-menu-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/float-kit/d-menu-test.js
@@ -25,7 +25,7 @@ module("Integration | Component | FloatKit | d-menu", function (hooks) {
   test("@label", async function (assert) {
     await render(hbs`<DMenu @inline={{true}} @label="label" />`);
 
-    assert.dom(".fk-d-menu__trigger").containsText("label");
+    assert.dom(".fk-d-menu__trigger .d-button-label").hasText(/^label$/);
   });
 
   test("@icon", async function (assert) {
diff --git a/app/assets/javascripts/float-kit/addon/components/d-menu.gjs b/app/assets/javascripts/float-kit/addon/components/d-menu.gjs
index 1c8dc31bab4..037d48aea50 100644
--- a/app/assets/javascripts/float-kit/addon/components/d-menu.gjs
+++ b/app/assets/javascripts/float-kit/addon/components/d-menu.gjs
@@ -85,11 +85,8 @@ export default class DMenu extends Component {
       get icon() {
         return instance.args.icon;
       },
-      get label() {
-        return instance.args.label;
-      },
       get translatedLabel() {
-        return instance.args.translatedLabel;
+        return instance.args.label;
       },
       get translatedAriaLabel() {
         return instance.args.ariaLabel;