lib/i18n/tasks/missing_keys.rb in i18n-tasks-0.9.6 vs lib/i18n/tasks/missing_keys.rb in i18n-tasks-0.9.7

- old
+ new

@@ -1,14 +1,13 @@ # frozen_string_literal: true require 'set' module I18n::Tasks module MissingKeys - MISSING_TYPES = { - used: {glyph: '✗', summary: 'used in code but missing from base locale'}, - diff: {glyph: '∅', summary: 'translated in one locale but not in the other'} - } + used: { glyph: '✗', summary: 'used in code but missing from base locale' }, + diff: { glyph: '∅', summary: 'translated in one locale but not in the other' } + }.freeze def self.missing_keys_types @missing_keys_types ||= MISSING_TYPES.keys end @@ -17,73 +16,73 @@ end # @param types [:missing_used, :missing_diff] all if `nil`. # @return [Siblings] def missing_keys(locales: nil, types: nil, base_locale: nil) - locales = locales.presence || self.locales - types = types.presence || missing_keys_types - base = base_locale || self.base_locale + locales ||= self.locales + types ||= missing_keys_types + base = base_locale || self.base_locale types.inject(empty_forest) do |f, type| f.merge! send(:"missing_#{type}_forest", locales, base) end end def eq_base_keys(opts = {}) locales = Array(opts[:locales]).presence || self.locales - (locales - [base_locale]).inject(empty_forest) { |tree, locale| + (locales - [base_locale]).inject(empty_forest) do |tree, locale| tree.merge! equal_values_tree(locale, base_locale) - } + end end def missing_diff_forest(locales, base = base_locale) tree = empty_forest # present in base but not locale - (locales - [base]).each { |locale| + (locales - [base]).each do |locale| tree.merge! missing_diff_tree(locale, base) - } + end if locales.include?(base) # present in locale but not base - (self.locales - [base]).each { |locale| + (self.locales - [base]).each do |locale| tree.merge! missing_diff_tree(base, locale) - } + end end tree end def missing_used_forest(locales, _base = base_locale) - locales.inject(empty_forest) { |forest, locale| + locales.inject(empty_forest) do |forest, locale| forest.merge! missing_used_tree(locale) - } + end end # keys present in compared_to, but not in locale def missing_diff_tree(locale, compared_to = base_locale) - data[compared_to].select_keys { |key, _node| + data[compared_to].select_keys do |key, _node| locale_key_missing? locale, depluralize_key(key, compared_to) - }.set_root_key!(locale, type: :missing_diff).keys { |_key, node| + end.set_root_key!(locale, type: :missing_diff).keys do |_key, node| # change path and locale to base - data = {locale: locale, missing_diff_locale: node.data[:locale]} + data = { locale: locale, missing_diff_locale: node.data[:locale] } if node.data.key?(:path) data[:path] = LocalePathname.replace_locale(node.data[:path], node.data[:locale], locale) end node.data.update data - } + end end # keys used in the code missing translations in locale def missing_used_tree(locale) - used_tree(strict: true).select_keys { |key, _node| + used_tree(strict: true).select_keys do |key, _node| locale_key_missing?(locale, key) - }.set_root_key!(locale, type: :missing_used) + end.set_root_key!(locale, type: :missing_used) end def equal_values_tree(locale, compare_to = base_locale) base = data[compare_to].first.children - data[locale].select_keys(root: false) { |key, node| + data[locale].select_keys(root: false) do |key, node| other_node = base[key] other_node && !node.reference? && node.value == other_node.value && !ignore_key?(key, :eq_base, locale) - }.set_root_key!(locale, type: :eq_base) + end.set_root_key!(locale, type: :eq_base) end def locale_key_missing?(locale, key) !key_value?(key, locale) && !ignore_key?(key, :missing) end @@ -94,28 +93,27 @@ def collapse_same_key_in_locales!(forest) locales_and_node_by_key = {} to_remove = [] forest.each do |root| locale = root.key - root.keys { |key, node| + root.keys do |key, node| next unless yield node if locales_and_node_by_key.key?(key) locales_and_node_by_key[key][0] << locale else locales_and_node_by_key[key] = [[locale], node] end to_remove << node - } + end end forest.remove_nodes_and_emptied_ancestors! to_remove - locales_and_node_by_key.inject({}) { |inv, (key, (locales, node))| + locales_and_node_by_key.each_with_object({}) do |(key, (locales, node)), inv| (inv[locales.sort.join('+')] ||= []) << [key, node] - inv - }.map { |locales, keys_nodes| - keys_nodes.each { |(key, node)| + end.map do |locales, keys_nodes| + keys_nodes.each do |(key, node)| forest["#{locales}.#{key}"] = node - } - } + end + end forest end end end