Merged r12365 from trunk to 2.4-stable

prevent i18n deprecated warning

i18n 0.6.4 on Rails 3.2.16 changes behavior.
https://github.com/svenfuchs/i18n/commit/3b6e56e06fd70f6e4507996b017238505e66608c

--HG--
branch : 2.4-stable
extra : convert_revision : svn%3Ae93f8b46-1217-0410-a6f0-8f06a7374b81/branches/2.4-stable%4012366