possibly fix the problem with js i18n that occurs on joindiaspora
This commit is contained in:
parent
90897099bd
commit
e2ec4c0424
1 changed files with 7 additions and 2 deletions
|
|
@ -271,8 +271,13 @@ module ApplicationHelper
|
||||||
|
|
||||||
|
|
||||||
def get_javascript_strings_for(language)
|
def get_javascript_strings_for(language)
|
||||||
translations = I18n.t('javascripts', :locale => language)
|
|
||||||
defaults = I18n.t('javascripts', :locale => DEFAULT_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
|
||||||
end
|
end
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue