From 0b6c5421c3c096931a00f5f26034320424f9f8de Mon Sep 17 00:00:00 2001 From: Maxwell Salzberg Date: Sat, 14 Jan 2012 02:49:34 -0800 Subject: [PATCH] use deep merge. since we now have nested js, we need to do the merge recursively; fixes #2660 --- app/helpers/application_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 7fda03658..f8f6bac23 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -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