Commit 0b6c5421 authored by Maxwell Salzberg's avatar Maxwell Salzberg

use deep merge. since we now have nested js, we need to do the merge recursively; fixes #2660

parent b10eb9e5
......@@ -21,7 +21,7 @@ module ApplicationHelper
if language != DEFAULT_LANGUAGE
translations = I18n.t('javascripts', :locale => language)
defaults.update(translations)
defaults.deep_merge!(translations)
end
defaults
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment