codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-11-23 23:58:31 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #3848 from gschlager/patch-2

Browse source 
Remove example CSS selectors from locale file
This commit is contained in:
Régis Hanol 2015-10-29 10:01:52 +01:00
commit b9437936ab
4 changed files with 4 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/assets/javascripts/admin/components/embedding-setting.js.es6
View file

@ -6,11 +6,6 @@ export default Ember.Component.extend({
@computed('field') @computed('field')
inputId(field) { return field.dasherize(); }, inputId(field) { return field.dasherize(); },
@computed('placeholder')
placeholderValue(placeholder) {
return placeholder ? I18n.t(placeholder) : null;
},
@computed('field') @computed('field')
translationKey(field) { return `admin.embedding.${field}`; }, translationKey(field) { return `admin.embedding.${field}`; },
@ -21,7 +16,7 @@ export default Ember.Component.extend({
checked: { checked: {
get(value) { return !!value; }, get(value) { return !!value; },
set(value) { set(value) {
this.set('value', value); this.set('value', value);
return value; return value;
} }
} }

2
app/assets/javascripts/admin/templates/components/embedding-setting.hbs
View file

@ -5,7 +5,7 @@
</label> </label>
{{else}} {{else}}
<label for={{inputId}}>{{i18n translationKey}}</label> <label for={{inputId}}>{{i18n translationKey}}</label>
{{input value=value id=inputId placeholder=placeholderValue}} {{input value=value id=inputId placeholder=placeholder}}
{{/if}} {{/if}}
<div class='clearfix'></div> <div class='clearfix'></div>

4
app/assets/javascripts/admin/templates/embedding.hbs
View file

@ -48,11 +48,11 @@
{{embedding-setting field="embed_whitelist_selector" {{embedding-setting field="embed_whitelist_selector"
value=embedding.embed_whitelist_selector value=embedding.embed_whitelist_selector
placeholder="admin.embedding.whitelist_example"}} placeholder="article, #story, .post"}}
{{embedding-setting field="embed_blacklist_selector" {{embedding-setting field="embed_blacklist_selector"
value=embedding.embed_blacklist_selector value=embedding.embed_blacklist_selector
placeholder="admin.embedding.blacklist_example"}} placeholder=".ad-unit, header"}}
</div> </div>
<div class='embedding-secondary'> <div class='embedding-secondary'>

2
config/locales/client.en.yml
View file

@ -2607,9 +2607,7 @@ en:
embed_username_key_from_feed: "Key to pull discourse username from feed" embed_username_key_from_feed: "Key to pull discourse username from feed"
embed_truncate: "Truncate the embedded posts" embed_truncate: "Truncate the embedded posts"
embed_whitelist_selector: "CSS selector for elements that are allowed in embeds" 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" 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_enabled: "Import posts via RSS/ATOM"
feed_polling_url: "URL of RSS/ATOM feed to crawl" feed_polling_url: "URL of RSS/ATOM feed to crawl"
save: "Save Embedding Settings" save: "Save Embedding Settings"