Fix JS translations

.gitignore

@@ -24,7 +24,7 @@ coverage/
 *~
 
 # dont push generated js translations to repository
-/public/javascripts/i18n/
+/app/assets/javascripts/i18n/*.js
 
 # every fucking time, dolphin
 .directory

app/views/layouts/application.html.haml

@@ -11,8 +11,6 @@
     %link{rel: 'icon', href: '/images/favicon/favicon-32.png', sizes: '32x32'}
     %title= yield(:title)
     = javascript_include_tag 'i18n', 'data-turbolinks-track' => true
-    - # Evil hack on production:  manually require /javascripts/translations.js; this used to work before though :(
-    %script{src: '/javascripts/translations.js', 'data-turbolinks-track' => false}
     = stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track' => true
     - if user_signed_in? and not current_user.theme.nil? and (@user.nil? || @user.theme.nil?)
       %link{rel: 'stylesheet', href: current_user.theme.css.url, media: :all, 'data-turbolinks-track' => "false"}

config/deploy.rb

@@ -42,7 +42,6 @@ set :rollbar_role, Proc.new { :app }
 
 # Create JS i18n files before precompiling assets
 before 'deploy:assets:precompile', 'deploy:i18n_js'
-after 'deploy:assets:precompile', 'deploy:i18n_js'
 
 # Restart the app server after successful deploy
 after 'deploy:cleanup', 'deploy:restart'

config/i18n-js.yml

@@ -24,5 +24,5 @@
 fallbacks: :default_locale
 
 translations:
-  - file: 'public/javascripts/translations.js'
+  - file: 'app/assets/javascripts/i18n/translations.js'
     only: ['*.frontend.*', '*.views.actions.*']