isomorfeus-i18n 2.0.13 → 2.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea585a5bea7705cbbe044ced0b6d36d2c5abcea25ce7d769b9cd6f23c24c2cbc
-  data.tar.gz: f348a005aa131e9fe8ccf2c79ddf8360be8afe29bcff99ee397a716229838aba
+  metadata.gz: 19c3f04397961ff73562b1c3b2ed2e88748d1c43e1155ca143ec89a8854181d5
+  data.tar.gz: 5ec0ac920f141b67c8ed05553f342c933084441a44699bf1dab22b8ca9a738ca
 SHA512:
-  metadata.gz: 6a6270eef401a5b9876ef8d8bebac278866715accc7bc5e0ab22c1e72171670145e911d2ec008c3ffd568e93a251ec5c80ca9b2f55437c79fb67f3ba63b4445c
-  data.tar.gz: 6e58bf7de6ae186ec8f70fcd68b2de0a582e8d48981c76a3642a3dca42a9d74882b7d76239b7a5713e0df3a59855da2f1192915138e68d2492411508c3556553
+  metadata.gz: 4d971aa6da6acfd4bce69b92c1f2593ee70523fb2b9a4a8cc2d0b900377f97fffe5e2939ec889dd9ec58a3523a90ec2195793970f6b850d065a46a6c9d741f76
+  data.tar.gz: 164115c3a80efe2114548debedf6db48823645a824ef64f5c63e3a335831f979aaaec59400aedcc03cd6c877f0d23ff34f87678d9b2b7f05fd3d83502a952314

data/lib/isomorfeus/fast_gettext_cache.rb

@@ -0,0 +1,6 @@
+class FastGettext::Cache
+  def reload_all!
+    @store = {}
+    reload!
+  end
+end

data/lib/isomorfeus/i18n/handler/locale_handler.rb

@@ -24,7 +24,10 @@ module Isomorfeus
             else
               response_agent.agent_result[domain] = {}
               begin
-                Isomorfeus::I18n::Init.init if Isomorfeus.development?
+                if Isomorfeus.development?
+                  Isomorfeus::I18n::Init.init
+                  FastGettext.cache.reload_all!
+                end
                 FastGettext.with_domain(domain) do
                   response_agent.request[domain].each_key do |locale|
                     response_agent.agent_result[domain][locale] = {}

data/lib/isomorfeus/i18n/init.rb

@@ -18,13 +18,7 @@ module Isomorfeus
 
           def init_from_server
             Isomorfeus::Transport.promise_send_path('Isomorfeus::I18n::Handler::LocaleHandler', :init, Isomorfeus.negotiated_locale).then do |agent|
-              if agent.processed
-                agent.result
-              else
-                agent.processed = true
-                if agent.response.key?(:error)
-                  Isomorfeus.raise_error(message: agent.response[:error])
-                end
+              agent.process do
                 @initializing = false
                 Isomorfeus.store.dispatch(type: 'I18N_LOAD', data: agent.response[:data])
                 @initialized = true
@@ -34,13 +28,7 @@ module Isomorfeus
 
           def reload_from_server
             Isomorfeus::Transport.promise_send_path('Isomorfeus::I18n::Handler::LocaleHandler', :init, Isomorfeus.negotiated_locale).then do |agent|
-              if agent.processed
-                agent.result
-              else
-                agent.processed = true
-                if agent.response.key?(:error)
-                  Isomorfeus.raise_error(message: agent.response[:error])
-                end
+              agent.process do
                 Isomorfeus.store.dispatch(type: 'I18N_STATE', set_state: agent.response[:data])
               end
             end

data/lib/isomorfeus/i18n/version.rb

@@ -1,5 +1,5 @@
 module Isomorfeus
   module I18n
-    VERSION = '2.0.13'
+    VERSION = '2.0.17'
   end
 end

data/lib/isomorfeus-i18n.rb

@@ -15,6 +15,7 @@ else
   require 'active_support'
   require 'oj'
   require 'fast_gettext'
+  require 'isomorfeus/fast_gettext_cache'
   require 'http_accept_language/parser'
   require 'http_accept_language/middleware'
   require 'isomorfeus-data'

data/lib/lucid_translation/mixin.rb

@@ -13,7 +13,7 @@ module LucidTranslation
         result = Redux.fetch_by_path(:i18n_state, domain, locale, '_', keys)
         return result if result
         _promise_send_i18n_method(domain, locale, '_', keys)
-        block_given? ? block.call : keys.first
+        block_given? ? block.call : ''
       end
 
       def n_(*keys, count, &block)
@@ -23,7 +23,7 @@ module LucidTranslation
         result = Redux.fetch_by_path(:i18n_state, domain, locale, 'n_', keys + [count])
         return result if result
         _promise_send_i18n_method(domain, locale, 'n_', keys + [count])
-        block_given? ? block.call : keys.last
+        block_given? ? block.call : ''
       end
 
       def np_(context, plural_one, *args, separator: nil, &block)
@@ -50,7 +50,7 @@ module LucidTranslation
         result = Redux.fetch_by_path(:i18n_state, domain, locale, 'p_', args)
         return result if result
         _promise_send_i18n_method(domain, locale, 'p_', args)
-        block_given? ? block.call : key
+        block_given? ? block.call : ''
       end
 
       def s_(key, separator = nil, &block)
@@ -60,7 +60,7 @@ module LucidTranslation
         result = Redux.fetch_by_path(:i18n_state, domain, locale, 's_', args)
         return result if result
         _promise_send_i18n_method(domain, locale, 's_', args)
-        block_given? ? block.call : key.split(separator || NAMESPACE_SEPARATOR).last
+        block_given? ? block.call : ''
       end
 
       def N_(translate)
@@ -112,13 +112,7 @@ module LucidTranslation
       end
 
       def _handle_i18n_response(agent, domain)
-        if agent.processed
-          agent.result
-        else
-          agent.processed = true
-          if agent.response.key?(:error)
-            Isomorfeus.raise_error(message: agent.response[:error])
-          end
+        agent.process do
           if on_browser?
             Isomorfeus.store.collect_and_defer_dispatch(type: 'I18N_LOAD', data: { domain => agent.response[domain] })
           else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-i18n
 version: !ruby/object:Gem::Version
-  version: 2.0.13
+  version: 2.0.17
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-01 00:00:00.000000000 Z
+date: 2022-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.6.24
+        version: 10.6.27
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.6.24
+        version: 10.6.27
 - !ruby/object:Gem::Dependency
   name: isomorfeus-redux
   requirement: !ruby/object:Gem::Requirement
@@ -142,42 +142,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.13
+        version: 2.0.17
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.13
+        version: 2.0.17
 - !ruby/object:Gem::Dependency
   name: isomorfeus-data
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.13
+        version: 2.0.17
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.13
+        version: 2.0.17
 - !ruby/object:Gem::Dependency
   name: isomorfeus
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.13
+        version: 2.0.17
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.13
+        version: 2.0.17
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -215,6 +215,7 @@ files:
 - LICENSE
 - README.md
 - lib/isomorfeus-i18n.rb
+- lib/isomorfeus/fast_gettext_cache.rb
 - lib/isomorfeus/i18n/config.rb
 - lib/isomorfeus/i18n/handler/locale_handler.rb
 - lib/isomorfeus/i18n/init.rb