From 3c67d6b934c1aa071ac72e8f2a42df428e33b6f5 Mon Sep 17 00:00:00 2001
From: Arnaud Levy <contact@arnaudlevy.com>
Date: Tue, 31 Oct 2023 18:30:29 +0100
Subject: [PATCH] two lines
---
Gemfile | 3 +--
Gemfile.lock | 2 +-
.../websites/agenda/events/_dates_static.html.erb | 9 +++++++--
3 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/Gemfile b/Gemfile
index adac6511d..82b5511e3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,7 +3,6 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
ruby "3.1.4"
-# Infrastructure
gem "activestorage-scaleway-service"#, path: "../activestorage-scaleway-service"
gem "active_storage_validations", "~> 1.0"
gem "angularjs-rails"
@@ -41,7 +40,7 @@ gem "has_scope", "~> 0.8.0"
gem "hash_dot"
gem "i18n_data", "~> 0.17.1"
gem "i18n_date_range"
-# gem "i18n_date_range", path: "../i18n_date_range"
+# gem "i18n_date_range", path: "../../noesya/i18n_date_range"
gem "image_processing"
gem "jbuilder"
gem "jquery-rails"
diff --git a/Gemfile.lock b/Gemfile.lock
index 9537e8a34..10ead274c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -290,7 +290,7 @@ GEM
concurrent-ruby (~> 1.0)
i18n_data (0.17.1)
simple_po_parser (~> 1.1)
- i18n_date_range (0.2.2)
+ i18n_date_range (1.0.3)
rails
rails-i18n
image_processing (1.12.2)
diff --git a/app/views/admin/communication/websites/agenda/events/_dates_static.html.erb b/app/views/admin/communication/websites/agenda/events/_dates_static.html.erb
index 37994b74c..0723bc756 100644
--- a/app/views/admin/communication/websites/agenda/events/_dates_static.html.erb
+++ b/app/views/admin/communication/websites/agenda/events/_dates_static.html.erb
@@ -7,9 +7,14 @@ indentation = ' ' * depth
<%= indentation %> archive: <%= event.archive? %>
<%= indentation %> computed:
<%= indentation %> short: >-
-<%= indentation %> <%= date_range_i18n(event.from_day, event.to_day) %>
+<%= indentation %> <%= date_range_i18n(event.from_day, event.to_day, format: :short) %>
<%= indentation %> long: >-
-<%= indentation %> <%= date_range_i18n(event.from_day, event.to_day, :long) %>
+<%= indentation %> <%= date_range_i18n(event.from_day, event.to_day, format: :long) %>
+<%= indentation %> two_lines:
+<%= indentation %> short: >-
+<%= indentation %> <%= date_range_i18n(event.from_day, event.to_day, format: :short, layout: :two_lines) %>
+<%= indentation %> long: >-
+<%= indentation %> <%= date_range_i18n(event.from_day, event.to_day, format: :long, layout: :two_lines) %>
<%= indentation %> from:
<%= indentation %> day: <%= event.from_day %>
<% if event.from_hour %>
--
GitLab