Rollback faker-ruby#1389 (faker-ruby#1535)

* Rollback i18n PR * Require helpers
davidmorton0 · Feb 12, 2019 · d64622c · d64622c
1 parent 5bc5875
commit d64622c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 23 deletions.
diff --git a/lib/faker.rb b/lib/faker.rb
@@ -1,17 +1,18 @@
 # frozen_string_literal: true
 
+mydir = __dir__
+
 begin
   require 'psych'
 end
 
 require 'i18n'
 require 'set' # Fixes a bug in i18n 0.6.11
 
-# require helper files
 Dir.glob(File.join(File.dirname(__FILE__), 'helpers', '*.rb')).sort.each { |file| require file }
 
-# load locales via I18n.backend
-I18n.backend = I18n::Backend::Chain.new(I18n.backend, Faker::I18nBackend.new)
+I18n.load_path += Dir[File.join(mydir, 'locales', '**/*.yml')]
+I18n.reload! if I18n.backend.initialized?
 
 module Faker
   class Config

diff --git a/lib/helpers/i18n_backend.rb b/lib/helpers/i18n_backend.rb
diff --git a/test/faker/default/test_faker_i18n_backend.rb b/test/faker/default/test_faker_i18n_backend.rb