Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Allow untranslated plugins to set modal body titles

This commit is contained in:
Robin Ward 2016-12-01 15:37:24 -05:00
parent 576a424130
commit 4f44713e8e
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse-common/resolver.js.es6
View File

@ -135,7 +135,7 @@ export function buildResolver(baseName) {
}, },
findPluginTemplate(parsedName) { findPluginTemplate(parsedName) {
var pluginParsedName = this.parseName(parsedName.fullName.replace("template:", "template:javascripts/")); const pluginParsedName = this.parseName(parsedName.fullName.replace("template:", "template:javascripts/"));
return this.findTemplate(pluginParsedName); return this.findTemplate(pluginParsedName);
}, },

2
app/assets/javascripts/discourse/components/d-modal-body.js.es6
View File

@ -28,7 +28,7 @@ export default Ember.Component.extend({
} }
} }
this.appEvents.trigger('modal:body-shown', this.getProperties('title')); this.appEvents.trigger('modal:body-shown', this.getProperties('title', 'rawTitle'));
}, },
_flash(msg) { _flash(msg) {

2
app/assets/javascripts/discourse/components/d-modal.js.es6
View File

@ -19,6 +19,8 @@ export default Ember.Component.extend({
this.appEvents.on('modal:body-shown', data => { this.appEvents.on('modal:body-shown', data => {
if (data.title) { if (data.title) {
this.set('title', I18n.t(data.title)); this.set('title', I18n.t(data.title));
} else if (data.rawTitle) {
this.set('title', data.rawTitle);
} }
}); });
}, },