X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/6e0ca57e2f8a492c29d98264e7e74b3661b87308..0508d57ae4feea6d11412a164853eb939a554332:/app/views/layouts/_head.html.erb?ds=sidebyside diff --git a/app/views/layouts/_head.html.erb b/app/views/layouts/_head.html.erb index 646d3c88a..56c3051b2 100644 --- a/app/views/layouts/_head.html.erb +++ b/app/views/layouts/_head.html.erb @@ -3,11 +3,11 @@ <%= javascript_include_tag "application" %> + <%= javascript_include_tag "i18n/" + I18n.locale.to_s %> <%= stylesheet_link_tag "screen-#{dir}", :media => "screen" %> <%= stylesheet_link_tag "print-#{dir}", :media => "print" %> <%= stylesheet_link_tag "leaflet-all", :media => "screen, print" %> <% [57, 60, 72, 76, 114, 120, 144, 152, 180].each do |size| -%> @@ -33,10 +33,10 @@ <%= opengraph_tags(@title) %> <% if flash[:piwik_goal] -%> <%= tag("meta", :name => "piwik-goal", :content => flash[:piwik_goal]) %> - <% end -%> - <%= style_rules %> + <% end -%> <%= yield :head %> <%= yield :auto_discovery_link_tag %> <%= csrf_meta_tag %> - <%= t 'layouts.project_name.title' %><%= ' | ' + @title if @title %> + <%= csp_meta_tag %> + <%= @title + ' | ' if @title %><%= t 'layouts.project_name.title' %> <% end %>