tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into glitch-soc/merge-upstream

Browse Source
This commit is contained in:
Thibaut Girka
2020-11-07 18:19:34 +01:00
parent 5a9fc749c3 ee8cf246cf
commit 412218af2e
56 changed files with 403 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/views/media/player.html.haml
View File

@ -1,11 +1,11 @@
- content_for :header_tags do
= 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