isomorfeus-i18n 22.9.0.rc1 → 22.9.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3893f1f4b352b6e2e6cb2ff85eae4c8ea8a47ae277c169124b2ed2142358693
-  data.tar.gz: 782bf79faf33d6c4514f3e7d2cc3128a129d68ccbbb6c3849f783196079e37cc
+  metadata.gz: 0da2d72a216e3b42416b741c5135ef4cc4abace851c6f0d52c4d2f312fc246b1
+  data.tar.gz: d20f330be1b5f50f215fd21e1fe5d79a17cad3a35c28f66f994a3fd5d68d24dc
 SHA512:
-  metadata.gz: dccc5bb3e1a44f8c7a5f7a68953b511390a9064d11ace5f7f23f840b25837034c084668384213843be64ec09491941265c38d097c6e7ab8ba36e14c29d91d2f6
-  data.tar.gz: 7db066fed00ba4c942e417102015a8a985e6392a9813e87012c2aed9d9b4f0471ae37f331567f58309ed92551b731f0845b097d178d4936d0065fc71a256df58
+  metadata.gz: 394751e9d95f3d30e6dc24bd9b785035de3850f0cbe10b6ad5e78604f0a7d17351b6ee35353bea3309d8ba2db12992a08cc06002717a250d932cca6f6d8037c8
+  data.tar.gz: 9c72c1d20e74016d7df24a3789acdca8d603397a221589f5151f00a4450df3cb3cc687f005029866016bb3ff5bcf9fbf5c485b83a1f9f34d7cedb265b34f289f

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.rc1'
+    VERSION = '22.9.0.rc3'
   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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-i18n
 version: !ruby/object:Gem::Version
-  version: 22.9.0.rc1
+  version: 22.9.0.rc3
 platform: ruby
 authors:
 - Jan Biedermann
@@ -114,28 +114,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 22.9.0.rc1
+        version: 22.9.0.rc3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 22.9.0.rc1
+        version: 22.9.0.rc3
 - !ruby/object:Gem::Dependency
   name: isomorfeus-transport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 22.9.0.rc1
+        version: 22.9.0.rc3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 22.9.0.rc1
+        version: 22.9.0.rc3
 - !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.rc1
+        version: 22.9.0.rc3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 22.9.0.rc1
+        version: 22.9.0.rc3
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement