isomorfeus-i18n 23.9.0.rc7 → 23.9.0.rc9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a7ded9ba5ad152e4efd40b727fea61e261354a5a3c5e82c382b604a14306cfd7
-  data.tar.gz: d767462c93a257efd8f39df1f8451dbea15127f937fad37856ed02d0187f17b2
+  metadata.gz: 5d5374fdce9bec3b5feb343a8d3d28e75350009a94058126d6274c6276423a63
+  data.tar.gz: 36174b3a97eb759d59854722c6c4673bcc6afc6e3e2f0bd4fb2205d37cbc8538
 SHA512:
-  metadata.gz: 4b8c0b0cae704ae3fe78ce94ae5b936286e9a098d8eb8a8bb9908c44372d64ba55ef3c7ac377dac2264863fdc2a5e3457dfcb9f9effe042ba855519aa6a94750
-  data.tar.gz: 6defecb3116ce8522fd5127d7ef04f6925fe331417793693ca7e0cab64795abc7448545c85039f3a6abd9ddd15b8a79b2e9f26a7e03169c84565a0e3a133c783
+  metadata.gz: 9f206933d7fc0bce42eca25692716b77d081d18ce1fe27a9cda6d5160aab5ee7760c6046e11a12adccdcfa75e112305a051e4c66663d36491569c0897c583afe
+  data.tar.gz: c281b576b94299198d2455fa2818701290098cf5e382a83dc681692396b819d79477aac40c4d8267b0ca21e9b789e2006b0568aef87aaf8ec974662bab636bcb

data/lib/isomorfeus/i18n/rack_middleware.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Isomorfeus
+  module I18n
+    class RackMiddleware
+      def initialize(app)
+        @app = app
+      end
+
+      def call(env)
+        parser = ::HttpAcceptLanguage::Parser.new(env['HTTP_ACCEPT_LANGUAGE'])
+        locale = parser.preferred_language_from(::Isomorfeus.available_locales) ||
+                   parser.compatible_language_from(::Isomorfeus.available_locales) ||
+                   ::Isomorfeus.default_locale
+        ::Isomorfeus.current_locale = locale if ::Isomorfeus.current_locale != locale
+        env['http_accept_language.parser'] = parser
+        env['locale'] = locale
+        @app.call(env)
+      end
+    end
+  end
+end

data/lib/isomorfeus/i18n/version.rb

@@ -1,5 +1,5 @@
 module Isomorfeus
   module I18n
-    VERSION = '23.9.0.rc7'
+    VERSION = '23.9.0.rc9'
   end
 end

data/lib/isomorfeus-i18n.rb

@@ -24,11 +24,9 @@ Isomorfeus::I18n::Enhancer.add_enhancer_to_store
 
 if RUBY_ENGINE != 'opal'
   require 'http_accept_language/parser'
-  require 'http_accept_language/middleware'
-  require 'isomorfeus/i18n/middleware'
+  require 'isomorfeus/i18n/rack_middleware'
 
-  Isomorfeus.add_middleware(HttpAcceptLanguage::Middleware)
-  Isomorfeus.insert_middleware_after(HttpAcceptLanguage::Middleware, Isomorfeus::I18n::Middleware)
+  Isomorfeus.insert_middleware_before(Isomorfeus::Transport::RackMiddleware, Isomorfeus::I18n::RackMiddleware)
 
   require 'iso_opal'
   Opal.append_path(__dir__) unless IsoOpal.paths.include?(__dir__)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-i18n
 version: !ruby/object:Gem::Version
-  version: 23.9.0.rc7
+  version: 23.9.0.rc9
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-18 00:00:00.000000000 Z
+date: 2023-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -106,28 +106,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 23.9.0.rc7
+        version: 23.9.0.rc9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 23.9.0.rc7
+        version: 23.9.0.rc9
 - !ruby/object:Gem::Dependency
   name: isomorfeus-transport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 23.9.0.rc7
+        version: 23.9.0.rc9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 23.9.0.rc7
+        version: 23.9.0.rc9
 - !ruby/object:Gem::Dependency
   name: r18n-core
   requirement: !ruby/object:Gem::Requirement
@@ -148,14 +148,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 23.9.0.rc7
+        version: 23.9.0.rc9
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 23.9.0.rc7
+        version: 23.9.0.rc9
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -198,8 +198,8 @@ files:
 - lib/isomorfeus/i18n/fast_gettext/cache.rb
 - lib/isomorfeus/i18n/fast_gettext/translation_repository/base.rb
 - lib/isomorfeus/i18n/init.rb
-- lib/isomorfeus/i18n/middleware.rb
 - lib/isomorfeus/i18n/missing_keys.rb
+- lib/isomorfeus/i18n/rack_middleware.rb
 - lib/isomorfeus/i18n/reducer.rb
 - lib/isomorfeus/i18n/version.rb
 - lib/lucid_i18n_mixin.rb

data/lib/isomorfeus/i18n/middleware.rb

@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-module Isomorfeus
-  module I18n
-    class Middleware
-      def initialize(app)
-        @app = app
-      end
-
-      def call(env)
-        locale = env.http_accept_language.preferred_language_from(Isomorfeus.available_locales) ||
-                   env.http_accept_language.compatible_language_from(Isomorfeus.available_locales) ||
-                   Isomorfeus.default_locale
-        Isomorfeus.current_locale = locale if Isomorfeus.current_locale != locale
-        @app.call(env)
-      end
-    end
-  end
-end