isomorfeus-i18n 22.9.0.rc2 → 22.9.0.rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd17e0fdc26a262d57541bace2aa14e2233816c7c3b793744b5ad994ce5eee59
-  data.tar.gz: 6419e97d934a095e4db04e7ca41a407ba3f3b6d850fdea3c017884d9dd68b56f
+  metadata.gz: 03ad11a448d17d9526b877d2ad750d2e95d1203c93e04c5205aac00a9d2508d1
+  data.tar.gz: cddd6d7cbe50ceb959a2582efc7b6a479b7257b08ca45ee27581c8b78176b23e
 SHA512:
-  metadata.gz: bf28366333ea61538c57e17d981867fc28cd718b16328534dc58f6249bf52c132269014e8cb81e66b47155247705b7cf738c3f56c16df7e4df3cf6ee10e738cd
-  data.tar.gz: be1c15ab8b01dd86d6d136923da9048c2f0fc66c8cc13be77f01e3f577df22d80e617c97a08551b4b9d4a99f0dc0162292aaa66f93afb0716c2ffe83b8d75c66
+  metadata.gz: 992fe072934195cfc3a379a5fc6cdb3c86b7a945052c1dd8cfb572c659f54968c6b7d487def93a7dc018b5fc7c9471d560122e19e982d749e39337a1e00892e0
+  data.tar.gz: b16c02adb9e81d4ea93daac76f9741f2e799d7c700608a567a16d2c53e1d4c0a14d689f3275a53bc772e9da11d1d11b0d89b48d505ddf5f9eee30979cd2de652

data/lib/isomorfeus/i18n/enhancer.rb

@@ -34,14 +34,12 @@ module Isomorfeus
             end
           elsif action[:type] == 'I18N_INIT'
             locale = action[:locale]
-            available_locales = FastGettext.available_locales
-            domain = FastGettext.text_domain
             ne_locale = if Isomorfeus.available_locales.include?(locale)
                           Isomorfeus.current_locale = locale
                         else
                           Isomorfeus.current_locale = Isomorfeus.default_locale
                         end
-            action = { type: 'I18N_MERGE', data: { available_locales: available_locales, domain: domain, locale: ne_locale }}
+            action = { type: 'I18N_MERGE', data: { domain: Isomorfeus.i18n_domain, locale: ne_locale }}
           end
           next_enh.call(action)
         end

data/lib/isomorfeus/i18n/init.rb

@@ -1,33 +1,10 @@
 module Isomorfeus
   module I18n
-    class StoreInit
-      def self.init
-        root_element = `document.querySelector('div[data-iso-root]')`
-        if root_element
-          Isomorfeus.current_locale = root_element.JS.getAttribute('data-iso-nloc')
-        else
-          Isomorfeus.current_locale = Isomorfeus.default_locale
-        end
-      end
-    end
-
     class Init
       class << self
         if RUBY_ENGINE == 'opal'
           def init
-            return if @initializing || initialized?
-            @initializing = true
-            @initialized = false
-            init_from_server
-            promise { Isomorfeus.store.dig(:i18n_state, :locale) }
-          end
-
-          def init_from_server
-            Isomorfeus.store.deferred_dispatch(type: 'I18N_INIT', locale: Isomorfeus.current_locale)
-          end
-
-          def initialized?
-            @initialized
+            Isomorfeus.current_locale = Isomorfeus.store.dig(:i18n_state, :locale)
           end
         else
           def init

data/lib/isomorfeus/i18n/reducer.rb

@@ -26,9 +26,7 @@ module Isomorfeus
       else # RUBY_ENGINE
         SERVER_REDUCER = proc do |prev_state, action|
           action_type = action[:type]
-          if action_type == 'I18N_STATE' && action.key?(:set_state)
-            action[:set_state]
-          elsif action_type == 'I18N_MERGE'
+          if action_type == 'I18N_MERGE'
             new_state = prev_state ? prev_state.deep_dup : {}
             new_state.deep_merge!(action[:data])
             new_state

data/lib/isomorfeus/i18n/version.rb

@@ -1,5 +1,5 @@
 module Isomorfeus
   module I18n
-    VERSION = '22.9.0.rc2'
+    VERSION = '22.9.0.rc4'
   end
 end

data/lib/isomorfeus-i18n.rb

@@ -9,8 +9,7 @@ require 'lucid_i18n_mixin'
 require 'isomorfeus/i18n/init'
 
 if RUBY_ENGINE == 'opal'
-  Isomorfeus.add_client_init_after_store_class_name('Isomorfeus::I18n::StoreInit')
-  Isomorfeus.add_transport_init_class_name('Isomorfeus::I18n::Init')
+  Isomorfeus.add_client_init_after_store_class_name('Isomorfeus::I18n::Init')
 else
   require 'active_support'
   require 'oj'

data/lib/lucid_i18n_mixin.rb

@@ -89,6 +89,7 @@ module LucidI18nMixin
       c_name = object.class.to_s
       options = {} unless options
       locale = options.delete(:locale) { current_locale }
+      locale = `locale.toString()`
       options = options.transform_keys { |k| k.camelize(:lower) }
       if object.is_a?(Numeric)
         options[:minimumFractionDigits] = 4 unless object.is_a?(Integer)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-i18n
 version: !ruby/object:Gem::Version
-  version: 22.9.0.rc2
+  version: 22.9.0.rc4
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-24 00:00:00.000000000 Z
+date: 2022-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -100,42 +100,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.15.1
+        version: 0.15.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.15.1
+        version: 0.15.4
 - !ruby/object:Gem::Dependency
   name: isomorfeus-redux
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 22.9.0.rc2
+        version: 22.9.0.rc4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 22.9.0.rc2
+        version: 22.9.0.rc4
 - !ruby/object:Gem::Dependency
   name: isomorfeus-transport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 22.9.0.rc2
+        version: 22.9.0.rc4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 22.9.0.rc2
+        version: 22.9.0.rc4
 - !ruby/object:Gem::Dependency
   name: r18n-core
   requirement: !ruby/object:Gem::Requirement
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 22.9.0.rc2
+        version: 22.9.0.rc4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 22.9.0.rc2
+        version: 22.9.0.rc4
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement