From 0875faa0796045356573518eca31f1680543cecf Mon Sep 17 00:00:00 2001 From: Pete Matsyburka Date: Tue, 5 May 2026 20:54:00 +0300 Subject: [PATCH] fix date preview --- lib/time_utils.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/time_utils.rb b/lib/time_utils.rb index c7c26bcc..4971b77c 100644 --- a/lib/time_utils.rb +++ b/lib/time_utils.rb @@ -92,9 +92,9 @@ module TimeUtils end def format_date_preview(format, locale, timezone) - return '' if format.blank? + format = format.upcase if format && !format_with_time?(format) + format = format.presence || (locale.to_s.ends_with?('US') ? DEFAULT_DATE_FORMAT_US : DEFAULT_DATE_FORMAT) - format = format.upcase unless format_with_time?(format) preview_pattern = format.gsub(TOKEN_REGEX) { |token| TIME_FORMATS.key?(token) ? '--' : ALL_FORMATS[token] } I18n.l(Time.current.in_time_zone(timezone.presence || Time.zone.name), format: preview_pattern, locale:) @@ -122,7 +122,7 @@ module TimeUtils def format_date_string(string, format, locale, timezone: nil) format = format.upcase if format && !format_with_time?(format) - format ||= locale.to_s.ends_with?('US') ? DEFAULT_DATE_FORMAT_US : DEFAULT_DATE_FORMAT + format = format.presence || (locale.to_s.ends_with?('US') ? DEFAULT_DATE_FORMAT_US : DEFAULT_DATE_FORMAT) date = if format_with_time?(format)