From: kibigo! Date: Fri, 8 Dec 2017 03:41:57 +0000 (-0800) Subject: Only localize js when there's a theme X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=1c728df92e46bda2d6823052d2cd7a019246b329;p=mastodon.git Only localize js when there's a theme --- diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 4d32c5035..20603678b 100755 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -19,10 +19,11 @@ = title = javascript_pack_tag "locales", integrity: true, crossorigin: 'anonymous' - - if @theme[:supported_locales].include? I18n.locale.to_s - = javascript_pack_tag "locales/#{@theme[:flavour]}/#{I18n.locale}", integrity: true, crossorigin: 'anonymous' - - elsif @theme[:supported_locales].include? 'en' - = javascript_pack_tag "locales/#{@theme[:flavour]}/en", integrity: true, 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' + - elsif @theme[:supported_locales].include? 'en' + = javascript_pack_tag "locales/#{@theme[:flavour]}/en", integrity: true, crossorigin: 'anonymous' = csrf_meta_tags = yield :header_tags