From 554bc926c7b9c739a88da79b3273046305aee54b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Thu, 24 Jun 2021 23:55:15 +0200 Subject: [PATCH] Get current locale from the lang HTML attribute The language attribute is present in all layouts since commit 025923ac4, so there's no need to use the language selector locale. Besides, it wouldn't work if there's only one locale and the language selector isn't shown. --- app/assets/javascripts/datepicker.js | 2 +- app/views/shared/_locale_switcher.html.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/datepicker.js b/app/assets/javascripts/datepicker.js index 8299833cd..1e483ea6a 100644 --- a/app/assets/javascripts/datepicker.js +++ b/app/assets/javascripts/datepicker.js @@ -17,7 +17,7 @@ App.Datepicker = { initialize: function() { var locale; - locale = $("#js-locale").data("current-locale"); + locale = document.documentElement.lang; $(".js-calendar").datepicker({ maxDate: "+0d" }); diff --git a/app/views/shared/_locale_switcher.html.erb b/app/views/shared/_locale_switcher.html.erb index c62d2a53d..294badcb8 100644 --- a/app/views/shared/_locale_switcher.html.erb +++ b/app/views/shared/_locale_switcher.html.erb @@ -1,5 +1,5 @@ <% if I18n.available_locales.size > 1 %> -
+