From da1aa2aa92b2170864fc60f3e3bfb61408efdc41 Mon Sep 17 00:00:00 2001
From: David Sevilla Martin <6401250+dsevillamartin@users.noreply.github.com>
Date: Thu, 27 Jul 2023 06:24:19 -0400
Subject: [PATCH] fix: default labels with `SettingDropdown` and
 `SelectDropdown` (#3854)

* Remove modification to label in SelectDropdown
* Only set 'defaultLabel' if falsy and translate "Custom" default
---
 framework/core/js/src/admin/components/SettingDropdown.tsx | 2 +-
 framework/core/js/src/common/components/SelectDropdown.tsx | 5 +----
 framework/core/locale/core.yml                             | 1 +
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/framework/core/js/src/admin/components/SettingDropdown.tsx b/framework/core/js/src/admin/components/SettingDropdown.tsx
index 67d86975d..0205ff532 100644
--- a/framework/core/js/src/admin/components/SettingDropdown.tsx
+++ b/framework/core/js/src/admin/components/SettingDropdown.tsx
@@ -21,7 +21,7 @@ export default class SettingDropdown<CustomAttrs extends ISettingDropdownAttrs =
     attrs.className = 'SettingDropdown';
     attrs.buttonClassName = 'Button Button--text';
     attrs.caretIcon = 'fas fa-caret-down';
-    attrs.defaultLabel = 'Custom';
+    attrs.defaultLabel ||= app.translator.trans('core.admin.settings.select_dropdown_custom_label');
 
     if ('key' in attrs) {
       attrs.setting = attrs.key?.toString();
diff --git a/framework/core/js/src/common/components/SelectDropdown.tsx b/framework/core/js/src/common/components/SelectDropdown.tsx
index deab0fa98..d38e26d71 100644
--- a/framework/core/js/src/common/components/SelectDropdown.tsx
+++ b/framework/core/js/src/common/components/SelectDropdown.tsx
@@ -28,7 +28,7 @@ function isActive(vnode: Mithril.Children): boolean {
 }
 
 export interface ISelectDropdownAttrs extends IDropdownAttrs {
-  defaultLabel: string;
+  defaultLabel: Mithril.Children;
 }
 
 /**
@@ -49,9 +49,6 @@ export default class SelectDropdown<CustomAttrs extends ISelectDropdownAttrs = I
     const activeChild = children.find(isActive);
     let label = (activeChild && typeof activeChild === 'object' && 'children' in activeChild && activeChild.children) || this.attrs.defaultLabel;
 
-    // @ts-ignore
-    if (Array.isArray(label)) label = label[0];
-
     return [<span className="Button-label">{label}</span>, this.attrs.caretIcon ? icon(this.attrs.caretIcon, { className: 'Button-caret' }) : null];
   }
 }
diff --git a/framework/core/locale/core.yml b/framework/core/locale/core.yml
index 24eeb3164..6c6de0b9c 100644
--- a/framework/core/locale/core.yml
+++ b/framework/core/locale/core.yml
@@ -252,6 +252,7 @@ core:
     # These translations are used generically in setting fields.
     settings:
       saved_message: Your changes were saved.
+      select_dropdown_custom_label: Custom
       submit_button: => core.ref.save_changes
 
     # These translations are used in image upload buttons.