Merge pull request #2948 from pfac/pfac-config-time-zone

Fix default time zone config
This commit is contained in:
Pau Pérez Fabregat
2018-11-07 18:39:25 +00:00
committed by GitHub
2 changed files with 8 additions and 0 deletions

View File

@@ -29,6 +29,12 @@ Openfoodnetwork::Application.configure do
# Expands the lines which load the assets
config.assets.debug = false
# 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.
#
# To override this, set the appropriate locale in application.yml
config.time_zone = ENV.fetch("TIMEZONE", "UTC")
config.i18n.fallbacks = [:en]
# Show emails using Letter Opener

View File

@@ -33,6 +33,8 @@ Openfoodnetwork::Application.configure do
# ActionMailer::Base.deliveries array.
config.action_mailer.delivery_method = :test
config.time_zone = ENV.fetch("TIMEZONE", "Melbourne")
# Tests assume English text on the site.
config.i18n.default_locale = "en"
config.i18n.available_locales = ['en', 'es']