Merge branch 'js-l10n-support-take1' of git://github.com/kubabrecka/discourse

This commit is contained in:
Robin Ward
2013-02-28 14:34:13 -05:00
12 changed files with 52 additions and 15 deletions

View File

@@ -1,7 +0,0 @@
//= depend_on 'client.en.yml'
<% SimplesIdeias::I18n.assert_usable_configuration! %>
<% admin = SimplesIdeias::I18n.translation_segments['app/assets/javascripts/i18n/admin.en.js']
admin[:en][:js] = admin[:en].delete(:admin_js)
%>
jQuery.extend(true, I18n.translations, <%= admin.to_json %>);