fixes #14318 - load JS translations table for current locale only

theforeman · Mar 22, 2016 · 16603fa · 16603fa
1 parent 9738552
commit 16603fa
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/app/assets/javascripts/i18n.js b/app/assets/javascripts/i18n.js
@@ -1,4 +1,3 @@
-//= require_tree ./locale
 //= require gettext/all
 
 $(function() {

diff --git a/app/views/layouts/base.html.erb b/app/views/layouts/base.html.erb
@@ -16,6 +16,7 @@
     <%= yield(:stylesheets) %>
 
     <%= csrf_meta_tags %>
+    <%= javascript_include_tag "locale/#{I18n.locale.to_s.tr('-', '_')}/app", "data-turbolinks-track" => true %>
     <%= javascript_include_tag 'application', "data-turbolinks-track" => true %>
     <%= yield(:javascripts) %>
 

diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb
@@ -51,6 +51,8 @@
                   proxy_status
                   parameter_override)
 
+  javascript += FastGettext.default_available_locales.map { |loc| "locale/#{loc}/app" }
+
   stylesheets = %w( )
 
   # Add the fonts path