tml-rails 4.3.5 → 4.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1d7f5a9a456ca1ea9c40a7071fe7363242c95fe1
-  data.tar.gz: d714d0fbb8069f74721cc0ed781d8fc7d50ad86e
+  metadata.gz: 31518cae75a56656469869252dc6393c4685f142
+  data.tar.gz: 99b866f3875844de045df3cdd2a2b9875c29d5a0
 SHA512:
-  metadata.gz: 3974f5d3981a72d883ff8b62f7d26801cfe7e3bb66663ac48939b2ba4ce0f1309a15104b0009b6fad22a6007e04e79232af40f360afd197b4ef102efa0ae78c9
-  data.tar.gz: 43c8b91a78091f2fc434d83e13ea37b2eb099f9b31f7a22b6e32c88d20e64d27e0c65fd86c9383f91c55756bd7df3f1cafd98f9e96553ae01d323657b77e25fc
+  metadata.gz: 63d6f040d7c11669c625a4f9c9eb97229f44c88eb1d780f16557c74375a0858deba3a884bedee6e6ae2ef23704ec0b6f0b84d132a8e36cb83353747b683fe6da
+  data.tar.gz: 0aca72492fd0871e46dbcd67dde9ce1394718c5312c2c316ce3c72bf48ee67b8c93d03a9eb1d25ed86bf83a613d116a0eb752626288df9aba3686a720160269d

data/lib/i18n/backend/tml.rb

@@ -31,6 +31,7 @@
 
 require 'i18n/backend/base'
 require 'tml'
+require 'pp'
 
 module I18n
   module Backend
@@ -47,10 +48,32 @@ module I18n
           application.locales
         end
 
+        def translate(locale, key, options = {})
+          super(locale, key, options).html_safe
+        end
+
         def lookup(locale, key, scope = [], options = {})
+          #pp ''
+          #pp [locale, key, scope, options]
+
           default_key = super(application.default_locale, key, scope, options)
+
+          #pp default_key
+
           default_key ||= key
-          application.language(locale.to_s).translate(default_key)
+          if default_key.is_a?(String)
+            translated_key = default_key.gsub('%{', '{')
+            translated_key = application.language(locale.to_s).translate(translated_key, options, options)
+          elsif default_key.is_a?(Hash)
+            translated_key = {}
+            default_key.each do |key, value|
+              value = value.gsub('%{', '{')
+              translated_key[key] =  application.language(locale.to_s).translate(value, options, options)
+            end
+          end
+
+          #pp translated_key
+          translated_key
         end
 
       end

data/lib/tml_rails/extensions/action_controller_extension.rb

@@ -81,14 +81,6 @@ module TmlRails
         not session[:tml_tools_disabled]
       end
 
-      def tml_locale
-        self.send(Tml.config.current_locale_method) if Tml.config.current_locale_method
-      rescue
-        session[:locale] = tml_user_preferred_locale unless session[:locale]
-        session[:locale] = params[:locale] if params[:locale]
-        session[:locale] || Tml.config.default_locale
-      end
-
       def tml_init_client_sdk
         return if Tml.config.disabled?
 
@@ -112,10 +104,22 @@ module TmlRails
           end
         end
 
-        if tml_tools_enabled? # gets translator and locale from the cookie
-          tml_session_params.merge!(:cookies => request.cookies)
-        else # uses default locale
-          tml_session_params.merge!(:locale => tml_locale)
+        if Tml.config.current_locale_method
+          begin
+            tml_session_params.merge!(:locale => self.send(Tml.config.current_locale_method))
+          rescue
+            # Tml.logger.error('Current locale method is specified but not provided')
+          end
+        end
+
+        unless tml_session_params[:locale]
+          if tml_tools_enabled? # gets translator and locale from the cookie
+            tml_session_params.merge!(:cookies => request.cookies)
+          else
+            session[:locale] = tml_user_preferred_locale unless session[:locale]
+            session[:locale] = params[:locale] if params[:locale]
+            tml_session_params.merge!(:locale => session[:locale] || Tml.config.default_locale)
+          end
         end
 
         Tml.session.init(tml_session_params)

data/lib/tml_rails/version.rb

@@ -30,5 +30,5 @@
 #++
 
 module TmlRails
-  VERSION = '4.3.5'
+  VERSION = '4.3.6'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tml-rails
 version: !ruby/object:Gem::Version
-  version: 4.3.5
+  version: 4.3.6
 platform: ruby
 authors:
 - Michael Berkovich