lalala 4.1.0.dev.386 → 4.1.0.dev.387

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a157893f622e947588570da112634c9800039dc
-  data.tar.gz: afd7f1fe2d2e099ad9c8b359699b54711085ec68
+  metadata.gz: e37a0475df835fc6ed0e38b1d7018ff2e452a2a0
+  data.tar.gz: 4b094e5fbb5023efb596a11d20b5ca0294ff70bd
 SHA512:
-  metadata.gz: e5fc509c46f05fd391877b5b8a1a43f272bb20448beeff774ea44cdf25e7e85dcbf42401780ec922cb53386fd3e9667a59c50c7211e904165861e6e8b720c0ce
-  data.tar.gz: 9820a188fcb721e1b77d7b55b208d0530e9e3ce4009062597da3da692b604e06671a46e029d1859109885086da20426619f65fae33099aa3ab4a67e97866b76f
+  metadata.gz: d6db6f49bda2370c06827328c846d9db2df395a5880457f7b290d3f946ef88c66c47197321eaea91144d9a10a9811a03f0053d3547f1d0cb6bc9cfcf84c4230a
+  data.tar.gz: daae32cd944e668193fe7544643d9a88a89174a755e4b1b583b778393d0171ee21e48458b78432e4549ee0fbf06da9268529f47d95f8d20fff64df0723023173

data/lib/lalala/engine.rb

@@ -12,6 +12,7 @@ module Lalala
     config.lalala = ActiveSupport::OrderedOptions.new
     config.lalala.i18n = ActiveSupport::OrderedOptions.new
     config.lalala.i18n.adapter = nil
+    config.lalala.i18n.allow_accept_language = true
 
     initializer "lalala.migrations" do |app|
       app.class.configure do

data/lib/lalala/ext_i18n/negotiation_adapter.rb

@@ -28,4 +28,8 @@ class Lalala::ExtI18n::NegotiationAdapter
     %r{^/(lalala|assets)(/|$)} === env['PATH_INFO']
   end
 
+  def allow_accept_language
+    !!Rails.configuration.lalala.i18n.allow_accept_language
+  end
+
 end

data/lib/lalala/ext_i18n/test_negotiation_adapter.rb

@@ -18,4 +18,8 @@ class Lalala::ExtI18n::TestNegotiationAdapter < Lalala::ExtI18n::NegotiationAdap
     @domain_locales[hostname]
   end
 
+  def allow_accept_language
+    true
+  end
+
 end

data/lib/lalala/ext_rack/i18n_negotiator.rb

@@ -63,13 +63,15 @@ private
       return action(true)
     end
 
-    Rails.logger.debug "[I18n]: try Accept-Language..."
-    if m = accept_language_is_available?
-      @env['rack.locale']           = m[0]
-      @env['SCRIPT_NAME']           = m[1]
-      @env['lalala.cannonical_url'] = m[2]
-      @env['lalala.locale.source']  = 'header'
-      return action(false)
+    if @adapter.allow_accept_language
+      Rails.logger.debug "[I18n]: try Accept-Language..."
+      if m = accept_language_is_available?
+        @env['rack.locale']           = m[0]
+        @env['SCRIPT_NAME']           = m[1]
+        @env['lalala.cannonical_url'] = m[2]
+        @env['lalala.locale.source']  = 'header'
+        return action(false)
+      end
     end
 
     @env['rack.locale'] = default_locale_for_hostname.to_sym

data/lib/lalala/version.rb

@@ -1,6 +1,6 @@
 module Lalala
   VERSION = "4.1.0"
-  BUILD   = "386"
+  BUILD   = "387"
 
   if BUILD != ("{{BUILD_NUMBER" + "}}") # prevent sed replacement (see script/ci)
     BUILD_VERSION = "#{VERSION}.dev.#{BUILD}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lalala
 version: !ruby/object:Gem::Version
-  version: 4.1.0.dev.386
+  version: 4.1.0.dev.387
 platform: ruby
 authors:
 - Simon Menke
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-21 00:00:00.000000000 Z
+date: 2015-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeadmin