didadmin/docuseal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix date preview

Browse Source
This commit is contained in:
Pete Matsyburka
2026-05-05 20:54:00 +03:00
parent 3aa15d6ea6
commit 0875faa079
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/time_utils.rb
+3 -3
View File
@@ -92,9 +92,9 @@ module TimeUtils
end end
def format_date_preview(format, locale, timezone) 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] } 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:) 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) def format_date_string(string, format, locale, timezone: nil)
format = format.upcase if format && !format_with_time?(format) 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 = date =
if format_with_time?(format) if format_with_time?(format)