Merge pull request #1675 from thoefer/3-1-stable

Fix for startup problems due to deprecation warning on nested models
This commit is contained in:
José Valim
2011-06-13 01:17:28 -07:00

View File

@@ -99,18 +99,25 @@ module ActiveRecord
config.after_initialize do
container = :"activerecord.attributes"
I18n.t(container, :default => {}).each do |key, value|
if value.is_a?(Hash) && value.any? { |k,v| v.is_a?(Hash) }
$stderr.puts "[DEPRECATION WARNING] Nested I18n namespace lookup under \"#{container}.#{key}\" is no longer supported"
lookup = I18n.t(container, :default => {})
if lookup.is_a?(Hash)
lookup.each do |key, value|
if value.is_a?(Hash) && value.any? { |k,v| v.is_a?(Hash) }
$stderr.puts "[DEPRECATION WARNING] Nested I18n namespace lookup under \"#{container}.#{key}\" is no longer supported"
end
end
end
container = :"activerecord.models"
I18n.t(container, :default => {}).each do |key, value|
if value.is_a?(Hash)
$stderr.puts "[DEPRECATION WARNING] Nested I18n namespace lookup under \"#{container}.#{key}\" is no longer supported"
lookup = I18n.t(container, :default => {})
if lookup.is_a?(Hash)
lookup.each do |key, value|
if value.is_a?(Hash)
$stderr.puts "[DEPRECATION WARNING] Nested I18n namespace lookup under \"#{container}.#{key}\" is no longer supported"
end
end
end
end
end
end