Merge remote-tracking branch 'upstream/pull/5081'

[rails.git] / app / views / layouts / _head.html.erb

diff --git a/app/views/layouts/_head.html.erb b/app/views/layouts/_head.html.erb
index 40d5e6200885b7839d54c78f33952363d9fa385a..3c691612ab1d4c37ec1ad7a0f8c001b334e50272 100644 (file)
--- a/app/views/layouts/_head.html.erb
+++ b/app/views/layouts/_head.html.erb
@@ -1,11 +1,10 @@
 <%= tag.head :data => application_data do %>
   <meta http-equiv="X-UA-Compatible" content="IE=edge" />
 <%= tag.head :data => application_data do %>
   <meta http-equiv="X-UA-Compatible" content="IE=edge" />

-  <meta name="viewport" content="width=device-width, minimum-scale=1.0, maximum-scale=1.0" />
-  <%= javascript_include_tag "html5shiv" unless browser.html5? %>
-  <%= javascript_include_tag "es5" unless browser.es5? %>
+  <meta name="viewport" content="width=device-width, initial-scale=1">

   <%= javascript_include_tag "es6" unless browser.es6? %>
   <%= javascript_include_tag "es6" unless browser.es6? %>

+  <%= javascript_include_tag "turbo", :type => "module" %>

   <%= javascript_include_tag "application" %>
   <%= javascript_include_tag "application" %>

-  <%= javascript_include_tag "i18n/" + I18n.locale.to_s %>
+  <%= javascript_include_tag "i18n/#{I18n.locale}" %>

   <%= stylesheet_link_tag "screen-#{dir}", :media => "screen" %>
   <%= stylesheet_link_tag "print-#{dir}", :media => "print" %>
   <%= stylesheet_link_tag "leaflet-all", :media => "screen, print" %>
   <%= stylesheet_link_tag "screen-#{dir}", :media => "screen" %>
   <%= stylesheet_link_tag "print-#{dir}", :media => "print" %>
   <%= stylesheet_link_tag "leaflet-all", :media => "screen, print" %>


@@ -14,5 +13,5 @@
   <%= yield :auto_discovery_link_tag %>
   <%= csrf_meta_tag %>
   <%= csp_meta_tag %>
   <%= yield :auto_discovery_link_tag %>
   <%= csrf_meta_tag %>
   <%= csp_meta_tag %>

-  <title><%= @title + " | " if @title %><%= t "layouts.project_name.title" %></title>
+  <title><%= "#{@title} | " if @title %><%= t "layouts.project_name.title" %></title>

 <% end %>
 <% end %>