diff --git a/app/assets/javascripts/admin/components/embedding-setting.js.es6 b/app/assets/javascripts/admin/components/embedding-setting.js.es6 index 039e5d5dc..f1d31fcf6 100644 --- a/app/assets/javascripts/admin/components/embedding-setting.js.es6 +++ b/app/assets/javascripts/admin/components/embedding-setting.js.es6 @@ -6,11 +6,6 @@ export default Ember.Component.extend({ @computed('field') inputId(field) { return field.dasherize(); }, - @computed('placeholder') - placeholderValue(placeholder) { - return placeholder ? I18n.t(placeholder) : null; - }, - @computed('field') translationKey(field) { return `admin.embedding.${field}`; }, @@ -21,7 +16,7 @@ export default Ember.Component.extend({ checked: { get(value) { return !!value; }, set(value) { - this.set('value', value); + this.set('value', value); return value; } } diff --git a/app/assets/javascripts/admin/templates/components/embedding-setting.hbs b/app/assets/javascripts/admin/templates/components/embedding-setting.hbs index e3a99c320..eb63c40af 100644 --- a/app/assets/javascripts/admin/templates/components/embedding-setting.hbs +++ b/app/assets/javascripts/admin/templates/components/embedding-setting.hbs @@ -5,7 +5,7 @@ {{else}} - {{input value=value id=inputId placeholder=placeholderValue}} + {{input value=value id=inputId placeholder=placeholder}} {{/if}}
diff --git a/app/assets/javascripts/admin/templates/embedding.hbs b/app/assets/javascripts/admin/templates/embedding.hbs index d41970fb8..30f279105 100644 --- a/app/assets/javascripts/admin/templates/embedding.hbs +++ b/app/assets/javascripts/admin/templates/embedding.hbs @@ -48,11 +48,11 @@ {{embedding-setting field="embed_whitelist_selector" value=embedding.embed_whitelist_selector - placeholder="admin.embedding.whitelist_example"}} + placeholder="article, #story, .post"}} {{embedding-setting field="embed_blacklist_selector" value=embedding.embed_blacklist_selector - placeholder="admin.embedding.blacklist_example"}} + placeholder=".ad-unit, header"}}
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index 64cec34cb..aa3fdaeb6 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -2607,9 +2607,7 @@ en: embed_username_key_from_feed: "Key to pull discourse username from feed" embed_truncate: "Truncate the embedded posts" embed_whitelist_selector: "CSS selector for elements that are allowed in embeds" - whitelist_example: "article, #story, .post" embed_blacklist_selector: "CSS selector for elements that are removed from embeds" - blacklist_example: ".ad-unit, header" feed_polling_enabled: "Import posts via RSS/ATOM" feed_polling_url: "URL of RSS/ATOM feed to crawl" save: "Save Embedding Settings"