From 975d4736c9d16bb09f46d62243f2dd4616bb6873 Mon Sep 17 00:00:00 2001 From: michail Date: Thu, 27 Jan 2022 21:52:17 +0200 Subject: [PATCH] support version 1.9.0 of i18n due to https://github.com/ruby-i18n/i18n/pull/573 --- i18n-active_record.gemspec | 2 +- lib/i18n/backend/active_record.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/i18n-active_record.gemspec b/i18n-active_record.gemspec index b5a25e7..9091269 100644 --- a/i18n-active_record.gemspec +++ b/i18n-active_record.gemspec @@ -19,7 +19,7 @@ Gem::Specification.new do |s| s.require_path = 'lib' s.rubyforge_project = '[none]' - s.add_dependency 'i18n', '>= 0.5.0' + s.add_dependency 'i18n', '>= 1.9.0' s.add_development_dependency 'appraisal' s.add_development_dependency 'bundler' diff --git a/lib/i18n/backend/active_record.rb b/lib/i18n/backend/active_record.rb index 4d2bcbd..e8d1422 100644 --- a/lib/i18n/backend/active_record.rb +++ b/lib/i18n/backend/active_record.rb @@ -97,9 +97,9 @@ def lookup(locale, key, scope = [], options = {}) result.first.value else result = result.inject({}) do |hash, translation| - hash.deep_merge build_translation_hash_by_key(key, translation) + Utils.deep_merge(hash, build_translation_hash_by_key(key, translation)) end - result.deep_symbolize_keys + Utils.deep_symbolize_keys(result) end end