tr8n_core 4.0.16 → 4.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f42d555219e71bb58c86535e4a8c992e3343032
-  data.tar.gz: a11497c6e6f55880a9c73132130051d4401228c1
+  metadata.gz: 470f4942f0fab2b30f5a0d7b712ae1a23794303c
+  data.tar.gz: b7066bedabf3daa74aaad31d11ca3cb8bf76b45b
 SHA512:
-  metadata.gz: 5146a1907d0e0685615814e640f1a07b02d091c4f5f184a6e79a7b844cfe55a0cb552296302120a8374a531e8d0467a45199dbc63110a1d71a43d0ca37720d7c
-  data.tar.gz: 352115940aba499f2ea752c5a9c980e2f51cb66c4ae49f6c7a74af6fade8138f299c6b79b53aec8ff9679f8c4bd336e37b6f6c7d7c2265b5e3dc0abfb77ebbe4
+  metadata.gz: 2d17fb49dd55b1f0fd6e6798060dc6e90694f3e77bec6771fa00ef41aae6b0b446a4e6f331db0ee0f67a0b99890a7085c6a1d502160c52cfb37a18da3967425f
+  data.tar.gz: 86a847db7c7af547f2c036d3b38c0eb2c51bd13b3310cfc2f565f9f2997c01f0768b61348f951699ecb482346ce643a048442a410a9c92cb12dbcb6be429c8c0

data/lib/tr8n/decorators/html.rb

@@ -33,6 +33,7 @@
 class Tr8n::Decorators::Html < Tr8n::Decorators::Base
 
   def decorate(translated_label, translation_language, target_language, translation_key, options = {})
+    # Tr8n.logger.info("Decorating #{translated_label} of #{translation_language.locale} to #{target_language.locale}")
     # skip decoration if instructed so
     return translated_label if options[:skip_decorations]
     # if translation key language is the same as target language - skip decorations
@@ -41,7 +42,12 @@ class Tr8n::Decorators::Html < Tr8n::Decorators::Base
     return translated_label if translation_key.locked? and not Tr8n.session.current_translator.manager?
 
     element = 'tr8n:tr'
-    element = 'div' if options[:use_div]
+    if options[:use_div]
+      element = 'div'
+    elsif options[:use_span]
+      element = 'span'
+    end
+
     classes = ['tr8n_translatable']
     
     if translation_key.locked?
@@ -56,7 +62,7 @@ class Tr8n::Decorators::Html < Tr8n::Decorators::Base
       classes << 'tr8n_fallback'
     end
 
-    html = "<#{element} class='#{classes.join(' ')}' data-translation_key='#{translation_key.key}'>"
+    html = "<#{element} class='#{classes.join(' ')}' data-translation_key='#{translation_key.key}' data-target_locale='#{target_language.locale}'>"
     html << translated_label
     html << "</#{element}>"
     html

data/lib/tr8n/language.rb

@@ -129,9 +129,10 @@ class Tr8n::Language < Tr8n::Base
       :translations => []
     })
 
-    #Tr8n.logger.info("Translating " + params[:label] + " from: " + key_locale.inspect + " to " + locale.inspect)
+    # Tr8n.logger.info("Translating " + params[:label] + " from: " + translation_key.locale.inspect + " to " + locale.inspect)
 
-    params[:tokens].merge!(:viewing_user => Tr8n.session.current_user)
+    params[:tokens] ||= {}
+    params[:tokens][:viewing_user] ||= Tr8n.session.current_user
 
     if Tr8n.config.disabled? or self.locale == translation_key.locale
       return translation_key.substitute_tokens(

data/lib/tr8n/session.rb

@@ -70,6 +70,23 @@ module Tr8n
     def application
       @application ||= Tr8n::Application.new(:host => Tr8n::ApiClient::API_HOST)
     end
+
+    def source_language
+      arr = @block_options || []
+      arr.reverse.each do |opts|
+        return application.language(opts[:locale]) unless opts[:locale].blank?
+      end
+      application.language
+    end
+
+    def target_language
+      arr = @block_options || []
+      arr.reverse.each do |opts|
+        return application.language(opts[:target_locale]) unless opts[:target_locale].blank?
+      end
+      current_language
+    end
+
     #########################################################
     ## Block Options
     #########################################################

data/lib/tr8n/tokenizers/dom.rb

@@ -114,7 +114,7 @@ module Tr8n
 
         tml = tml.gsub(/[\n]/, '').gsub(/\s\s+/, ' ').strip
 
-        translation = option('debug') ? debug_translation(tml) : Tr8n.session.current_language.translate(tml, tokens, options)
+        translation = option('debug') ? debug_translation(tml) : Tr8n.session.target_language.translate(tml, tokens, options)
         reset_context
         translation
       end

data/lib/tr8n/translator.rb

@@ -68,4 +68,8 @@ class Tr8n::Translator < Tr8n::Base
     "http://gravatar.com/avatar/#{gravatar_id}.png?s=48"
   end
 
+  def inline?
+    return Tr8n.session.block_options[:inline] unless Tr8n.session.block_options[:inline].nil?
+    super
+  end
 end

data/lib/tr8n_core/ext/date.rb

@@ -48,7 +48,7 @@ class Date
   # The last allows you to use language cases to get something like "on March 1st".
 
   def translate(format = :default, options = {})
-    language = Tr8n.session.current_language
+    language = Tr8n.session.target_language
 
     label = (format.is_a?(String) ? format.clone : Tr8n.config.default_date_formats[format].clone)
 

data/lib/tr8n_core/ext/string.rb

@@ -32,13 +32,13 @@
 class String
 
   def translate(desc = '', tokens = {}, options = {})
-    Tr8n.session.current_language.translate(
+    Tr8n.session.target_language.translate(
         Tr8n::Utils.normalize_tr_params(self, desc, tokens, options)
     )
   end
 
   def trl(desc = '', tokens = {}, options = {})
-    Tr8n.session.current_language.translate(
+    Tr8n.session.target_language.translate(
         Tr8n::Utils.normalize_tr_params(self, desc, tokens, options.merge(:skip_decorations => true))
     )
   end

data/lib/tr8n_core/ext/time.rb

@@ -32,7 +32,7 @@
 class Time
 
   def translate(format = :default, options = {})
-    language = Tr8n.session.current_language
+    language = Tr8n.session.target_language
 
     label = (format.is_a?(String) ? format.clone : Tr8n.config.default_date_formats[format].clone)
     symbols = label.scan(/(%\w)/).flatten.uniq

data/lib/tr8n_core/version.rb

@@ -30,5 +30,5 @@
 #++
 
 module Tr8nCore
-  VERSION = '4.0.16'
+  VERSION = '4.0.17'
 end

metadata

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