Update date and datetime formats to use administrate_date_default and administrate_datetime_default

Author: goosys

lib/administrate/field/date.rb

@@ -13,7 +13,7 @@ def date
       private
 
       def format
-        options.fetch(:format, :administrate_default)
+        options.fetch(:format, :administrate_date_default)
       end
 
       def timezone

lib/administrate/field/date_time.rb

@@ -6,21 +6,21 @@ class DateTime < Base
       def date
         I18n.localize(
           data.in_time_zone(timezone).to_date,
-          format: format
+          format: format(type: :date)
         )
       end
 
       def datetime
         I18n.localize(
           data.in_time_zone(timezone),
-          format: format
+          format: format(type: :datetime)
         )
       end
 
       private
 
-      def format
-        options.fetch(:format, :administrate_default)
+      def format(type: :date)
+        options.fetch(:format, :"administrate_#{type}_default")
       end
 
       def timezone

spec/example_app/config/locales/en.yml

@@ -5,7 +5,7 @@ en:
         "%m/%d/%Y"
       with_weekday:
         "%a %m/%d/%y"
-      administrate_default:
+      administrate_date_default:
         "%m/%d/%Y"
 
   helpers:
@@ -22,7 +22,7 @@ en:
         "%b %-d, %Y"
       short:
         "%B %d"
-      administrate_default:
+      administrate_datetime_default:
         "%a, %b %-d, %Y at %r"
       administrate_time_default:
         "%I:%M%p"

spec/lib/fields/date_spec.rb

@@ -6,12 +6,21 @@
   let(:formats) do
     {
       date: {
-        formats: {default: "%m/%d/%Y", short: "%b %d"},
+        formats: {
+          default: "%m/%d/%Y",
+          short: "%b %d",
+          administrate_date_default: "%m/%d, %Y"
+        },
         abbr_month_names: Array.new(13) { |i| "Dec" if i == 12 },
         abbr_day_names: Array.new(7) { |i| "Fri" if i == 5 }
       },
       time: {
-        formats: {default: "%a, %b %-d, %Y", short: "%d %b"}
+        formats: {
+          default: "%a, %b %-d, %Y at %r",
+          short: "%d %b %H:%M",
+          administrate_datetime_default: "%a, %b %-d, %Y, %r",
+          administrate_time_default: "%I:%M%p"
+        }
       }
     }
   end
@@ -21,7 +30,7 @@
       with_translations(:en, formats) do
         field = Administrate::Field::Date
           .new(:start_date, start_date, :show)
-        expect(field.date).to eq("12/25/2015")
+        expect(field.date).to eq("12/25, 2015")
       end
     end
 

spec/lib/fields/date_time_spec.rb

@@ -9,7 +9,7 @@
         formats: {
           default: "%m/%d/%Y",
           short: "%b %d",
-          administrate_default: "%m/%d, %Y"
+          administrate_date_default: "%m/%d, %Y"
         },
         abbr_month_names: Array.new(13) { |i| "Dec" if i == 12 },
         abbr_day_names: Array.new(7) { |i| "Fri" if i == 5 }
@@ -18,7 +18,7 @@
         formats: {
           default: "%a, %b %-d, %Y at %r",
           short: "%d %b %H:%M",
-          administrate_default: "%a, %b %-d, %Y, %r",
+          administrate_datetime_default: "%a, %b %-d, %Y, %r",
           administrate_time_default: "%I:%M%p"
         }
       }