Remove i18n-js gem.

natify · Sep 21, 2014 · 24288de · 24288de
1 parent f34994e
commit 24288de
Show file tree

Hide file tree

Showing 9 changed files with 542 additions and 37 deletions.
diff --git a/Gemfile b/Gemfile
@@ -10,9 +10,8 @@ gem 'jquery-rails'
 gem 'jbuilder', '~> 1.2'
 gem 'ejs'
 gem "compass-rails", "~> 1.1.2"
-gem "devise", "~> 3.2.2"
-gem 'transitions', '0.1.9', require: ["transitions", "active_record/transitions"]
-gem 'i18n-js'
+gem "devise", "~> 3.2.0"
+gem 'transitions', '0.1.9', :require => ["transitions", "active_record/transitions"]
 gem 'rails-i18n'
 gem 'configuration'
 gem 'rails-observers', '~> 0.1.2'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -75,8 +75,6 @@ GEM
     fssm (0.2.10)
     hike (1.2.3)
     i18n (0.6.9)
-    i18n-js (2.1.2)
-      i18n
     jasmine (1.3.2)
       jasmine-core (~> 1.3.1)
       rack (~> 1.0)
@@ -199,7 +197,6 @@ DEPENDENCIES
   devise (~> 3.2.2)
   ejs
   factory_girl_rails
-  i18n-js
   jasmine (~> 1.3.2)
   jbuilder (~> 1.2)
   jquery-rails

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
@@ -22,5 +22,4 @@
 //= require bootstrap-popover
 //= require tag-it
 //= require i18n
-//= require i18n/translations
-//= require_tree .
+//= require_tree .
diff --git a/app/assets/javascripts/i18n/translations.js b/app/assets/javascripts/i18n/translations.js
diff --git a/app/views/application/locales.js.erb b/app/views/application/locales.js.erb
@@ -0,0 +1,6 @@
+<%= cache do %>
+I18n.translations = <%= I18n.backend.send(:translations).to_json.html_safe %>;
+I18n.defaultLocale = "<%= I18n.default_locale %>";
+I18n.locale = "<%= I18n.locale %>";
+I18n.fallbacks = true;
+<% end %>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -6,11 +6,7 @@
   <%= stylesheet_link_tag "//ajax.googleapis.com/ajax/libs/jqueryui/1/themes/smoothness/jquery-ui.css" %>
   <%= stylesheet_link_tag :application %>
   <%= javascript_include_tag :application %>
-  <script type="text/javascript">
-    I18n.defaultLocale = "<%= I18n.default_locale %>";
-    I18n.locale = "<%= I18n.locale %>";
-    I18n.fallbacks = true;
-  </script>
+  <script type="text/javascript" src="/locales.js"></script>
 </head>
 <body>
 

diff --git a/config/i18n-js.yml b/config/i18n-js.yml
diff --git a/config/routes.rb b/config/routes.rb
@@ -1,6 +1,7 @@
 Fulcrum::Application.routes.draw do
 
   get "story/new"
+  get "locales" => "application#locales"
 
   resources :projects do
     resources :users, :only => [:index, :create, :destroy]