diff options
author | ThibG <thib@sitedethib.com> | 2020-11-07 21:47:31 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-11-07 21:47:31 +0100 |
commit | cfb16b9b70a50ec5451c9aebb2c35d3a44701311 (patch) | |
tree | 6ba298899b376d0c8862d77c1e34339a08dc3121 /app/views/layouts/embedded.html.haml | |
parent | 5a9fc749c3eab8d3c93dd282fa89c20a5cb0e994 (diff) | |
parent | e4d62042bdb3b0d675c2367b4c48a2a48647af5e (diff) |
Merge pull request #1453 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/views/layouts/embedded.html.haml')
-rw-r--r-- | app/views/layouts/embedded.html.haml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/views/layouts/embedded.html.haml b/app/views/layouts/embedded.html.haml index 69b206f69..431bd260c 100644 --- a/app/views/layouts/embedded.html.haml +++ b/app/views/layouts/embedded.html.haml @@ -12,12 +12,12 @@ %link{ rel: 'dns-prefetch', href: storage_host }/ = render_initial_state - = javascript_pack_tag "locales", integrity: true, crossorigin: 'anonymous' + = javascript_pack_tag "locales", crossorigin: 'anonymous' - if @theme - if @theme[:supported_locales].include? I18n.locale.to_s - = javascript_pack_tag "locales/#{@theme[:flavour]}/#{I18n.locale}", integrity: true, crossorigin: 'anonymous' + = javascript_pack_tag "locales/#{@theme[:flavour]}/#{I18n.locale}", crossorigin: 'anonymous' - elsif @theme[:supported_locales].include? 'en' - = javascript_pack_tag "locales/#{@theme[:flavour]}/en", integrity: true, crossorigin: 'anonymous' + = javascript_pack_tag "locales/#{@theme[:flavour]}/en", crossorigin: 'anonymous' = render partial: 'layouts/theme', object: @core = render partial: 'layouts/theme', object: @theme |