From 1f059d44cfd960b58cca9fc376b238be8378b394 Mon Sep 17 00:00:00 2001
From: Alceu Medeiros <alceu.medeiros@codeminer42.com>
Date: Mon, 18 Feb 2019 17:42:16 -0300
Subject: [PATCH] Set current locale as default for datepicker translation

---
 app/assets/javascripts/advanced_search.js.coffee | 7 ++-----
 app/views/shared/_locale_switcher.html.erb       | 2 +-
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/app/assets/javascripts/advanced_search.js.coffee b/app/assets/javascripts/advanced_search.js.coffee
index fbbc77ce0..9503e02c9 100644
--- a/app/assets/javascripts/advanced_search.js.coffee
+++ b/app/assets/javascripts/advanced_search.js.coffee
@@ -17,14 +17,11 @@ App.AdvancedSearch =
 
   init_calendar: ->
     locale = $("#js-locale").data("current-locale")
-    if locale == "en"
-      locale = ""
 
     $(".js-calendar").datepicker
-      regional: locale
       maxDate: "+0d"
-    $(".js-calendar-full").datepicker
-      regional: locale
+    $(".js-calendar-full").datepicker()
+    $.datepicker.setDefaults($.datepicker.regional[locale])
 
   initialize: ->
     App.AdvancedSearch.init_calendar()
diff --git a/app/views/shared/_locale_switcher.html.erb b/app/views/shared/_locale_switcher.html.erb
index aacb402db..c62d2a53d 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 %>
-  <div class="locale" id="js-locale" data-current-local="<%= I18n.locale %>">
+  <div class="locale" id="js-locale" data-current-locale="<%= I18n.locale %>">
     <form class="locale-form">
       <label class="inline-block" for="locale-switcher">
         <%= t("layouts.header.locale") %>