isomorfeus-i18n 1.0.0.epsilon4 → 1.0.0.zeta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 82c32d9c849355121fbdc084e57b20d1e752244048a345b9b404f2c89656ef0d
-  data.tar.gz: 007dd1b9e5243c72c59f0cc3e6518a5b1ffb1f18f9c2bbee8ffc4a382eb92174
+  metadata.gz: '078ab425c4256f17c430d05ae3c5bd7000d4d650d15233fbf64d4488b879a85b'
+  data.tar.gz: 7999006e1b34c9ddb111ce828237c8bc3fe6436ce3c0b9964314bd16d509eab7
 SHA512:
-  metadata.gz: 78e6cb07ce1fcefbe05bc7c978cc610bc3de058903861e77375c3ef5f702e12ed9ba1e39848bfc32218c293bec0323aa592a317c48eb8197eafe9049103bbd72
-  data.tar.gz: 8d4d5fae4989ea5187351c28c206cc7021e3935922d06b48f8c78e083a4411178666352d21963753e900a6dc423b1d36c6c14f67270408fc3a5bf6468f5b2e40
+  metadata.gz: 4fa2ab0befebd0ee3da9b7e90c43c59ea5bd933b90830f1d554e64423fb1575eb7927e0ecffec9e95f09b76b8ecf45abb59ccedc358630a247eb28eae7a34080
+  data.tar.gz: e6ed6b953137e6879044bbb8b5374ce9edc7d1be58f67c880c809bf5a0dcdfefb9f30b8f96c1eef3e181c9eacedd6e2baaea388149655138618281c33bf698ad

data/lib/isomorfeus/i18n/config.rb

@@ -29,6 +29,14 @@ module Isomorfeus
         Isomorfeus.store.dispatch(type: 'I18N_LOAD', data: { locale: locale })
         loc
       end
+
+      def negotiated_locale
+        @negotiated_locale
+      end
+
+      def negotiated_locale=(l)
+        @negotiated_locale = l
+      end
     else
       def available_locales
         @available_locales

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

@@ -11,12 +11,17 @@ module Isomorfeus
           Isomorfeus::I18n::Init.init unless Thread.current[:isomorfeus_i18n_initialized] == true
           result = {}
           # promise_send_path('Isomorfeus::I18n::Handler::LocaleHandler', domain, locale, method, [args])
-          if request == 'init'
-            result['data'] = { 'available_locales' => FastGettext.available_locales,
-                               'locale' => FastGettext.locale,
-                               'domain' => FastGettext.text_domain }
-          else
-            request.each_key do |domain|
+          request.each_key do |domain|
+            if domain == 'init'
+              locale = request[domain]
+              result['data'] = { 'available_locales' => FastGettext.available_locales,
+                                 'domain' => FastGettext.text_domain }
+              result['data']['locale'] = if Isomorfeus.available_locales.include?(locale)
+                                           locale
+                                         else
+                                           FastGettext.locale
+                                         end
+            else
               result[domain] = {}
               begin
                 FastGettext.with_domain(domain) do

data/lib/isomorfeus/i18n/init.rb

@@ -5,7 +5,11 @@ module Isomorfeus
         def self.init
           return if @initializing || initialized?
           @initializing = true
-          Isomorfeus::Transport.promise_send_path('Isomorfeus::I18n::Handler::LocaleHandler', :init).then do |response|
+          if Isomorfeus.on_browser?
+            root_element = `document.querySelector('div[data-iso-root]')`
+            Isomorfeus.negotiated_locale = root_element.JS.getAttribute('data-iso-nloc')
+          end
+          Isomorfeus::Transport.promise_send_path('Isomorfeus::I18n::Handler::LocaleHandler', :init, Isomorfeus.negotiated_locale).then do |response|
             if response[:agent_response].key?(:error)
               `console.error(#{response[:agent_response][:error].to_n})`
               raise response[:agent_response][:error]

data/lib/isomorfeus/i18n/version.rb

@@ -1,5 +1,5 @@
 module Isomorfeus
   module I18n
-    VERSION = '1.0.0.epsilon4'
+    VERSION = '1.0.0.zeta1'
   end
 end

data/lib/isomorfeus-i18n.rb

@@ -13,6 +13,8 @@ else
   require 'active_support'
   require 'oj'
   require 'fast_gettext'
+  require 'http_accept_language/parser'
+  require 'http_accept_language/middleware'
   require 'isomorfeus/promise'
   require 'isomorfeus-data'
   require 'isomorfeus/i18n/config'
@@ -20,6 +22,8 @@ else
   require 'lucid_translation/mixin'
   require 'isomorfeus/i18n/handler/locale_handler'
 
+  Isomorfeus.add_middleware(HttpAcceptLanguage::Middleware)
+
   Opal.append_path(__dir__.untaint) unless Opal.paths.include?(__dir__.untaint)
 
   Isomorfeus.locale_path = File.expand_path(File.join('isomorfeus', 'locales'))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-i18n
 version: !ruby/object:Gem::Version
-  version: 1.0.0.epsilon4
+  version: 1.0.0.zeta1
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-19 00:00:00.000000000 Z
+date: 2019-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -38,20 +38,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.1
+- !ruby/object:Gem::Dependency
+  name: http_accept_language
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.1.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.1.1
 - !ruby/object:Gem::Dependency
   name: oj
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.8.0
+        version: 3.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.8.0
+        version: 3.9.0
 - !ruby/object:Gem::Dependency
   name: opal
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +114,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 16.9.5
+        version: 16.9.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 16.9.5
+        version: 16.9.8
 - !ruby/object:Gem::Dependency
   name: isomorfeus-redux
   requirement: !ruby/object:Gem::Requirement
@@ -128,56 +142,56 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.epsilon4
+        version: 1.0.0.zeta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.epsilon4
+        version: 1.0.0.zeta1
 - !ruby/object:Gem::Dependency
   name: isomorfeus-data
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.epsilon4
+        version: 1.0.0.zeta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.epsilon4
+        version: 1.0.0.zeta1
 - !ruby/object:Gem::Dependency
   name: isomorfeus-installer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.epsilon4
+        version: 1.0.0.zeta1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.epsilon4
+        version: 1.0.0.zeta1
 - !ruby/object:Gem::Dependency
   name: opal-webpack-loader
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.4
+        version: 0.9.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.4
+        version: 0.9.5
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement