lalala 4.0.0.dev.216 → 4.0.0.dev.217

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f68f137f902b08e0e4f92acf354db45d849a5cf9
-  data.tar.gz: bde651a085fa75003c6576afa0a2b9e42da03a3f
+  metadata.gz: 1fbc493bd1a98fb3e020f9583b0f1015b2c18522
+  data.tar.gz: c774fb2673124caec8932a00433af4c8331e661e
 SHA512:
-  metadata.gz: 2e466b1265e1fd5010c9f4bc2108d2214a8e0830dff5cf1848b555cc020224bf9010297c97e3c3876464c5643f737a950e4930ef4b4923858da01911b8a7cc78
-  data.tar.gz: 94705a273d45f2dd7160e2edd904d2f365577e2248c1d90c5fb5ce60e2c88a2442fbf34008ecdceb23f51bc8038349cdcbf828f2e9a1cf767fb146c4638df7b0
+  metadata.gz: 5f3b4e2dd5a7275a121dbed7a281e0067fc8ac0374eaf45557ecb34b078afc6598ea5bbf02dee24a351cfb1a5d5b25149f7d674a1cbe2f0a8b948e57a0ee4c6c
+  data.tar.gz: 754d35365da80bd208fba9ad26a37fcf6ed890414ef7c4c1a26859a06a7d04dcb79b98bf33db72f4c806dc9db1e4b2e56f893ef129bd667df0f2aff9184ca519

data/lib/lalala/engine.rb

@@ -83,6 +83,12 @@ module Lalala
 
   end
 
+
+  if defined?(I18n)
+    I18n.send(
+      :extend, Lalala::ExtI18n::LocaleSource)
+  end
+
   ActiveSupport.on_load :active_record do
     Lalala::ExtWithAdvisoryLock.patch!
   end

data/lib/lalala/ext_i18n.rb

@@ -4,4 +4,5 @@ module Lalala::ExtI18n
   autoload :InputHelper
   autoload :NegotiationAdapter
   autoload :TestNegotiationAdapter
+  autoload :LocaleSource
 end

data/lib/lalala/ext_i18n/locale_source.rb

@@ -0,0 +1,11 @@
+module Lalala::ExtI18n::LocaleSource
+
+  def locale_source
+    Thread.current['i18n.local_source']
+  end
+
+  def locale_source=(val)
+    Thread.current['i18n.local_source'] = val
+  end
+
+end

data/lib/lalala/ext_rack/i18n_negotiator.rb

@@ -16,7 +16,8 @@ protected
   def _call(env)
     @env = env
 
-    _locale = I18n.locale
+    _locale        = I18n.locale
+    _locale_source = I18n.locale_source
 
     if @adapter.ignored?(env)
       I18n.locale = locale_for_ignored.to_sym
@@ -29,6 +30,7 @@ protected
     return determine_routing_path
   ensure
     I18n.locale = _locale
+    I18n.locale_source = _locale_source
   end
 
 private
@@ -39,6 +41,7 @@ private
     if m = one_available_locale?
       @env['rack.locale']           = m[0]
       @env['lalala.cannonical_url'] = nil
+      @env['lalala.locale.source']  = 'default'
       return action(true)
     end
 
@@ -46,6 +49,7 @@ private
     if m = hostname_with_one_available_locale?
       @env['rack.locale']           = m[0]
       @env['lalala.cannonical_url'] = nil
+      @env['lalala.locale.source']  = 'host'
       return action(true)
     end
 
@@ -55,6 +59,7 @@ private
       @env['SCRIPT_NAME']           = m[1]
       @env['PATH_INFO']             = m[2]
       @env['lalala.cannonical_url'] = nil
+      @env['lalala.locale.source']  = 'path'
       return action(true)
     end
 
@@ -63,10 +68,12 @@ private
       @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
 
     @env['rack.locale'] = default_locale_for_hostname.to_sym
+    @env['lalala.locale.source']  = 'default'
     return action(true)
   end
 
@@ -76,7 +83,8 @@ private
     case action
 
     when :call
-      I18n.locale = new_env['rack.locale'].to_sym
+      I18n.locale        = new_env['rack.locale'].to_sym
+      I18n.locale_source = new_env['lalala.locale.source']
 
       status, headers, body = @app.call(new_env)
       headers['Content-Language'] = I18n.locale.to_s

data/lib/lalala/version.rb

@@ -1,6 +1,6 @@
 module Lalala
   VERSION = "4.0.0"
-  BUILD   = "216"
+  BUILD   = "217"
 
   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.216
+  version: 4.0.0.dev.217
 platform: ruby
 authors:
 - Simon Menke
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-25 00:00:00.000000000 Z
+date: 2013-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeadmin
@@ -1419,6 +1419,7 @@ files:
 - lib/lalala/ext_active_record/schema/join_table_inverter.rb
 - lib/lalala/ext_i18n.rb
 - lib/lalala/ext_i18n/input_helper.rb
+- lib/lalala/ext_i18n/locale_source.rb
 - lib/lalala/ext_i18n/negotiation_adapter.rb
 - lib/lalala/ext_i18n/test_negotiation_adapter.rb
 - lib/lalala/ext_rack.rb