diff --git a/app/assets/javascripts/i18n.js b/app/assets/javascripts/i18n.js
index cdb243020ed..180b49e8389 100644
--- 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
index 46476d140c8..a6421a08fdc 100644
--- 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/#{FastGettext.locale}/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
index 29d63d413a9..ba3127f6d78 100644
--- 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