diff options
| author | Xavier Noria <fxn@hashref.com> | 2015-11-11 23:34:53 +0100 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2015-11-11 23:34:53 +0100 |
| commit | 7d242be5a4fbfaea2d585905d76cc6bae45cbe77 (patch) | |
| tree | fddb40efd4902de00bdbc09ce25d99ed705a8278 /activesupport | |
| parent | 18b44ff1e485ebe4cb5801d9eaa5314d970cadd7 (diff) | |
| parent | ea3b6ac6ca8d2d60e393ed983a5d436bb135e503 (diff) | |
| download | rails-7d242be5a4fbfaea2d585905d76cc6bae45cbe77.tar.gz rails-7d242be5a4fbfaea2d585905d76cc6bae45cbe77.tar.bz2 rails-7d242be5a4fbfaea2d585905d76cc6bae45cbe77.zip | |
Merge pull request #22269 from dharamgollapudi/patch-1
Use the file watcher defined by the app config
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/lib/active_support/i18n_railtie.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/i18n_railtie.rb b/activesupport/lib/active_support/i18n_railtie.rb index 6775eec34b..82aacf3b24 100644 --- a/activesupport/lib/active_support/i18n_railtie.rb +++ b/activesupport/lib/active_support/i18n_railtie.rb @@ -56,7 +56,7 @@ module I18n I18n.enforce_available_locales = enforce_available_locales directories = watched_dirs_with_extensions(reloadable_paths) - reloader = ActiveSupport::FileUpdateChecker.new(I18n.load_path.dup, directories) do + reloader = app.config.file_watcher.new(I18n.load_path.dup, directories) do I18n.load_path.keep_if { |p| File.exist?(p) } I18n.load_path |= reloadable_paths.map(&:existent).flatten |