From 11a6b61cbdd48acc2d97349095258b8894e7150a Mon Sep 17 00:00:00 2001
From: Gerhard Schlager <mail@gerhard-schlager.at>
Date: Sun, 11 Oct 2015 14:48:37 +0200
Subject: [PATCH] Remove example CSS selectors from locale file
---
.../javascripts/admin/components/embedding-setting.js.es6 | 7 +------
.../admin/templates/components/embedding-setting.hbs | 2 +-
app/assets/javascripts/admin/templates/embedding.hbs | 4 ++--
config/locales/client.en.yml | 2 --
4 files changed, 4 insertions(+), 11 deletions(-)
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 @@
</label>
{{else}}
<label for={{inputId}}>{{i18n translationKey}}</label>
- {{input value=value id=inputId placeholder=placeholderValue}}
+ {{input value=value id=inputId placeholder=placeholder}}
{{/if}}
<div class='clearfix'></div>
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"}}
</div>
<div class='embedding-secondary'>
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 1b1daeed9..1cf4db709 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -2595,9 +2595,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"