diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 2267ec529..7e77ea383 100755 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -29,9 +29,9 @@ = javascript_pack_tag "common", crossorigin: 'anonymous' - if @theme - if @theme[:supported_locales].include? I18n.locale.to_s - = preload_pack_asset "locales/#{@theme[:flavour]}/#{I18n.locale}-json.js" + = preload_pack_asset "locales/#{@theme[:flavour]}/#{I18n.locale}-json.js", crossorigin: 'anonymous' - elsif @theme[:supported_locales].include? 'en' - = preload_pack_asset "locales/#{@theme[:flavour]}/en-json.js" + = preload_pack_asset "locales/#{@theme[:flavour]}/en-json.js", crossorigin: 'anonymous' = csrf_meta_tags unless skip_csrf_meta_tags? %meta{ name: 'style-nonce', content: request.content_security_policy_nonce } diff --git a/app/views/layouts/embedded.html.haml b/app/views/layouts/embedded.html.haml index 42f61a180..545e4f538 100644 --- a/app/views/layouts/embedded.html.haml +++ b/app/views/layouts/embedded.html.haml @@ -15,9 +15,9 @@ = javascript_pack_tag 'common', crossorigin: 'anonymous' - if @theme - if @theme[:supported_locales].include? I18n.locale.to_s - = preload_pack_asset "locales/#{@theme[:flavour]}/#{I18n.locale}-json.js" + = preload_pack_asset "locales/#{@theme[:flavour]}/#{I18n.locale}-json.js", crossorigin: 'anonymous' - elsif @theme[:supported_locales].include? 'en' - = preload_pack_asset "locales/#{@theme[:flavour]}/en-json.js" + = preload_pack_asset "locales/#{@theme[:flavour]}/en-json.js", crossorigin: 'anonymous' = render partial: 'layouts/theme', object: @core = render partial: 'layouts/theme', object: @theme diff --git a/app/views/media/player.html.haml b/app/views/media/player.html.haml index d34e15538..486c177a4 100644 --- a/app/views/media/player.html.haml +++ b/app/views/media/player.html.haml @@ -3,9 +3,9 @@ = javascript_pack_tag 'common', crossorigin: 'anonymous' - if @theme - if @theme[:supported_locales].include? I18n.locale.to_s - = preload_pack_asset "locales/#{@theme[:flavour]}/#{I18n.locale}-json.js" + = preload_pack_asset "locales/#{@theme[:flavour]}/#{I18n.locale}-json.js", crossorigin: 'anonymous' - elsif @theme[:supported_locales].include? 'en' - = preload_pack_asset "locales/#{@theme[:flavour]}/en-json.js" + = preload_pack_asset "locales/#{@theme[:flavour]}/en-json.js", crossorigin: 'anonymous' = render partial: 'layouts/theme', object: @core = render partial: 'layouts/theme', object: @theme