diff options
| author | Seb Bacon <seb.bacon@gmail.com> | 2011-08-22 14:11:02 +0100 |
|---|---|---|
| committer | Seb Bacon <seb.bacon@gmail.com> | 2011-08-22 14:19:05 +0100 |
| commit | 5c3881bfacdb34a605ddfbadf1531d0e341d7beb (patch) | |
| tree | 088e752d1a6d2fb38d1409dbfb1cb332af92594c /config/environment.rb | |
| parent | 15a174375e638b91c138d771d4851613110f9cdc (diff) | |
| parent | a29b3aaf0ae77af49d38813b62dddcb6889c1ebe (diff) | |
merge from master and make tests pass
Diffstat (limited to 'config/environment.rb')
| -rw-r--r-- | config/environment.rb | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/config/environment.rb b/config/environment.rb index a40c2df4e..73cab9201 100644 --- a/config/environment.rb +++ b/config/environment.rb @@ -28,6 +28,12 @@ load "config.rb" load "format.rb" load "debug_helpers.rb" load "util.rb" +# Patch Rails::GemDependency to cope with older versions of rubygems, e.g. in Debian Lenny +# Restores override removed in https://github.com/rails/rails/commit/c20a4d18e36a13b5eea3155beba36bb582c0cc87 +# without effecting method behaviour +# and adds fallback gem call removed in https://github.com/rails/rails/commit/4c3725723f15fab0a424cb1318b82b460714b72f +require File.join(File.dirname(__FILE__), '../lib/old_rubygems_patch') + Rails::Initializer.run do |config| # Load intial mySociety config @@ -122,6 +128,7 @@ else end FastGettext.default_available_locales = available_locales +I18n.locale = default_locale I18n.available_locales = available_locales I18n.default_locale = default_locale @@ -136,3 +143,4 @@ require 'willpaginate_hack.rb' require 'sendmail_return_path.rb' require 'tnef.rb' require 'i18n_fixes.rb' +require 'rack_quote_monkeypatch.rb' |