From f28bde520699b0ad2ea0f2c40aa0b8dff9e3814c Mon Sep 17 00:00:00 2001 From: Angus McLeod Date: Thu, 14 May 2020 13:42:11 +1000 Subject: [PATCH] I18n is now imported --- assets/javascripts/wizard-preload.js.es6 | 2 ++ .../javascripts/wizard/components/custom-user-selector.js.es6 | 1 + .../javascripts/wizard/components/wizard-field-upload.js.es6 | 1 + assets/javascripts/wizard/components/wizard-text-field.js.es6 | 1 + assets/javascripts/wizard/routes/custom-step.js.es6 | 2 ++ views/layouts/wizard.html.erb | 3 ++- 6 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 assets/javascripts/wizard-preload.js.es6 diff --git a/assets/javascripts/wizard-preload.js.es6 b/assets/javascripts/wizard-preload.js.es6 new file mode 100644 index 00000000..0cf785fa --- /dev/null +++ b/assets/javascripts/wizard-preload.js.es6 @@ -0,0 +1,2 @@ +//= require discourse-loader +//= require locales/i18n \ No newline at end of file diff --git a/assets/javascripts/wizard/components/custom-user-selector.js.es6 b/assets/javascripts/wizard/components/custom-user-selector.js.es6 index 143b340c..dfc45604 100644 --- a/assets/javascripts/wizard/components/custom-user-selector.js.es6 +++ b/assets/javascripts/wizard/components/custom-user-selector.js.es6 @@ -1,6 +1,7 @@ import { default as computed, observes } from 'discourse-common/utils/decorators'; import { renderAvatar } from 'discourse/helpers/user-avatar'; import userSearch from '../lib/user-search'; +import I18n from "I18n"; const template = function(params) { const options = params.options; diff --git a/assets/javascripts/wizard/components/wizard-field-upload.js.es6 b/assets/javascripts/wizard/components/wizard-field-upload.js.es6 index 58faff14..2241c940 100644 --- a/assets/javascripts/wizard/components/wizard-field-upload.js.es6 +++ b/assets/javascripts/wizard/components/wizard-field-upload.js.es6 @@ -1,5 +1,6 @@ import getUrl from "discourse-common/lib/get-url"; import { getToken } from "wizard/lib/ajax"; +import I18n from "I18n"; export default Ember.Component.extend({ classNames: ["wizard-field-upload"], diff --git a/assets/javascripts/wizard/components/wizard-text-field.js.es6 b/assets/javascripts/wizard/components/wizard-text-field.js.es6 index 5c62abc8..8e4570a7 100644 --- a/assets/javascripts/wizard/components/wizard-text-field.js.es6 +++ b/assets/javascripts/wizard/components/wizard-text-field.js.es6 @@ -2,6 +2,7 @@ import computed from "discourse-common/utils/decorators"; import { siteDir, isRTL, isLTR } from "discourse/lib/text-direction"; +import I18n from "I18n"; export default Ember.TextField.extend({ attributeBindings: ['autocorrect', 'autocapitalize', 'autofocus', 'maxLength', 'dir'], diff --git a/assets/javascripts/wizard/routes/custom-step.js.es6 b/assets/javascripts/wizard/routes/custom-step.js.es6 index bba4b49f..72dd5263 100644 --- a/assets/javascripts/wizard/routes/custom-step.js.es6 +++ b/assets/javascripts/wizard/routes/custom-step.js.es6 @@ -1,3 +1,5 @@ +import I18n from "I18n"; + export default Ember.Route.extend({ model(params) { const appModel = this.modelFor('custom'); diff --git a/views/layouts/wizard.html.erb b/views/layouts/wizard.html.erb index 47d54309..2f94a767 100644 --- a/views/layouts/wizard.html.erb +++ b/views/layouts/wizard.html.erb @@ -11,7 +11,8 @@ <%- if theme_ids.present? %> <%= discourse_stylesheet_link_tag (mobile_view? ? :mobile_theme : :desktop_theme) %> <%- end %> - + + <%= preload_script "wizard-preload" %> <%= preload_script "ember_jquery" %> <%= preload_script "wizard-vendor" %> <%= preload_script "wizard-application" %>