cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into openid

Browse source 
Conflicts:
	config/locales/is.yml
This commit is contained in:
Tom Hughes 2010-06-07 22:24:24 +01:00
commit dc35b597a2
115 changed files with 2014 additions and 3033 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/helpers/application_helper.rb
View file

@ -77,7 +77,7 @@ private
def javascript_strings_for_key(key)
js = ""
value = t(key, :locale => "en")
value = I18n.t(key, :locale => "en")
if value.is_a?(String)
js << "i18n_strings['#{key}'] = '" << escape_javascript(t(key)) << "';\n"