fixed timezone

chrhsmt · Jan 29, 2014 · e183942 · e183942
1 parent f28149f
commit e183942
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/app/controllers/data_controller.rb b/app/controllers/data_controller.rb
@@ -46,7 +46,7 @@ def download
   	end
   	csvData.encode(Encoding::SJIS)
 
-  	filename = getCategoryName(category) + "_" + Time.now.strftime('%Y%m%d%H%M%S') + ".csv" 
+  	filename = getCategoryName(category) + "_" + Time.zone.now.strftime('%Y%m%d%H%M%S') + ".csv" 
   	# csv to stream 
   	send_data csvData, filename: filename
 

diff --git a/config/application.rb b/config/application.rb
@@ -15,6 +15,7 @@ class Application < Rails::Application
     # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
     # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
     # config.time_zone = 'Central Time (US & Canada)'
+    config.time_zone = 'Tokyo'
 
     # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
     # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]