diff --git a/db/migrate/20130622095040_move_weekly_tasks.rb b/db/migrate/20130622095040_move_weekly_tasks.rb index f9f363fd..e8dc8384 100644 --- a/db/migrate/20130622095040_move_weekly_tasks.rb +++ b/db/migrate/20130622095040_move_weekly_tasks.rb @@ -36,7 +36,7 @@ class MoveWeeklyTasks < ActiveRecord::Migration private def weekly_task?(workgroup, task) return false if task.due_date.nil? - + group_task = { weekday: workgroup.weekday, name: workgroup.task_name, diff --git a/lib/foodsoft_file.rb b/lib/foodsoft_file.rb index 1aa40dfb..0ef6367c 100644 --- a/lib/foodsoft_file.rb +++ b/lib/foodsoft_file.rb @@ -11,7 +11,7 @@ module FoodsoftFile def self.parse(file) articles, outlisted_articles = Array.new, Array.new row_index = 2 - ::CSV.parse(file.read, {:col_sep => ";", :headers => true}) do |row| + ::CSV.parse(file.read.force_encoding('utf-8'), {:col_sep => ";", :headers => true}) do |row| # check if the line is empty unless row[2] == "" || row[2].nil? article = {:number => row[1],