diff options
| author | Robin Houston <robin.houston@gmail.com> | 2012-06-23 09:33:42 +0100 |
|---|---|---|
| committer | Robin Houston <robin.houston@gmail.com> | 2012-06-23 09:33:42 +0100 |
| commit | db1a388f0a7b37cc0ceb3ca07b995b34dabdba58 (patch) | |
| tree | e34df5ae0dacdbf6c3b77542b22f2d9e3799d322 /vendor/plugins/gettext_i18n_rails/init.rb | |
| parent | a7cc84b9b2b430644fe23e6328d7ab289e7abf0a (diff) | |
| parent | 7d0fea4b38c214a67b2fc4b56aa670e02a3cda61 (diff) | |
Merge branch 'develop' of github.com:sebbacon/alaveteli into develop
Conflicts:
Gemfile.lock
script/handle-mail-replies
script/handle-mail-replies.rb
spec/controllers/request_controller_spec.rb
Diffstat (limited to 'vendor/plugins/gettext_i18n_rails/init.rb')
| -rw-r--r-- | vendor/plugins/gettext_i18n_rails/init.rb | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/vendor/plugins/gettext_i18n_rails/init.rb b/vendor/plugins/gettext_i18n_rails/init.rb deleted file mode 100644 index d218eee63..000000000 --- a/vendor/plugins/gettext_i18n_rails/init.rb +++ /dev/null @@ -1,14 +0,0 @@ -begin - require 'config/initializers/session_store' -rescue LoadError - # weird bug, when run with rake rails reports error that session - # store is not configured, this fixes it somewhat... -end - -if Rails::VERSION::MAJOR > 2 - require 'gettext_i18n_rails' -else - #requires fast_gettext to be present. - #We give rails a chance to install it using rake gems:install, by loading it later. - config.after_initialize { require 'gettext_i18n_rails' } -end
\ No newline at end of file |