Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Only pull in gem if it is being used, remove middleware

This commit is contained in:
Sam Saffron 2016-03-04 23:17:14 +11:00
parent 8b1772ac0f
commit 7598037080
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@ -45,7 +45,7 @@ gem 'active_model_serializers', '~> 0.8.3'
gem 'onebox' gem 'onebox'
gem 'http_accept_language', '~>2.0.5' gem 'http_accept_language', '~>2.0.5', require: false
gem 'ember-rails' gem 'ember-rails'
gem 'ember-source', '1.12.2' gem 'ember-source', '1.12.2'

4
app/controllers/application_controller.rb
View File

@ -321,8 +321,10 @@ class ApplicationController < ActionController::Base
begin begin
# Rails I18n uses underscores between the locale and the region; the request # Rails I18n uses underscores between the locale and the region; the request
# headers use hyphens. # headers use hyphens.
require 'http_accept_language' unless defined? HttpAcceptLanguage
available_locales = I18n.available_locales.map { |locale| locale.to_s.gsub(/_/, '-') } available_locales = I18n.available_locales.map { |locale| locale.to_s.gsub(/_/, '-') }
http_accept_language.language_region_compatible_from(available_locales).gsub(/-/, '_') parser = HttpAcceptLanguage::Parser.new(request.env["HTTP_ACCEPT_LANGUAGE"])
parser.language_region_compatible_from(available_locales).gsub(/-/, '_')
rescue rescue
# If Accept-Language headers are not set. # If Accept-Language headers are not set.
I18n.default_locale I18n.default_locale