Merge pull request #655 from ccutrer/lazy-loadable-duplicate-availabl…

…e-locales fix LazyLoadable#available_locales duplicating locales
ruby-i18n · Apr 26, 2023 · 4ced6ee · 4ced6ee
2 parents b9b79ab + 2acc3f4
commit 4ced6ee
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/i18n/backend/lazy_loadable.rb b/lib/i18n/backend/lazy_loadable.rb
@@ -98,7 +98,7 @@ def eager_load!
       # Parse the load path and extract all locales.
       def available_locales
         if lazy_load?
-          I18n.load_path.map { |path| LocaleExtractor.locale_from_path(path) }
+          I18n.load_path.map { |path| LocaleExtractor.locale_from_path(path) }.uniq
         else
           super
         end

diff --git a/test/backend/lazy_loadable_test.rb b/test/backend/lazy_loadable_test.rb
@@ -7,7 +7,7 @@ def setup
     @lazy_mode_backend = I18n::Backend::LazyLoadable.new(lazy_load: true)
     @eager_mode_backend = I18n::Backend::LazyLoadable.new(lazy_load: false)
 
-    I18n.load_path = [File.join(locales_dir, '/en.yml'), File.join(locales_dir,  '/fr.yml')]
+    I18n.load_path = [File.join(locales_dir, '/en.yml'), File.join(locales_dir, '/en.yaml'), File.join(locales_dir,  '/fr.yml')]
   end
 
   test "lazy mode: only loads translations for current locale" do