diff --git a/app/helpers/repository_datatable_helper.rb b/app/helpers/repository_datatable_helper.rb index bd7c6ac45..08500cbd3 100644 --- a/app/helpers/repository_datatable_helper.rb +++ b/app/helpers/repository_datatable_helper.rb @@ -68,6 +68,6 @@ module RepositoryDatatableHelper def display_cell_value(cell) "RepositoryDatatable::#{cell.repository_column.data_type}Serializer" - .constantize.new(cell, user: current_user).serializable_hash + .constantize.new(cell).serializable_hash end end diff --git a/app/serializers/repository_datatable/repository_date_range_value_serializer.rb b/app/serializers/repository_datatable/repository_date_range_value_serializer.rb index 47cf9c3d5..cfdd3019a 100644 --- a/app/serializers/repository_datatable/repository_date_range_value_serializer.rb +++ b/app/serializers/repository_datatable/repository_date_range_value_serializer.rb @@ -5,9 +5,8 @@ module RepositoryDatatable attributes :value, :value_type def value - date_time_format = @instance_options[:user].settings[:date_format] cell = object.repository_date_time_range_value - cell.start_time.strftime(date_time_format) + ' - ' + cell.end_time.strftime(date_time_format) + I18n.l(cell.start_time, format: :full_date) + ' - ' + I18n.l(cell.end_time, format: :full_date) end end end diff --git a/app/serializers/repository_datatable/repository_date_time_range_value_serializer.rb b/app/serializers/repository_datatable/repository_date_time_range_value_serializer.rb index 84d4072a1..b672fe9cb 100644 --- a/app/serializers/repository_datatable/repository_date_time_range_value_serializer.rb +++ b/app/serializers/repository_datatable/repository_date_time_range_value_serializer.rb @@ -5,9 +5,8 @@ module RepositoryDatatable attributes :value, :value_type def value - date_time_format = @instance_options[:user].settings[:date_format] + ', %H:%M' cell = object.repository_date_time_range_value - cell.start_time.strftime(date_time_format) + ' - ' + cell.end_time.strftime(date_time_format) + I18n.l(cell.start_time, format: :full_with_comma) + ' - ' + I18n.l(cell.end_time, format: :full_with_comma) end end end diff --git a/app/serializers/repository_datatable/repository_date_time_value_serializer.rb b/app/serializers/repository_datatable/repository_date_time_value_serializer.rb index 588f64087..3f7d1b50c 100644 --- a/app/serializers/repository_datatable/repository_date_time_value_serializer.rb +++ b/app/serializers/repository_datatable/repository_date_time_value_serializer.rb @@ -5,9 +5,8 @@ module RepositoryDatatable attributes :value, :value_type def value - date_time_format = @instance_options[:user].settings[:date_format] + ', %H:%M' cell = object.repository_date_time_value - cell.data.strftime(date_time_format) + I18n.l(cell.data, format: :full_with_comma) end end end diff --git a/app/serializers/repository_datatable/repository_date_value_serializer.rb b/app/serializers/repository_datatable/repository_date_value_serializer.rb index 4813d20b8..2dc01895d 100644 --- a/app/serializers/repository_datatable/repository_date_value_serializer.rb +++ b/app/serializers/repository_datatable/repository_date_value_serializer.rb @@ -5,9 +5,8 @@ module RepositoryDatatable attributes :value, :value_type def value - date_time_format = @instance_options[:user].settings[:date_format] cell = object.repository_date_time_value - cell.data.strftime(date_time_format) + I18n.l(cell.data, format: :full_date) end end end diff --git a/app/serializers/repository_datatable/repository_time_range_value_serializer.rb b/app/serializers/repository_datatable/repository_time_range_value_serializer.rb index 1b649ae50..e6cd3c058 100644 --- a/app/serializers/repository_datatable/repository_time_range_value_serializer.rb +++ b/app/serializers/repository_datatable/repository_time_range_value_serializer.rb @@ -5,9 +5,8 @@ module RepositoryDatatable attributes :value, :value_type def value - date_time_format = '%H:%M' cell = object.repository_date_time_range_value - cell.start_time.strftime(date_time_format) + ' - ' + cell.end_time.strftime(date_time_format) + I18n.l(cell.start_time, format: :time) + ' - ' + I18n.l(cell.end_time, format: :time) end end end diff --git a/app/serializers/repository_datatable/repository_time_value_serializer.rb b/app/serializers/repository_datatable/repository_time_value_serializer.rb index 3c7a6b638..eb74e6d89 100644 --- a/app/serializers/repository_datatable/repository_time_value_serializer.rb +++ b/app/serializers/repository_datatable/repository_time_value_serializer.rb @@ -5,9 +5,8 @@ module RepositoryDatatable attributes :value, :value_type def value - date_time_format = '%H:%M' cell = object.repository_date_time_value - cell.data.strftime(date_time_format) + I18n.l(cell.data, format: :time) end end end diff --git a/config/locales/en.yml b/config/locales/en.yml index b6c53008e..5e8a1c991 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1922,6 +1922,7 @@ en: full_js: "D.M.YYYY HH:mm" full: "%{date_format} %H:%M" full_with_tz: "%{date_format} %H:%M %z" + full_with_comma: "%{date_format}, %H:%M" full_date: "%{date_format}" time: "%H:%M" short: "%H"