lalala 4.0.0.dev.134 → 4.0.0.dev.135

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ff12f23f11e3f4a30243125978c3afed923dcfb
-  data.tar.gz: 32268b08b966ad0084f3c64daa9186106cb285d7
+  metadata.gz: 243cacf07c63af7e7b293d9ac4d341903e4e635a
+  data.tar.gz: 127e4de1d99878c5400a7117c6f9973ba39f40bd
 SHA512:
-  metadata.gz: 01a1a6daa3a96804b2ad33fa4a7a7fe986db1af15b196c4b990e1e8cdc9c0c0d4877a6d43ee8bc37a0c7851d567923877bfab89f5c996643116bb73240046456
-  data.tar.gz: f0b36b20bfb665ae6087a5a66795ddadb0c3c5b15beb796df5dce3f8dc0f3e0ede1864c014d58833d125e05a0add4982e91a502cbf629426d8565a1b2f6912e3
+  metadata.gz: 4f1363d1cefdeb22512b2c470cba48175aeee45f24f31be73f4daa844fcb42528a9049919159e6cf280f7cdcf198b05ac914692da4fead81047a5c0e7b910ae0
+  data.tar.gz: 53678295db3e381c351b1e0b84bb44ac5eec4b96a60ff9a39c4fa409a5be65bc9ad0ebf9138f0926b1b343a67fbd4fb4000e778025b6896246b047ba1dad02c9

data/app/models/lalala/page.rb

@@ -249,6 +249,7 @@ private
       # update translated attributes
       begin
         _locale = I18n.locale
+
         I18n.available_locales.each do |locale|
           I18n.locale = locale
 
@@ -277,17 +278,24 @@ private
   end
 
   def set_path_component
-    r = self.route
-    case r
-    when NilClass
-      self.path_component = self.class.default_route.call(self)
-    when Proc
-      self.path_component = r.call(self)
-    when String
-      self.path_component = r
-    else
-      raise "Unexpected path_component value: #{r.inspect}"
+    _locale = I18n.locale
+    I18n.available_locales.each do |locale|
+
+      r = self.route
+      case r
+      when NilClass
+        self.path_component = self.class.default_route.call(self)
+      when Proc
+        self.path_component = r.call(self)
+      when String
+        self.path_component = r
+      else
+        raise "Unexpected path_component value: #{r.inspect}"
+      end
+
     end
+  ensure
+    I18n.locale = _locale
   end
 
 end

data/lib/lalala/ext_i18n/negotiation_adapter.rb

@@ -12,6 +12,10 @@ class Lalala::ExtI18n::NegotiationAdapter
     nil
   end
 
+  def locale_for_ignored
+    default_locale
+  end
+
   def locales_for_hostname(hostname)
     available_locales
   end

data/lib/lalala/ext_rack/i18n_negotiator.rb

@@ -19,7 +19,11 @@ protected
     _locale = I18n.locale
 
     if @adapter.ignored?(env)
-      return @app.call(env)
+      I18n.locale = locale_for_ignored.to_sym
+      @env['rack.locale'] = I18n.locale
+      status, headers, body =  @app.call(env)
+      headers['Content-Language'] = I18n.locale.to_s
+      return [status, headers, body]
     end
 
     return determine_routing_path
@@ -72,7 +76,7 @@ private
     case action
 
     when :call
-      I18n.locale = new_env['rack.locale']
+      I18n.locale = new_env['rack.locale'].to_sym
 
       status, headers, body = @app.call(new_env)
       headers['Content-Language'] = I18n.locale.to_s
@@ -194,6 +198,10 @@ private
     @_locales_for_hostname_set ||= locales_for_hostname.map(&:to_s)
   end
 
+  def locale_for_ignored
+    @_locale_for_ignored ||= @adapter.locale_for_ignored
+  end
+
   def hostname
     @_hostname ||= @env['HTTP_HOST'].split(':').first
   end

data/lib/lalala/version.rb

@@ -1,6 +1,6 @@
 module Lalala
   VERSION = "4.0.0"
-  BUILD   = "134"
+  BUILD   = "135"
 
   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.134
+  version: 4.0.0.dev.135
 platform: ruby
 authors:
 - Simon Menke