Merge pull request #2870 from k0kubun/i18n-admin-js-data-attribute

Use data attribute to fetch admin.js options
railsadminteam · Apr 27, 2017 · 66f3dbd · 66f3dbd
2 parents e0eb6ca + dc69ca1
commit 66f3dbd
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/app/views/layouts/rails_admin/application.html.haml b/app/views/layouts/rails_admin/application.html.haml
@@ -8,10 +8,11 @@
     = csrf_meta_tag
     = stylesheet_link_tag "rails_admin/rails_admin.css", media: :all
     = javascript_include_tag "rails_admin/rails_admin.js"
+  %body.rails_admin
+    #admin-js{:'data-i18n-options' => I18n.t("admin.js").to_json}
     -# Initialize JS simple i18n
     :javascript
-      RailsAdmin.I18n.init('#{I18n.locale}', JSON.parse("#{j I18n.t("admin.js").to_json}"))
-  %body.rails_admin
+      RailsAdmin.I18n.init('#{I18n.locale}', document.getElementById("admin-js").dataset.i18nOptions);
     #loading.label.label-warning{style: 'display:none; position:fixed; right:20px; bottom:20px; z-index:100000'}= t('admin.loading')
     %nav.navbar.navbar-default.navbar-fixed-top
       = render "layouts/rails_admin/navigation"