lalala 4.0.0.dev.385 → 4.0.0.dev.388

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8fd0d8f163ccb5d5eb43c15cd9274c26a1b61d7b
-  data.tar.gz: d401a1661fdd239e9de28acaf40045cf7a9a6ac4
+  metadata.gz: 8d455d04941fbba81dee21d7cea88fbfe64c77f9
+  data.tar.gz: 863c022c791fd66ea4d40a99aae9752db8c5d9f7
 SHA512:
-  metadata.gz: e1b636bc5bb47e0da5857c5f8dafc8acde35ac47d6cf72d971e82f920fab7ee434364d24cd74a156908f605809f43d5a1203510afaed1b0d82e8d7c9d242895b
-  data.tar.gz: 207a29236ad8dca0d56a5c5d9558ff9f40c9f91f2f196ab3a3b1505e8f9ca3ad64273d1f31bad29e5bc556a5115bfa4dbf02f60ee053a4e09d8027612f780f67
+  metadata.gz: 3502c6efdf7bf4d5d5b8f4d1243a4d4645842d6e0cfd110683a4c3cbed0ec56fd7610dff75e103ff1449b567f43ee9747aab3e83c89ab7d81248423794511a39
+  data.tar.gz: 529bbac1b78081af35a7bcf526a1d2347094d502fc7e50c727eb18d42e41e850f7e69184c2b8aaf80665770a93fbab96168a9bc4b6659c2453cb69b508900dee

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.0.0"
-  BUILD   = "385"
+  BUILD   = "388"
 
   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.0.0.dev.385
+  version: 4.0.0.dev.388
 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