Merge pull request #2540 from ivanzotov/master

Fix momentjs translations for '%-d' format day of the month
railsadminteam · Jan 30, 2016 · 920cbcc · 920cbcc
2 parents 1c1218f + fb52621
commit 920cbcc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/lib/rails_admin/support/datetime.rb b/lib/rails_admin/support/datetime.rb
@@ -10,6 +10,7 @@ class Datetime
         '%b' => 'MMM',        # The abbreviated month name ("Jan")
         '%B' => 'MMMM',       # The  full  month  name ("January")
         '%d' => 'DD',         # Day of the month (01..31)
+        '%-d' => 'D',         # Day of the month (1..31)
         '%D' => 'MM/DD/YY',   # American date format mm/dd/yy
         '%e' => 'D',          # Day of the month (1..31)
         '%F' => 'YY-MM-DD',   # ISO 8601 date format

diff --git a/spec/rails_admin/support/datetime_spec.rb b/spec/rails_admin/support/datetime_spec.rb
@@ -8,6 +8,7 @@
       '%D de %M de %Y, %H:%M:%S' => 'MM/DD/YY [de] mm [de] YYYY, HH:mm:ss',
       '%d/%-m/%Y, %H:%M:%S' => 'DD/M/YYYY, HH:mm:ss',
       '%d de %B de %Y' => 'DD [de] MMMM [de] YYYY',
+      '%-d %B %Y' => 'D MMMM YYYY',
     }.each do |strftime_format, momentjs_format|
       it "convert strftime_format to momentjs_format - example #{strftime_format}" do
         strftime_format = RailsAdmin::Support::Datetime.new(strftime_format)