diff options
Diffstat (limited to 'config')
| -rw-r--r-- | config/crontab.ugly | 2 | ||||
| -rw-r--r-- | config/deploy.rb | 1 | ||||
| -rw-r--r-- | config/environment.rb | 4 | ||||
| -rw-r--r-- | config/general.yml-example | 4 | ||||
| -rw-r--r-- | config/initializers/fast_gettext.rb | 2 | ||||
| -rw-r--r-- | config/packages | 2 |
6 files changed, 11 insertions, 4 deletions
diff --git a/config/crontab.ugly b/config/crontab.ugly index 894b464cf..ef3455113 100644 --- a/config/crontab.ugly +++ b/config/crontab.ugly @@ -35,7 +35,7 @@ MAILTO=cron-!!(*= $site *)!!@mysociety.org 48 2 * * * !!(*= $user *)!! /data/vhost/!!(*= $vhost *)!!/!!(*= $vcspath *)!!/script/user-use-graph # Once a year :) -@yearly !!(*= $user *)!! /bin/echo "A year has passed, please update the bank holidays for the Freedom of Information site, thank you." +0 0 1 11 * !!(*= $user *)!! /bin/echo "A year has passed, please update the bank holidays for the Freedom of Information site, thank you." diff --git a/config/deploy.rb b/config/deploy.rb index 5c7c181c9..004c3df35 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -51,6 +51,7 @@ namespace :deploy do "#{release_path}/config/memcached.yml" => "#{shared_path}/memcached.yml", "#{release_path}/config/rails_env.rb" => "#{shared_path}/rails_env.rb", "#{release_path}/config/newrelic.yml" => "#{shared_path}/newrelic.yml", + "#{release_path}/config/aliases" => "#{shared_path}/aliases", "#{release_path}/public/foi-live-creation.png" => "#{shared_path}/foi-live-creation.png", "#{release_path}/public/foi-user-use.png" => "#{shared_path}/foi-user-use.png", "#{release_path}/public/favicon.ico" => "#{shared_path}/favicon.ico", diff --git a/config/environment.rb b/config/environment.rb index 95f44984f..21415dfd8 100644 --- a/config/environment.rb +++ b/config/environment.rb @@ -9,6 +9,8 @@ if RUBY_VERSION.to_f >= 1.9 require 'active_support/inflector' # Activate warning messages again. $VERBOSE = original_verbose + require 'yaml' + YAML::ENGINE.yamler = "syck" end # Uncomment below to force Rails into production mode when @@ -41,7 +43,7 @@ require File.join(File.dirname(__FILE__), '../lib/old_rubygems_patch') require 'configuration' # Application version -ALAVETELI_VERSION = '0.6.8' +ALAVETELI_VERSION = '0.6.9' Rails::Initializer.run do |config| # Load intial mySociety config diff --git a/config/general.yml-example b/config/general.yml-example index 750b54609..30221bac4 100644 --- a/config/general.yml-example +++ b/config/general.yml-example @@ -32,6 +32,10 @@ AVAILABLE_LOCALES: 'en es' DEFAULT_LOCALE: 'en' USE_DEFAULT_BROWSER_LANGUAGE: true +# If you don't want the default locale to be included in URLs generated +# by the application, set this to false +INCLUDE_DEFAULT_LOCALE_IN_URLS: true + # How many days should have passed before an answer to a request is officially late? REPLY_LATE_AFTER_DAYS: 20 REPLY_VERY_LATE_AFTER_DAYS: 40 diff --git a/config/initializers/fast_gettext.rb b/config/initializers/fast_gettext.rb index 2ecf5cb5d..1cd6440e4 100644 --- a/config/initializers/fast_gettext.rb +++ b/config/initializers/fast_gettext.rb @@ -3,4 +3,4 @@ FastGettext.default_text_domain = 'app' I18n::Backend::Simple.send(:include, I18n::Backend::Fallbacks) - +RoutingFilter::Locale.include_default_locale = Configuration::include_default_locale_in_urls
\ No newline at end of file diff --git a/config/packages b/config/packages index ded8dc9a5..775a55e38 100644 --- a/config/packages +++ b/config/packages @@ -33,7 +33,7 @@ libpq-dev uuid-dev ruby1.8-dev rubygems -rake +rake (>= 0.9.2.2) build-essential bundler sqlite3 |