nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Maxwell Salzberg 2012-01-14 02:49:34 -08:00
parent b10eb9e56a
commit 0b6c5421c3
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/helpers/application_helper.rb
View file

@ -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