mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-10-19 05:54:43 +00:00
85722a918d
Conflicts: - `.github/dependabot.yml`: Updated upstream, but we've deleted it. Keep it deleted. - `app/javascript/mastodon/locales/index.js`: Reworked upstream, but the code was mostly in `app/javascript/locales/index.js` in glitch-soc. Updated that file accordingly. - `app/javascript/packs/public.jsx`: Not a real conflict, but different imports in glitch-soc and upstream. - `app/views/layouts/application.html.haml`: Conflict due to locales loading and theme system discrepancies. Updated in our own way. - `app/views/layouts/embedded.html.haml`: Conflict due to locales loading and theme system discrepancies. Updated in our own way. - `config/webpack/generateLocalePacks.js`: Deleted upstream, as upstream now directly loads the JSON at runtime. Deleted as well, will switch to runtime loading in an upcoming commit. - `config/webpack/shared.js`: Not a real conflict, but different imports in glitch-soc and upstream. - `config/webpack/translationRunner.js`: Mostly deleted upstream, to be replaced with `formatjs-formatter.js` instead. Moved the glitch-soc logic there and deleted the file.
29 lines
947 B
Plaintext
29 lines
947 B
Plaintext
!!! 5
|
|
%html{ lang: I18n.locale }
|
|
%head
|
|
%meta{ charset: 'utf-8' }/
|
|
%meta{ name: 'robots', content: 'noindex' }/
|
|
|
|
- if cdn_host?
|
|
%link{ rel: 'dns-prefetch', href: cdn_host }/
|
|
%meta{ name: 'cdn-host', content: cdn_host }/
|
|
|
|
- if storage_host?
|
|
%link{ rel: 'dns-prefetch', href: storage_host }/
|
|
|
|
= render_initial_state
|
|
= javascript_pack_tag 'locales', crossorigin: 'anonymous'
|
|
- if @theme
|
|
- if @theme[:supported_locales].include? I18n.locale.to_s
|
|
= preload_pack_asset "locales/#{@theme[:flavour]}/#{I18n.locale}-json.js"
|
|
- elsif @theme[:supported_locales].include? 'en'
|
|
= preload_pack_asset "locales/#{@theme[:flavour]}/en-json.js"
|
|
= render partial: 'layouts/theme', object: @core
|
|
= render partial: 'layouts/theme', object: @theme
|
|
|
|
%body.embed
|
|
= yield
|
|
|
|
.logo-resources{ 'tabindex' => '-1', 'inert' => true, 'aria-hidden' => true }
|
|
= render_symbol :icon
|