From 7a48b537c804e1307f125e7afdd02b5818e9f0fc Mon Sep 17 00:00:00 2001
From: echarp <manu@echarp.org>
Date: Sat, 28 Sep 2019 20:15:37 +0200
Subject: [PATCH] Day names are back, they were probably "shadowed" by a
 dependency...

---
 app/helpers/events_helper.rb | 2 +-
 config/locales/de.yml        | 1 +
 config/locales/en.yml        | 1 +
 config/locales/fr.yml        | 1 +
 config/locales/nl.yml        | 1 +
 config/locales/pt-BR.yml     | 1 +
 6 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb
index 05d8c2b08..52a7173a6 100644
--- a/app/helpers/events_helper.rb
+++ b/app/helpers/events_helper.rb
@@ -33,7 +33,7 @@ module EventsHelper
 
   def display_sameday(event)
     t 'date.formats.same_day',
-      date: l(event.start_time.to_date, format: :long),
+      date: l(event.start_time.to_date, format: :at),
       start: l(event.start_time, format: :hours),
       end: l(event.end_time, format: :hours)
   end
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 5485dc782..c70b58524 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -5,6 +5,7 @@ de:
       period: Vom %{start} bis zum %{end}.
       same_day: Am %{date} von %{start} bis %{end}.
       long: '%A %e %B %Y'
+      at: '%A %e %B %Y'
   time:
     formats:
       at: '%A %e %B %Y um %H:%M Uhr'
diff --git a/config/locales/en.yml b/config/locales/en.yml
index bcbb381e1..7788d253e 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -5,6 +5,7 @@ en:
       period: From %{start} to %{end}.
       same_day: On %{date} from %{start} to %{end}.
       long: '%A %e %B %Y'
+      at: '%A %e %B %Y'
   time:
     formats:
       at: '%A %e %B %Y at %Hh%M'
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index a56910340..0ac1a18d7 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -5,6 +5,7 @@ fr:
       period: Du %{start} au %{end}.
       same_day: Le %{date} de %{start} à %{end}.
       long: '%A %e %B %Y'
+      at: '%A %e %B %Y'
   time:
     formats:
       at: '%A %e %B %Y à %Hh%M'
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index b7ef308a2..cf40e9d4c 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -5,6 +5,7 @@ nl:
       period: Vanaf %{start} tot %{end}.
       same_day: De %{date} vanaf %{start} tot %{end}.
       long: '%A %e %B %Y'
+      at: '%A %e %B %Y'
   time:
     formats:
       at: '%A %e %B %Y om %Hu%M'
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index bac1e1f4b..c0fab8748 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -5,6 +5,7 @@ pt-BR:
       period: De %{start} até %{end}.
       same_day: Em %{date} - %{start} às %{end}.
       long: '%A, %e de %B de %Y'
+      at: '%A, %e de %B de %Y'
   time:
     formats:
       at: '%A, %e de %B de %Y às %Hh%M'
-- 
GitLab