From d95ebf53a31e6e5963d70faae522ac9db5b8d59c Mon Sep 17 00:00:00 2001 From: Eric Schultz Date: Mon, 18 Nov 2019 17:32:57 -0600 Subject: [PATCH] Onboard loads properly! --- app/javascript/i18n.js.erb | 9 +++++---- app/views/layouts/apified.html.erb | 6 +----- app/views/onboard/index.html.erb | 2 +- javascripts/src/components/common/Root.tsx | 2 +- 4 files changed, 8 insertions(+), 11 deletions(-) diff --git a/app/javascript/i18n.js.erb b/app/javascript/i18n.js.erb index 4c45aa88..3c079cd3 100644 --- a/app/javascript/i18n.js.erb +++ b/app/javascript/i18n.js.erb @@ -1,7 +1,8 @@ -import I18n from 'i18n-js'; +const I18n = require('i18n-js'); -I18n.translations || (I18n.translations = {}); +I18n.translations = I18n.translations || {}; <% I18n::JS::translations.each do |k,v| %> <% byebug %> -I18n.translations[<%= k %>] = I18n.extend((I18n.translations[<%= k %>] || {}),<%= JSON.generate(v) %>); -<% end %> \ No newline at end of file +I18n.translations['<%= k %>'] = I18n.extend((I18n.translations['<%= k %>'] || {}),<%= JSON.generate(v) %>); +<% end %> +module.exports = I18n; \ No newline at end of file diff --git a/app/views/layouts/apified.html.erb b/app/views/layouts/apified.html.erb index f5ffbf51..6dc8f0dd 100644 --- a/app/views/layouts/apified.html.erb +++ b/app/views/layouts/apified.html.erb @@ -6,8 +6,8 @@ <%= "#{yield(:title)} - #{Settings.general.name}" %> - <%= IncludeAsset.js '/client/js/i18n.js' %>