tr8n_core 4.0.5 → 4.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 371fea5f20b7e2f8cfb06f4bda1515060fbb3ab6
-  data.tar.gz: cf0ae840daf16a690b35243f5cb500b2f4c23548
+  metadata.gz: cb4ecbec7897fb75e2ed70e0490500b729ece962
+  data.tar.gz: 3ddd6b6eb884f695f599c4f7d1f78cfda744572d
 SHA512:
-  metadata.gz: 1235999df54ca3cdcd5e959f1a4c71b6aeb92bae769da08bd3100f2654e81ce59cdbbf329000650edcf2e6dd78675e7e260e26f666048b26c3383f0720c3beb9
-  data.tar.gz: af88480f1e4d56fbd6dad45503d33c99768581a0be32acb19e34abc08d49814c6e6ae5c62f2156859c2afbb12ead7c2ff9c4534393381a8d7ddceef7b84e177c
+  metadata.gz: 8451854a7e0a9e54fa0c7970f4e09f75f245cbeb4553cd13cc496a01a48134502cd977ac4ea00714401bddff5a25a7413d1440802b81792596a00c31dbcc17a2
+  data.tar.gz: 5fccf44ca8a07e364c81d0c63a091a510a5fc0710e26588f5652e02b36fbca4a986b40182ba6490165fdc6b629fb4bf53dcfbc5b03d21bd338492900fa02e2f2

data/lib/tr8n/application.rb

@@ -171,6 +171,7 @@ class Tr8n::Application < Tr8n::Base
       next unless keys.values.any?
       params << {:source => source, :keys => keys.values.collect{|tkey| tkey.to_hash(:label, :description, :locale, :level)}}
     end
+
     api_client.post('source/register_keys', {:source_keys => params.to_json})
     @missing_keys_by_sources = nil
   end

data/lib/tr8n/config.rb

@@ -309,6 +309,12 @@ module Tr8n
       default_tokens[format.to_sym][type.to_sym][token_name.to_sym]
     end
 
+    def set_default_token(token_name, value, type = :data, format = :html)
+      default_tokens[format.to_sym] ||= {}
+      default_tokens[format.to_sym][type.to_sym] ||= {}
+      default_tokens[format.to_sym][type.to_sym][token_name.to_sym] = value
+    end
+
     #########################################################
     ## Localization
     #########################################################

data/lib/tr8n/language.rb

@@ -110,6 +110,7 @@ class Tr8n::Language < Tr8n::Base
     return label if label.tr8n_translated?
 
     params = Tr8n::Utils.normalize_tr_params(label, description, tokens, options)
+
     key_locale = hash_value(params[:options], :locale) || hash_value(Tr8n.session.block_options, :locale) || Tr8n.config.default_locale
     key_level = hash_value(params[:options], :level) || hash_value(Tr8n.session.block_options, :level) || Tr8n.config.default_level
 
@@ -126,7 +127,7 @@ class Tr8n::Language < Tr8n::Base
 
     params[:tokens].merge!(:viewing_user => Tr8n.session.current_user)
 
-    if Tr8n.config.disabled? or locale == key_locale
+    if Tr8n.config.disabled? or self.locale == key_locale
       return temp_key.substitute_tokens(params[:label], params[:tokens], self, params[:options]).tr8n_translated
     end
 
@@ -136,15 +137,11 @@ class Tr8n::Language < Tr8n::Base
     end
 
     # no cache or translator is using inline mode - use service, otherwise load from cache
-    if not Tr8n.config.cache[:enabled] or (Tr8n.session.current_translator and Tr8n.session.current_translator.inline?)
+    if Tr8n.config.disabled? or (Tr8n.session.current_translator and Tr8n.session.current_translator.inline?)
       return translate_from_service(temp_key, params[:tokens], params[:options]).tr8n_translated  
     end
 
     translate_from_cache(temp_key, params[:tokens], params[:options]).tr8n_translated
-  #rescue Exception => ex
-  #  Tr8n.logger.error("Failed to translate: #{params[:label]} : #{ex.message}")
-  #  Tr8n.logger.error(ex.backtrace)
-  #  params[:label]
   end
   alias :tr :translate
 

data/lib/tr8n/tokens/transform.rb

@@ -165,12 +165,12 @@ class Tr8n::Tokens::Transform < Tr8n::Tokens::Data
     object = self.class.token_object(context, key)
 
     unless object
-      Tr8n::Logger.error("Missing value for a token \"#{key}\" in \"#{label}\"")
+      Tr8n.logger.error("Missing value for a token \"#{key}\" in \"#{label}\"")
       return label
     end
 
     if piped_params.empty?
-      Tr8n::Logger.error("Piped params may not be empty for token \"#{key}\" in \"#{label}\"")
+      Tr8n.logger.error("Piped params may not be empty for token \"#{key}\" in \"#{label}\"")
       return label
     end
 

data/lib/tr8n/translation_key.rb

@@ -114,7 +114,7 @@ class Tr8n::TranslationKey < Tr8n::Base
   end
 
   def translate(language, token_values = {}, options = {})
-    if Tr8n.config.disabled? or language.locale == self.attributes[:locale]
+    if Tr8n.config.disabled? or language.locale == self.locale
       return substitute_tokens(label, token_values, language, options.merge(:fallback => false))
     end
 
@@ -126,10 +126,8 @@ class Tr8n::TranslationKey < Tr8n::Base
       return decorator.decorate(translated_label, translation.language, language, self, options)
     end
 
-    #Tr8n.logger.info("Translating: #{label}")
-
-    translated_label = substitute_tokens(label, token_values, self.attributes[:language], options)
-    decorator.decorate(translated_label, self.attributes[:language], language, self, options)
+    translated_label = substitute_tokens(label, token_values, self.language, options)
+    decorator.decorate(translated_label, self.language, language, self, options)
   end
 
   ###############################################################

data/lib/tr8n_core/version.rb

@@ -23,5 +23,5 @@
 
 
 module Tr8nCore
-  VERSION = "4.0.5"
+  VERSION = "4.0.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tr8n_core
 version: !ruby/object:Gem::Version
-  version: 4.0.5
+  version: 4.0.6
 platform: ruby
 authors:
 - Michael Berkovich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-08 00:00:00.000000000 Z
+date: 2014-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday