tml 5.1.2 → 5.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4ae1644d633f0f8ead496d5ac732ccd9dcbc34c
-  data.tar.gz: b92c379114a8878d85a27b997c098319cd756eca
+  metadata.gz: 0300e4226b97cf3ce5cd8fca0a4d59c27a13f2de
+  data.tar.gz: f774ba24f23e3a76e8820d43e3d8b7551c54f7da
 SHA512:
-  metadata.gz: 9fd13088aa2fbc7f9f02a5c424e62c35111ec4f2edcba5cb2b8e2d02f1a9839e9d199b9545c20ae001ad82190b3546fe1e61e1e0d65ca241f3d7fdd6cb5d81a5
-  data.tar.gz: e4b4cd7014d4c3fb5bc6a8b81f94532ce036054338912d802dce3c8e8c4c249238a1121d7d58e51e903e98531c2485513dd0e021c83247f17c79fb0f8c7ceb10
+  metadata.gz: 31ee76daca1aadeaa2a7ebd9f0fca81f8d61d72cced0419c70a91b65e5551e1bc66432748d15aeea17f541bbb6c2ebe95b12df438cff046e2a45455f512d31ca
+  data.tar.gz: a4dbb6d81dd70b481cf5a75210d64ad77582c994db9013bad378f59116326fdabc09c3677cd4af6ddbd5888a6428a0f71f841df2cf445b8504c4ebf2526b59cf

data/lib/tml/api/client.rb

@@ -133,7 +133,7 @@ class Tml::Api::Client < Tml::Base
     return false if opts[:cache_key].nil?
     return false unless Tml.cache.enabled?
     return false if Tml.session.inline_mode?
-    return false if Tml.session.block_option(:live)
+    return false if Tml.session.block_option(:live) and opts[:cache_key].index('sources')
     true
   end
 

data/lib/tml/cache_adapters/memcache.rb

@@ -65,7 +65,7 @@ class Tml::CacheAdapters::Memcache < Tml::Cache
 
     data
   rescue Exception => ex
-    warn("Failed to retrieve data: #{key}")
+    warn("#{ex.message}: #{key}")
     return nil unless block_given?
     yield
   end
@@ -76,7 +76,6 @@ class Tml::CacheAdapters::Memcache < Tml::Cache
     @cache.set(versioned_key(key, opts), strip_extensions(data), ttl)
     data
   rescue Exception => ex
-    pp ex
     warn("Failed to store data: #{key}")
     data
   end

data/lib/tml/ext/array.rb

@@ -67,7 +67,7 @@ class Array
   end
 
   # creates a sentence with tr "and" joiner
-  def translate_sentence(description = '', options = {})
+  def translate_sentence(description = nil, options = {})
     return '' if empty?
     return first if size == 1
 
@@ -77,7 +77,7 @@ class Array
     options[:joiner] ||= 'and'
 
     result = elements[0..-2].join(options[:separator])
-    result << ' ' << options[:joiner].translate('List elements joiner', {}, options) << ' '
+    result << ' ' << options[:joiner].translate(description || 'List elements joiner', {}, options) << ' '
     result << elements.last
 
     result.tml_translated

data/lib/tml/source.rb

@@ -91,9 +91,7 @@ class Tml::Source < Tml::Base
       "sources/#{self.key}/translations",
       {:locale => locale, :per_page => 10000},
       {:cache_key => Tml::Source.cache_key(locale, self.source)}
-    )
-
-    return self unless results
+    ) || []
 
     update_translations(locale, results)
 

data/lib/tml/tokens/data.rb

@@ -214,7 +214,7 @@ module Tml
         uniq_id = Tml::TranslationKey.generate_key(label, values.join(","))
         result << "<span id=\"tml_other_link_#{uniq_id}\"> #{joiner} "
 
-        result << "<a href='#' onClick=\"Tml.Utils.Effects.hide('tml_other_link_#{uniq_id}'); Tml.Utils.Effects.show('tml_other_elements_#{uniq_id}'); return false;\">"
+        result << "<a href='#' onClick=\"document.getElementById('tml_other_link_#{uniq_id}').style.display='none'; document.getElementById('tml_other_elements_#{uniq_id}').style.display='inline'; return false;\">"
         if list_options[:remainder] and list_options[:remainder].is_a?(Proc)
           result << list_options[:remainder].call(remaining_ary)
         else
@@ -229,7 +229,7 @@ module Tml
         result << remaining_ary.last
 
         if list_options[:collapsable]
-          result << "<a href='#' style='font-size:smaller;white-space:nowrap' onClick=\"Tml.Utils.Effects.show('tml_other_link_#{uniq_id}'); Tml.Utils.Effects.hide('tml_other_elements_#{uniq_id}'); return false;\"> "
+          result << "<a href='#' style='font-size:smaller;white-space:nowrap' onClick=\"document.getElementById('tml_other_link_#{uniq_id}').style.display='inline'; document.getElementById('tml_other_elements_#{uniq_id}').style.display='none'; return false;\"> "
           result << language.translate(list_options[:less], list_options[:description], {}, options)
           result << "</a>"
         end

data/lib/tml/version.rb

@@ -30,5 +30,5 @@
 #++
 
 module Tml
-  VERSION = '5.1.2'
+  VERSION = '5.1.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tml
 version: !ruby/object:Gem::Version
-  version: 5.1.2
+  version: 5.1.3
 platform: ruby
 authors:
 - Michael Berkovich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-05 00:00:00.000000000 Z
+date: 2015-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday