Merge pull request #2649 from alfredxing/friendly-date-error

lib/jekyll/post.rb

@@ -61,7 +61,14 @@ module Jekyll
       end
 
       if data.key?('date')
+        begin
           self.date = Time.parse(data["date"].to_s)
+        rescue ArgumentError
+            path = File.join(@dir || "", name)
+            msg  =  "Post '#{relative_path}' does not have a valid date in the YAML front matter.\n"
+            msg  << "Fix the date, or exclude the file or directory from being processed"
+            raise Errors::FatalException.new(msg)
+        end
       end
 
       populate_categories
@@ -166,7 +173,7 @@ module Jekyll
       self.ext = ext
     rescue ArgumentError
       path = File.join(@dir || "", name)
-      msg  =  "Post '#{path}' does not have a valid date.\n"
+      msg  =  "Post '#{relative_path}' does not have a valid date.\n"
       msg  << "Fix the date, or exclude the file or directory from being processed"
       raise Errors::FatalException.new(msg)
     end