dan
/
jekyll
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3455 from jekyll/read-csv-data-with-proper-encoding

This commit is contained in:
Parker Moore 2015-02-13 20:52:34 -08:00
parent 712d8d617d c6d5a913f1
commit 30b42c4700
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/jekyll/site.rb
View File

@ -262,19 +262,22 @@ module Jekyll
end end
end end
end end
# Determines how to read a data file. # Determines how to read a data file.
# #
# Returns the contents of the data file. # Returns the contents of the data file.
def read_data_file(path) def read_data_file(path)
case File.extname(path).downcase case File.extname(path).downcase
when '.csv' when '.csv'
CSV.read(path, :headers => true).map(&:to_hash) CSV.read(path, {
:headers => true,
:encoding => config['encoding']
}).map(&:to_hash)
else else
SafeYAML.load_file(path) SafeYAML.load_file(path)
end end
end end
# Read in all collections specified in the configuration # Read in all collections specified in the configuration
# #
# Returns nothing. # Returns nothing.