diff --git a/Gemfile.lock b/Gemfile.lock index a23e6245..8d3e8fad 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -66,7 +66,7 @@ GEM railties (>= 3.0.0) hike (1.2.3) i18n (0.6.9) - jbuilder (2.0.4) + jbuilder (2.0.5) activesupport (>= 3.0.0) multi_json (>= 1.2.0) journey (1.0.4) @@ -85,8 +85,8 @@ GEM treetop (~> 1.4.8) mime-types (1.25.1) mini_portile (0.5.2) - minitest (5.3.0) - multi_json (1.9.0) + minitest (5.3.1) + multi_json (1.9.2) mysql2 (0.3.15) nokogiri (1.6.1) mini_portile (~> 0.5.0) @@ -140,8 +140,7 @@ GEM rspec-core (~> 2.14.0) rspec-expectations (~> 2.14.0) rspec-mocks (~> 2.14.0) - sass (3.3.0) - rake + sass (3.3.4) sass-rails (3.2.6) railties (~> 3.2.0) sass (>= 3.1.10) @@ -170,13 +169,13 @@ GEM daemons (>= 1.0.9) eventmachine (>= 1.0.0) rack (>= 1.0.0) - thor (0.18.1) + thor (0.19.0) tilt (1.4.1) treetop (1.4.15) polyglot polyglot (>= 0.3.1) - tzinfo (0.3.38) - uglifier (2.4.0) + tzinfo (0.3.39) + uglifier (2.5.0) execjs (>= 0.3.0) json (>= 1.8.0) unicorn (4.8.2) diff --git a/config/application.rb b/config/application.rb index e98518cb..2e9904c2 100644 --- a/config/application.rb +++ b/config/application.rb @@ -32,6 +32,7 @@ class Application < Rails::Application # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded. # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s] # config.i18n.default_locale = :de + config.i18n.enforce_available_locales = true # Configure the default encoding used in templates for Ruby 1.9. config.encoding = "utf-8"