diff options
author | Seb Bacon <seb.bacon@gmail.com> | 2012-06-20 10:46:57 +0100 |
---|---|---|
committer | Seb Bacon <seb.bacon@gmail.com> | 2012-06-20 10:46:57 +0100 |
commit | 6c4c822ef7a4491bf821326af779e5be9118c0a1 (patch) | |
tree | 39cf3564b1b2fb6be26499eda2a41be7ba59ad65 /vendor/plugins/gettext_i18n_rails/init.rb | |
parent | ea977a0b9e86bc99a84de8577fa4ce1d304ac489 (diff) | |
parent | 08dac0261325cd757b7146f9626f3c7b48cc672c (diff) |
Merge branch 'release/0.6'0.6
Conflicts:
locale/bs/app.po
locale/ca/app.po
locale/cs/app.po
locale/cy/app.po
locale/de/app.po
locale/en_IE/app.po
locale/es/app.po
locale/eu/app.po
locale/fr/app.po
locale/ga_IE/app.po
locale/gl/app.po
locale/hu_HU/app.po
locale/id/app.po
locale/pt_BR/app.po
locale/sq/app.po
locale/sr@latin/app.po
spec/fixtures/locale/en/app.po
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 |