IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

REFACTOR: s/translatedfilterPlaceholder/translatedFilterPlaceholder (#9521)

Browse Source
This commit is contained in:
Joffrey JAFFEUX
2020-04-22 20:39:55 +02:00
committed by GitHub
parent 4c248fc5c4
commit 00f632fb0d
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/select-kit/components/select-kit.js
View File

@@ -257,7 +257,7 @@ export default Component.extend(
autoFilterable: "autoFilterable", autoFilterable: "autoFilterable",
filterIcon: "search", filterIcon: "search",
filterPlaceholder: "filterPlaceholder", filterPlaceholder: "filterPlaceholder",
translatedfilterPlaceholder: null, translatedFilterPlaceholder: null,
icon: null, icon: null,
icons: null, icons: null,
maximum: null, maximum: null,

18
app/assets/javascripts/select-kit/components/select-kit/select-kit-filter.js
View File

@@ -1,6 +1,6 @@
import Component from "@ember/component"; import Component from "@ember/component";
import discourseComputed from "discourse-common/utils/decorators"; import discourseComputed from "discourse-common/utils/decorators";
import { isEmpty } from "@ember/utils"; import { isPresent } from "@ember/utils";
import { computed } from "@ember/object"; import { computed } from "@ember/object";
import { not } from "@ember/object/computed"; import { not } from "@ember/object/computed";
import UtilsMixin from "select-kit/mixins/utils"; import UtilsMixin from "select-kit/mixins/utils";
@@ -30,14 +30,18 @@ export default Component.extend(UtilsMixin, {
@discourseComputed( @discourseComputed(
"selectKit.options.filterPlaceholder", "selectKit.options.filterPlaceholder",
"selectKit.options.translatedfilterPlaceholder" "selectKit.options.translatedFilterPlaceholder"
) )
placeholder(placeholder, translatedPlaceholder) { placeholder(placeholder, translatedPlaceholder) {
return isEmpty(placeholder) if (isPresent(translatedPlaceholder)) {
? translatedPlaceholder return translatedPlaceholder;
? translatedPlaceholder }
: ""
: I18n.t(placeholder); if (isPresent(placeholder)) {
return I18n.t(placeholder);
}
return "";
}, },
actions: { actions: {