From 00f632fb0d48d7f6ae00e0e6133d0bc3c7d8d012 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Wed, 22 Apr 2020 20:39:55 +0200
Subject: [PATCH] REFACTOR:
 s/translatedfilterPlaceholder/translatedFilterPlaceholder (#9521)

---
 .../select-kit/components/select-kit.js        |  2 +-
 .../components/select-kit/select-kit-filter.js | 18 +++++++++++-------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/app/assets/javascripts/select-kit/components/select-kit.js b/app/assets/javascripts/select-kit/components/select-kit.js
index 27e849ae1d6..360dd65738d 100644
--- a/app/assets/javascripts/select-kit/components/select-kit.js
+++ b/app/assets/javascripts/select-kit/components/select-kit.js
@@ -257,7 +257,7 @@ export default Component.extend(
       autoFilterable: "autoFilterable",
       filterIcon: "search",
       filterPlaceholder: "filterPlaceholder",
-      translatedfilterPlaceholder: null,
+      translatedFilterPlaceholder: null,
       icon: null,
       icons: null,
       maximum: null,
diff --git a/app/assets/javascripts/select-kit/components/select-kit/select-kit-filter.js b/app/assets/javascripts/select-kit/components/select-kit/select-kit-filter.js
index 0c833d0a0c2..1b562790b1c 100644
--- a/app/assets/javascripts/select-kit/components/select-kit/select-kit-filter.js
+++ b/app/assets/javascripts/select-kit/components/select-kit/select-kit-filter.js
@@ -1,6 +1,6 @@
 import Component from "@ember/component";
 import discourseComputed from "discourse-common/utils/decorators";
-import { isEmpty } from "@ember/utils";
+import { isPresent } from "@ember/utils";
 import { computed } from "@ember/object";
 import { not } from "@ember/object/computed";
 import UtilsMixin from "select-kit/mixins/utils";
@@ -30,14 +30,18 @@ export default Component.extend(UtilsMixin, {
 
   @discourseComputed(
     "selectKit.options.filterPlaceholder",
-    "selectKit.options.translatedfilterPlaceholder"
+    "selectKit.options.translatedFilterPlaceholder"
   )
   placeholder(placeholder, translatedPlaceholder) {
-    return isEmpty(placeholder)
-      ? translatedPlaceholder
-        ? translatedPlaceholder
-        : ""
-      : I18n.t(placeholder);
+    if (isPresent(translatedPlaceholder)) {
+      return translatedPlaceholder;
+    }
+
+    if (isPresent(placeholder)) {
+      return I18n.t(placeholder);
+    }
+
+    return "";
   },
 
   actions: {