diff options
| author | azul <azul@leap.se> | 2014-05-30 18:02:20 +0200 |
|---|---|---|
| committer | azul <azul@leap.se> | 2014-05-30 18:02:20 +0200 |
| commit | 9f04e4c8e50f1dc5a7ff6f2e58974254731a6bc4 (patch) | |
| tree | 84db71a6e52c47bc2f2f1aabce578ce367fcb0e8 /config/initializers | |
| parent | 568a5c243f0a0ef90807c96b19643ec341994bbb (diff) | |
| parent | 9e3be686ff2751707369894382293924420830d0 (diff) | |
Merge pull request #167 from azul/feature/i18n-for-ticket-system0.5.2-rc
Feature/i18n for ticket system
Diffstat (limited to 'config/initializers')
| -rw-r--r-- | config/initializers/add_controller_methods.rb | 1 | ||||
| -rw-r--r-- | config/initializers/i18n.rb | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/config/initializers/add_controller_methods.rb b/config/initializers/add_controller_methods.rb index f572ecb..03e8393 100644 --- a/config/initializers/add_controller_methods.rb +++ b/config/initializers/add_controller_methods.rb @@ -1,4 +1,5 @@ ActiveSupport.on_load(:application_controller) do include ControllerExtension::Authentication include ControllerExtension::TokenAuthentication + include ControllerExtension::Flash end diff --git a/config/initializers/i18n.rb b/config/initializers/i18n.rb index c277a22..b209d00 100644 --- a/config/initializers/i18n.rb +++ b/config/initializers/i18n.rb @@ -8,3 +8,7 @@ MATCH_LOCALE = /(#{I18n.available_locales.join('|')})/ # I18n.available_locales is always an array of symbols, but for comparison with # params we need it to be an array of strings. LOCALES_STRING = I18n.available_locales.map(&:to_s) + +# enable using the cascade option +# see svenfuchs.com/2011/2/11/organizing-translations-with-i18n-cascade-and-i18n-missingtranslations +I18n::Backend::Simple.send(:include, I18n::Backend::Cascade) |