Optimize I18n::Locale::Fallbacks#compute

ruby-i18n · Apr 26, 2024 · a295dba · a295dba
1 parent 7842cab
commit a295dba
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/lib/i18n/locale/fallbacks.rb b/lib/i18n/locale/fallbacks.rb
@@ -90,11 +90,16 @@ def inspect
       protected
 
       def compute(tags, include_defaults = true, exclude = [])
-        result = Array(tags).flat_map 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
+        tags = Array(tags).flat_map do |tag|
+          I18n::Locale::Tag.tag(tag).self_and_parents.map! { |t| t.to_sym }
         end
+        tags -= exclude
+
+        result = tags
+        tags.each do |tag|
+          result += compute(@map[tag], false, exclude + result) if @map[tag]
+        end
+
         result.push(*defaults) if include_defaults
         result.uniq!
         result.compact!