tml-rails 5.4.5 → 5.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f3676748ce4f93018dd2a75c7990cea547c0e663
-  data.tar.gz: 6a5235f0a7f3881acff7b34538783f9aa9fa7260
+  metadata.gz: bf3a772c2d881f6862aa2fe6dae70c021d65ed66
+  data.tar.gz: 8dc31a645a9f092905cfb4b0ca8d39db18eccc78
 SHA512:
-  metadata.gz: b7fd3487544b74d680dfae6192372054969f515811018d93f5babd483c6a82bf37238e83652b32401e76ac84f07f8557ab1d5b264f110077bc93b9f8590f0d8d
-  data.tar.gz: 15a714c0c4ef2ba37858618b2802c30f882fa024010fa1d051b745ee02448ec756ac03f3a0ccd3d2fee169b3a79a58df0fcf553afb6ef0a0b8555332b65febc2
+  metadata.gz: d6c56a78acfd2c5144cf3085252ca68182981ad7ea3794ffc4661e8346a6ddd114d633aea3aa0b25f6805d16423572fa67a841212c5b5fe88e30e917ba191608
+  data.tar.gz: 0be0458b0969a2381e1941f00d4a951a9f3653b1c0326f991760b4bdfb97c1db9586c7019a42a4ce03986d5d11942b7ae37161af19d97136eeadbf9ce2f2a0ad

data/lib/i18n/backend/tml.rb

@@ -40,55 +40,62 @@ module I18n
       module Implementation
         include Base, Flatten
 
+        # Returns current application
         def application
           ::Tml.session.application
         end
 
+        # List of all application available locales
         def available_locales
           application.locales
         end
 
-        def translate(locale, key, options = {})
-          translation = super(locale, key, options)
-          translation.is_a?(String) ? translation.html_safe : translation
+        # we will capture interpolation here - so we can process it ourselves using TML
+        def interpolate(locale, string, values = {})
+          string
         end
 
+        # TODO: this should be configurable. Our SDK supports both notations.
         def convert_to_tml(str)
           str.gsub('%{', '{')
         end
 
-        def lookup(locale, key, scope = [], options = {})
-          # pp [locale, key, scope, options]
-
-          if key.to_s.match(/^(support|i18n|number|human|distance)/)
-            return super(locale, key, scope, options)
+        # Translates a hash of values
+        def translate_hash(target_language, hash, options)
+          hash.each do |key, value|
+            if value.is_a?(String)
+              hash[key] = target_language.translate(convert_to_tml(value), options, options)
+            elsif value.is_a?(Hash)
+              translate_hash(target_language, value, options)
+            end
           end
 
-          # if language is not available, return default value
-          target_language = application.language(locale.to_s)
-          target_language ||= application.language(application.default_locale)
+          hash
+        end
 
-          unless target_language
-            return super(locale, key, scope, options)
-          end
+        # Translates a string
+        def translate(locale, key, options = {})
+          # TODO: we don't support this yet - but we should
+          return super if I18n.locale != locale
 
-          default_key = super(application.default_locale, key, scope, options)
-          default_key ||= key.to_s.split('.').last.gsub('_', ' ').capitalize
+          # look up the translation in default locale
+          translation = super(application.default_locale, key, options)
 
-          if default_key.is_a?(String)
-            translated_key = target_language.translate(convert_to_tml(default_key), options, options)
-          elsif default_key.is_a?(Hash)
-            translated_key = {}
+          # pp [locale, key, options, translation]
 
-            default_key.each do |key, value|
-              if value.is_a?(String)
-                value = target_language.translate(convert_to_tml(value), options, options)
-              end
-              translated_key[key] = value
-            end
+          # if no translation is available, ignore it
+          return translation if translation.nil? or translation == ''
+
+          # if language is not available, return default value
+          target_language = application.language(locale.to_s)
+
+          if translation.is_a?(String)
+            translation = target_language.translate(convert_to_tml(translation), options, options)
+          elsif translation.is_a?(Hash)
+            translation = translate_hash(target_language, translation, options)
           end
 
-          translated_key
+          translation
         end
 
       end

data/lib/tasks/templates/tml.rb

@@ -31,64 +31,64 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
 
+# If you are already using I18n or want to use it in parallel, set I18n::Backend::Tml as the backend
 I18n.backend = I18n::Backend::Tml.new
 
 Tml.configure do |config|
+
   config.application = {
-      key: 'YOUR KEY'
+      key: 'YOUR_APPLICATION_KEY'
   }
 
   # If you are using Rails.cache, use the following settings:
 
   config.cache = {
-      :enabled    => true,
-      :adapter    => :rails
+      enabled: true,
+      adapter: :rails
   }
 
   # If you are using File based pre-generated cache, use the following settings:
 
   #config.cache = {
-  #    :enabled    => true,
-  #    :adapter    => 'file',
-  #    :path       => 'config/tml',
-  #    :version    => 'current',
-  #    :segmented  => false
+  #     enabled:   true,
+  #     adapter:   'file',
+  #     path:      File.join(Rails.root, :config, :tml),
+  #     version:   'current',
+  #     segmented: false
   #}
 
   # If you are using Redis, use the following settings:
 
   #config.cache = {
-  #    :enabled   => true,
-  #    :adapter   => 'redis',
-  #    :host      => 'localhost',
-  #    :port      => 6379,
-  #    :db        => 0,
-  #    :namespace => 'translations',
+  #     enabled:    true,
+  #     adapter:    'redis',
+  #     host:       'localhost',
+  #     port:       6379,
+  #     namespace:  'translations',
   #}
 
   # If you are using Memcache, use the following settings:
 
   #config.cache = {
-  #  :enabled    => true,
-  #  :adapter    => 'memcache',
-  #  :host       => 'localhost:11211',
-  #  :version    => 1,
-  #  :namespace  => 'translations',
+  #     enabled:    true,
+  #     adapter:    'memcache',
+  #     host:       'localhost:11211',
+  #     namespace:  'translations',
   #}
 
   # For debugging, uncomment the following lines:
 
   #config.logger  = {
-  #    :enabled  => true,
-  #    :path     => "#{Rails.root}/log/tml.log",
-  #    :level    => 'debug'
+  #     enabled:    true,
+  #     path:       File.join(Rails.root, :log, 'tml.log'),
+  #     level:      'debug'
   #}
 
   # To use Rails logger instead, use:
 
   #config.logger  = {
-  #    :enabled  => true,
-  #    :type     => :rails
+  #    enabled:     true,
+  #    type:        :rails
   #}
 
 end

data/lib/tml_rails/extensions/action_controller_extension.rb

@@ -98,7 +98,9 @@ module TmlRails
               locale = tml_cookie[:locale]
               if locale.nil?
                 if Tml.config.locale[:subdomain]
-                  locale = request.subdomain
+                  locale = request.subdomains.first
+                elsif Tml.config.locale[:tld]
+                  locale = request.host.split('.').last
                 else
                   locale = tml_browser_accepted_locales
                 end
@@ -154,11 +156,13 @@ module TmlRails
             :access_token => tml_access_token
         )
 
-        if I18n.backend.class.name == 'I18n::Backend::Tml'
-          if defined? I18n.enforce_available_locales
-            I18n.enforce_available_locales = false
-          end
-          I18n.locale = Tml.session.current_language.locale
+        if defined? I18n.enforce_available_locales
+          I18n.enforce_available_locales = false
+        end
+        I18n.locale = Tml.session.current_language.locale
+
+        if tml_current_translator and tml_current_translator.inline?
+          I18n.reload!
         end
       end
 

data/lib/tml_rails/version.rb

@@ -30,5 +30,5 @@
 #++
 
 module TmlRails
-  VERSION = '5.4.5'
+  VERSION = '5.4.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tml-rails
 version: !ruby/object:Gem::Version
-  version: 5.4.5
+  version: 5.4.6
 platform: ruby
 authors:
 - Michael Berkovich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-03 00:00:00.000000000 Z
+date: 2016-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails