Commit e2ec4c04 authored by Dan Hansen's avatar Dan Hansen

possibly fix the problem with js i18n that occurs on joindiaspora

parent 90897099
......@@ -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
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