lib/ckeditor/orm/base.rb in glebtv-ckeditor-4.6.0 vs lib/ckeditor/orm/base.rb in glebtv-ckeditor-4.7.3

@@ -18,11 +18,11 @@
           def image?
             Ckeditor::IMAGE_TYPES.include?(data_content_type)
           end
 
           def format_created_at
-            self.created_at.strftime("%d.%m.%Y")
+            I18n.l(created_at, format: :short)
           end
 
           def url_content
             url
           end
@@ -35,14 +35,14 @@
             [:url_content, :url_thumb, :size, :filename, :format_created_at]
           end
 
           def as_json(options = nil)
             options = {
-              :methods => as_json_methods,
-              :root => "asset"
-            }.merge(options || {})
+              methods: as_json_methods,
+              root: 'asset'
+            }.merge!(options || {})
 
-            super options
+            super(options)
           end
         end
       end
     end
   end