tr8n_client_sdk 3.2.4 → 3.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a430fd6d3363d71807fa76e4714576232ab7e700
-  data.tar.gz: c8cde0b647c66310f119bb533deb7aa375549651
+  metadata.gz: 6298c33328834895b2d251533980efb1de6cd6af
+  data.tar.gz: f089ec3e0d84765d0d5e2df3b13f83995e2588b9
 SHA512:
-  metadata.gz: b4764c1074158103a77c61f2a8d157fd5a12a53e80b86446b98d0b7d5ef96dd864f3e9e60dd2ebb969c1b3d6f8a06a4a5713ab59a3a055fbfd614d03b8727951
-  data.tar.gz: e0dd79cbf38762b3d20500c142c6a5ac71133f992aecd6fec02bb37bc12fc0f69e0646b9014013d5e56d54d923c5b58fccf93fcc766669005c1566d4c12b0701
+  metadata.gz: 3357cad03fa504b87999b9ebdfe722e444a04b2f5a8e8176e0c3503da2b1c8fa1ef6fafcbd5acf8c8b7ba56669a6f0ed0f36298354b1838c0e773291da314ede
+  data.tar.gz: e00f81f50af6731c77f0a33f4bf66ea0bbacdea8d3c927904340c8785514a62f97572e0211f538bad2d6f92ac0c9bf197356e77e42262580379b11d821278c05

data/lib/tr8n_client_sdk/extensions/action_common_methods.rb

@@ -41,7 +41,7 @@ module Tr8nClientSdk
     # tr(:label => label, :description => "", :tokens => {}, :options => {})
     ############################################################
     def tr(label, description = '', tokens = {}, options = {})
-      return label.html_safe if label.tr8n_translated?
+      return label.html_safe if label.is_a?(String) and label.tr8n_translated?
 
       params = Tr8n::Utils.normalize_tr_params(label, description, tokens, options)
       params[:options][:caller] = caller

data/lib/tr8n_client_sdk/extensions/action_controller_extension.rb

@@ -41,6 +41,7 @@ module Tr8nClientSdk
         base.rescue_from 'Tr8n::Exception' do |e|
           Tr8n.logger.error(e)
           Tr8n.logger.error(e.backtrace)
+          Tr8n.session.reset
           raise e
         end
       end

data/lib/tr8n_client_sdk/extensions/action_view_extension.rb

@@ -166,19 +166,23 @@ module Tr8nClientSdk
     ######################################################################
 
     def tr8n_style_attribute_tag(attr_name = 'float', default = 'right', lang = tr8n_current_language)
+      return "#{attr_name}:#{default}".html_safe if Tr8n.config.disabled?
       "#{attr_name}:#{lang.align(default)}".html_safe
     end
 
     def tr8n_style_directional_attribute_tag(attr_name = 'padding', default = 'right', value = '5px', lang = tr8n_current_language)
+      return "#{attr_name}-#{default}:#{value}".html_safe if Tr8n.config.disabled?
       "#{attr_name}-#{lang.align(default)}:#{value}".html_safe
     end
 
     def tr8n_dir_attribute_tag(lang = tr8n_current_language)
+      return "dir='ltr'" if Tr8n.config.disabled?
       "dir='#{lang.dir}'".html_safe
     end
 
     def tr8n_lang_attribute_tag(lang = tr8n_current_language)
-      "lang=#{lang.locale}".html_safe
+      return "lang='en-US'" if Tr8n.config.disabled?
+      "lang='#{lang.locale}'".html_safe
     end
 
   end

data/lib/tr8n_client_sdk/railtie.rb

@@ -37,8 +37,6 @@ require File.join(File.dirname(__FILE__), 'extensions/action_common_methods')
 require File.join(File.dirname(__FILE__), 'extensions/action_view_extension')
 require File.join(File.dirname(__FILE__), 'extensions/action_controller_extension')
 
-require File.join(File.dirname(__FILE__), 'extensions/string')
-
 module Tr8nClientSdk
   class Railtie < ::Rails::Railtie #:nodoc:
     initializer 'tr8n_client_sdk' do |app|

data/lib/tr8n_client_sdk/version.rb

@@ -22,5 +22,5 @@
 #++
 
 module Tr8nClientSdk
-  VERSION = '3.2.4'
+  VERSION = '3.2.5'
 end

data/lib/tr8n_client_sdk.rb

@@ -21,9 +21,10 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
 
+require "tr8n_core"
+require "tr8n_client_sdk/core/string"
 require "tr8n_client_sdk/railtie"
 require "tr8n_client_sdk/engine"
-require "tr8n_core"
 require "tr8n/cache_adapters/rails"
 
 module Tr8nClientSdk

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tr8n_client_sdk
 version: !ruby/object:Gem::Version
-  version: 3.2.4
+  version: 3.2.5
 platform: ruby
 authors:
 - Michael Berkovich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-26 00:00:00.000000000 Z
+date: 2014-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -56,11 +56,11 @@ files:
 - lib/tasks/tr8n_client_sdk.rake
 - lib/tr8n/cache_adapters/rails.rb
 - lib/tr8n_client_sdk.rb
+- lib/tr8n_client_sdk/core/string.rb
 - lib/tr8n_client_sdk/engine.rb
 - lib/tr8n_client_sdk/extensions/action_common_methods.rb
 - lib/tr8n_client_sdk/extensions/action_controller_extension.rb
 - lib/tr8n_client_sdk/extensions/action_view_extension.rb
-- lib/tr8n_client_sdk/extensions/string.rb
 - lib/tr8n_client_sdk/railtie.rb
 - lib/tr8n_client_sdk/version.rb
 homepage: https://translationexchange.com