Merge 6c7359f into 782d4dd

railsadminteam · Jul 20, 2020 · 7c7bf32 · 7c7bf32
2 parents 782d4dd + 6c7359f
commit 7c7bf32
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/lib/rails_admin/support/datetime.rb b/lib/rails_admin/support/datetime.rb
@@ -34,16 +34,16 @@ def delocalize(date_string, format)
             case match
             when '%A'
               english = ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"]
-              day_names.each_with_index { |d, i| date_string = date_string.gsub(/#{d}/, english[i]) }
+              day_names.each_with_index { |d, i| date_string = date_string.gsub(/\b#{d}\b/, english[i]) }
             when '%a'
               english = ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"]
-              abbr_day_names.each_with_index { |d, i| date_string = date_string.gsub(/#{d}/, english[i]) }
+              abbr_day_names.each_with_index { |d, i| date_string = date_string.gsub(/\b#{d}\b/, english[i]) }
             when '%B'
               english = [nil, "January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"][1..-1]
-              month_names.each_with_index { |m, i| date_string = date_string.gsub(/#{m}/, english[i]) }
+              month_names.each_with_index { |m, i| date_string = date_string.gsub(/\b#{m}\b/, english[i]) }
             when '%b'
               english = [nil, "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"][1..-1]
-              abbr_month_names.each_with_index { |m, i| date_string = date_string.gsub(/#{m}/, english[i]) }
+              abbr_month_names.each_with_index { |m, i| date_string = date_string.gsub(/\b#{m}\b/, english[i]) }
             when '%p'
               date_string = date_string.gsub(/#{::I18n.t('date.time.am', default: "am")}/, 'am')
               date_string = date_string.gsub(/#{::I18n.t('date.time.pm', default: "pm")}/, 'pm')