Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

support version 1.9.0 of i18n #131

Closed
wants to merge 1 commit into from
Closed

support version 1.9.0 of i18n #131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion i18n-active_record.gemspec
View file
Open in desktop
Expand Up @@ -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'
Expand Down
4 changes: 2 additions & 2 deletions lib/i18n/backend/active_record.rb
View file
Open in desktop
Expand Up @@ -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))
mpantel marked this conversation as resolved.
Show resolved Hide resolved
end
result.deep_symbolize_keys
Utils.deep_symbolize_keys(result)
end
end

Expand Down