aboutsummaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
Diffstat (limited to 'config')
-rw-r--r--config/environment.rb3
-rw-r--r--config/general.yml-example4
2 files changed, 7 insertions, 0 deletions
diff --git a/config/environment.rb b/config/environment.rb
index 3ce887c03..8611dd1b6 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -77,6 +77,9 @@ Rails::Initializer.run do |config|
# Make Active Record use UTC-base instead of local time
config.active_record.default_timezone = :utc
+ # This is the timezone that times and dates are displayed in
+ config.time_zone = Configuration::time_zone
+
config.after_initialize do
require 'routing_filters.rb'
end
diff --git a/config/general.yml-example b/config/general.yml-example
index 1b30ffce6..0d6ecfc11 100644
--- a/config/general.yml-example
+++ b/config/general.yml-example
@@ -16,6 +16,10 @@ DOMAIN: '127.0.0.1:3000'
# (http://en.wikipedia.org/wiki/ISO_3166-1_alpha-2)
ISO_COUNTRY_CODE: GB
+# This is the timezone that times and dates are displayed in
+# If not set defaults to UTC.
+#TIME_ZONE: Australia/Sydney
+
# These feeds are displayed accordingly on the Alaveteli "blog" page:
BLOG_FEED: 'http://www.mysociety.org/category/projects/whatdotheyknow/feed/'
TWITTER_USERNAME: 'whatdotheyknow'