isomorfeus-i18n 23.9.0.rc8 → 23.9.0.rc10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '08876874de4e859edf0835127998a8f7411230275dea49f9fc9c9bfea04dd1e1'
-  data.tar.gz: 3c478e87f5ae5e389f9874d4efed626a62a0a97941e77b4354f8c38f945bf422
+  metadata.gz: a0440d08908cb73a829a880f6ed923d62c029af89f2d49f7c4baf4db30d90ba0
+  data.tar.gz: 409b17ce36ee9086c9a1ca137ec3ee654b4cc55cfc22f816f5210256387d0c97
 SHA512:
-  metadata.gz: e874f672ee0f564d720b1379020fc370ed94d5a8dc390d3d72e8504ef25823d0081acbe357c10b8b4884d603e6dd017754464d10022b181eab034c6b05cae019
-  data.tar.gz: b00e5def377d401437bf70538285138246aabaf2d045a1536b1287db3c6e3c45751331cc2fd4ca5489223a039ccdfe3be91259c0bdf471d90df12ef76898e264
+  metadata.gz: b663752ae3508cba655df3b544417faa6414953c6f1130e7939df937640a49055ab987bf0c719dd599288418684cf9e41668c260f66e7aaf226ac7ccbbfe3a69
+  data.tar.gz: 8a0fc084c7b287d690b512dd042947259fe91a666cdc609e713f7eac30082e66d27630a9cb713376f9cfdafdea8f1539a722a50960c02c354dcb7812279e4faa

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.rc8'
+    VERSION = '23.9.0.rc10'
   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.rc8
+  version: 23.9.0.rc10
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-20 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.rc8
+        version: 23.9.0.rc10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 23.9.0.rc8
+        version: 23.9.0.rc10
 - !ruby/object:Gem::Dependency
   name: isomorfeus-transport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 23.9.0.rc8
+        version: 23.9.0.rc10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 23.9.0.rc8
+        version: 23.9.0.rc10
 - !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.rc8
+        version: 23.9.0.rc10
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 23.9.0.rc8
+        version: 23.9.0.rc10
 - !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