From e2ec4c0424bfaa00310c565538b6b8dae7d0092f Mon Sep 17 00:00:00 2001 From: Dan Hansen Date: Tue, 15 Feb 2011 22:43:06 -0600 Subject: [PATCH] possibly fix the problem with js i18n that occurs on joindiaspora --- app/helpers/application_helper.rb | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 9f7b1d3e3..fc744c270 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -271,8 +271,13 @@ module ApplicationHelper def get_javascript_strings_for(language) - translations = I18n.t('javascripts', :locale => language) defaults = I18n.t('javascripts', :locale => DEFAULT_LANGUAGE) - defaults.update(translations) + + if language != DEFAULT_LANGUAGE + translations = I18n.t('javascripts', :locale => language) + defaults.update(translations) + end + + defaults end end