Merge pull request #692 from uiur/optimize-fallbacks-compute

Optimize I18n::Locale::Fallbacks#[] for recursive locale mappings
ruby-i18n · May 6, 2024 · 9b84d1d · 9b84d1d
2 parents 7842cab + fb8e34e
commit 9b84d1d
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/lib/i18n/locale/fallbacks.rb b/lib/i18n/locale/fallbacks.rb
@@ -90,11 +90,13 @@ def inspect
       protected
 
       def compute(tags, include_defaults = true, exclude = [])
-        result = Array(tags).flat_map do |tag|
+        result = []
+        Array(tags).each do |tag|
           tags = I18n::Locale::Tag.tag(tag).self_and_parents.map! { |t| t.to_sym } - exclude
-          tags.each { |_tag| tags += compute(@map[_tag], false, exclude + tags) if @map[_tag] }
-          tags
+          result += tags
+          tags.each { |_tag| result += compute(@map[_tag], false, exclude + result) if @map[_tag] }
         end
+
         result.push(*defaults) if include_defaults
         result.uniq!
         result.compact!