From 4424cb64cdd60bae0a29ad0c42e2cc7e1c47aee8 Mon Sep 17 00:00:00 2001
From: Georg Gadinger <nilsding@nilsding.org>
Date: Sun, 2 Apr 2017 09:04:49 +0200
Subject: [PATCH] Fix JS translations

---
 .gitignore                              | 2 +-
 app/assets/javascripts/i18n/.keep       | 0
 app/views/layouts/application.html.haml | 2 --
 config/deploy.rb                        | 1 -
 config/i18n-js.yml                      | 2 +-
 5 files changed, 2 insertions(+), 5 deletions(-)
 create mode 100644 app/assets/javascripts/i18n/.keep

diff --git a/.gitignore b/.gitignore
index e489110c..2f31a86f 100644
--- a/.gitignore
+++ b/.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
diff --git a/app/assets/javascripts/i18n/.keep b/app/assets/javascripts/i18n/.keep
new file mode 100644
index 00000000..e69de29b
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 42313b35..12f5e08b 100644
--- a/app/views/layouts/application.html.haml
+++ b/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"}
diff --git a/config/deploy.rb b/config/deploy.rb
index 0942398c..1d5eaea2 100644
--- a/config/deploy.rb
+++ b/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'
diff --git a/config/i18n-js.yml b/config/i18n-js.yml
index 0f2f834e..2839d25a 100644
--- a/config/i18n-js.yml
+++ b/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.*']