fixes theforeman#8463 - remove i18n bundler group as it isn't optional

fast_gettext/gettext_i18n_rails are both runtime dependencies, not optional. gettext_i18n_rails_js moved to assets as it provides no runtime functionality.
ohadlevy · Nov 26, 2014 · 6f6c0b3 · 6f6c0b3
1 parent dff926c
commit 6f6c0b3
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 8 deletions.
diff --git a/Gemfile b/Gemfile
@@ -23,7 +23,8 @@ gem 'friendly_id', '~> 4.0'
 gem 'secure_headers', '~> 1.3'
 gem 'safemode', '~> 1.2'
 gem 'ruby_parser', '3.1.1'
-
+gem 'fast_gettext', '~> 0.8'
+gem 'gettext_i18n_rails', '~> 1.0'
 
 Dir["#{File.dirname(FOREMAN_GEMFILE)}/bundler.d/*.rb"].each do |bundle|
   self.instance_eval(Bundler.read_file(bundle))

diff --git a/bundler.d/assets.rb b/bundler.d/assets.rb
@@ -10,8 +10,9 @@
   gem 'flot-rails', '0.0.3'
   gem 'quiet_assets', '~> 1.0'
   gem 'gettext_i18n_rails_js', '~> 0.0', '>= 0.0.8'
+  # unspecified dep of gettext_i18n_rails_js
+  #   https://github.com/nubis/gettext_i18n_rails_js/pull/23
   gem 'gettext', '~> 3.1', :require => false
-  gem 'locale', '~> 2.0'
   gem 'multi-select-rails', '~> 0.9'
   gem 'gridster-rails', '~> 0.1'
   gem 'jquery_pwstrength_bootstrap', '~> 1.2'

diff --git a/bundler.d/development.rb b/bundler.d/development.rb
@@ -5,7 +5,6 @@
 
   # for generating i18n files
   gem 'gettext', '~> 3.1', :require => false
-  gem 'locale', '~> 2.0'
 
   # for generating foreign key migrations
   gem 'immigrant', '~> 0.1'

diff --git a/bundler.d/i18n.rb b/bundler.d/i18n.rb