diff --git a/Gemfile b/Gemfile index adac6511dd369e7771746f8528a8a8c48c5762b2..82b5511e3b277b46949fa3410bf513563ace3d5b 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 9537e8a3416c2ba5561db4bc68c90d4b88bb0d96..10ead274c16a88615862c09ee661ba96f8ec4940 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 37994b74c3d921be4d9aaa1871830d26ad9837fc..0723bc7565c8e4e475ee947a6f8d01b7cf5d13ee 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 %>