tr8n_core 4.0.12 → 4.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a984c2942575807bbf4d7e6b3b340ce2c2428020
-  data.tar.gz: 5cd3e83a8c544fb42a390a9218b1350f4ba66d01
+  metadata.gz: dca2df7d8abff227fe6cd78b14724655e1e111a0
+  data.tar.gz: d96499b858853cb354e8bc0f518fc92fe58e37df
 SHA512:
-  metadata.gz: 936c126d175de897ac02f4635c6052db44f4314ec3ed745d4e2a150b5ecc99514f1f64e54d8e58735a85f3dbc5a4a290fd9e3d4162923b67c3a36cf38a77435d
-  data.tar.gz: 91c3092764f4a26a38d9a0b731daac3b1fe686b257a3b53d62889b7c735d6fa47edb771b134a755fcfc6e9d1490caeb8ff16604886eaee55e9adca95b64d9815
+  metadata.gz: fe7f3e60226a364b1f95e9876bfcf60a229ea3d5c39f0fe956faeb64a1daa95968e75f1ad8287e04529d51c81c5345d8e9f0157314e419716e16e3c0efaad45b
+  data.tar.gz: 3a4308861adb7328031deb12d362026d8c57e8b04cf1fac065050b105a155cc352db6c82d99103f1db78c2f0ffe27ba04056fba462e2b03ffa5a1461110531e3

data/lib/tr8n/language.rb

@@ -117,9 +117,8 @@ class Tr8n::Language < Tr8n::Base
   ########################################################################################################
 
   def translate(label, description = nil, tokens = {}, options = {})
-    return label if label.tr8n_translated?
-
     params = Tr8n::Utils.normalize_tr_params(label, description, tokens, options)
+    return params[:label] if params[:label].tr8n_translated?
 
     translation_key = Tr8n::TranslationKey.new({
       :application  => application,
@@ -145,7 +144,9 @@ class Tr8n::Language < Tr8n::Base
 
     # should this be done only for testing?
     cached_key = application.translation_key(translation_key.key)
-    return cached_key.translate(self, params[:tokens], params[:options]) if cached_key
+    if cached_key
+      return cached_key.translate(self, params[:tokens], params[:options]).tr8n_translated
+    end
 
     source_key = current_source(options)
     source = application.source(source_key, locale)

data/lib/tr8n_core/ext/array.rb

@@ -32,27 +32,34 @@
 class Array
 
   # translates an array of options for a select tag
-  def tro(description = "", options = {}, language = Tr8n.session.current_language)
+  def tro(description = '', options = {})
     return [] if empty?
 
+    options = options.merge(:skip_decorations => true)
+
     collect do |opt|
       if opt.is_a?(Array) and opt.first.is_a?(String) 
-        [opt.first.trl(description, {}, options, language), opt.last]
+        [opt.first.translate(description, {}, options), opt.last]
       elsif opt.is_a?(String)
-        [opt.trl(description, {}, options, language), opt]
+        [opt.translate(description, {}, options), opt]
       else  
         opt
       end
     end
   end
 
+  # translates and joins all elements
+  def translated_and_join(separator = '', description = '', options = {})
+    self.translate(description, options).join(separator).tr8n_translated
+  end
+
   # translate array values 
-  def trl(description = "", options = {}, language = Tr8n.session.current_language)
+  def translate(description = '', options = {})
     return [] if empty?
 
     collect do |opt|
       if opt.is_a?(String)
-        opt.trl(description, {}, options, language)
+        opt.translate(description, {}, options)
       else  
         opt
       end
@@ -60,23 +67,20 @@ class Array
   end
 
   # creates a sentence with tr "and" joiner
-  def tr_sentence(options = {}, language = Tr8n.session.current_language)
+  def translate_sentence(description = '', options = {})
     return "" if empty?
     return first if size == 1
 
-    result = "#{self[0..-2].join(", ")}"
-    result << " " << "and".translate("List elements joiner", {}, options, language) << " "
-    result << self.last
-  end
+    elements = translate(description, options)
 
-  def tr8n_translated
-    return self if frozen?
-    @tr8n_translated = true
-    self
-  end
+    options[:separator] ||= ', '
+    options[:joiner] ||= 'and'
+
+    result = elements[0..-2].join(options[:separator])
+    result << ' ' << options[:joiner].translate('List elements joiner', {}, options) << ' '
+    result << elements.last
 
-  def tr8n_translated?
-    @tr8n_translated
+    result.tr8n_translated
   end
 
 end

data/lib/tr8n_core/ext/date.rb

@@ -47,7 +47,9 @@ class Date
   #
   # The last allows you to use language cases to get something like "on March 1st".
 
-  def translate(format = :default, language = Tr8n.session.current_language, options = {})
+  def translate(format = :default, options = {})
+    language = Tr8n.session.current_language
+
     label = (format.is_a?(String) ? format.clone : Tr8n.config.default_date_formats[format].clone)
 
     selected_tokens = []
@@ -90,7 +92,7 @@ class Date
   end
   alias :tr :translate  
   
-  def trl(format = :default, language = Tr8n.session.current_language, options = {})
-    tr(format, language, options.merge!(:skip_decorations => true))
+  def trl(format = :default, options = {})
+    tr(format, options.merge!(:skip_decorations => true))
   end
 end

data/lib/tr8n_core/ext/fixnum.rb

@@ -35,13 +35,13 @@ class Fixnum
     (to_i < 10 ? "0#{to_s}" : to_s)
   end
 
-  def translate(desc = "", tokens = {}, options = {}, language = Tr8n.session.current_language)
-    to_s.translate(desc, tokens, options, language)
+  def translate(desc = "", tokens = {}, options = {})
+    to_s.translate(desc, tokens, options)
   end
   alias tr translate
   
-  def trl(desc = "", tokens = {}, options = {}, language = Tr8n.session.current_language)
-    to_s.trl(desc, tokens, options, language)
+  def trl(desc = "", tokens = {}, options = {})
+    to_s.trl(desc, tokens, options)
   end
 
 end

data/lib/tr8n_core/ext/hash.rb

@@ -30,18 +30,7 @@
 #++
 
 class Hash
-
-  def tr8n_translated
-    return self if frozen?
-    @tr8n_translated = true
-    self
-  end
-
-  def tr8n_translated?
-    @tr8n_translated
-  end
-
-  # 
+  #
   # = Hash Recursive Merge
   # 
   # Merges a Ruby Hash recursively, Also known as deep merge.

data/lib/tr8n_core/ext/string.rb

@@ -31,12 +31,16 @@
 
 class String
 
-  def translate(desc = "", tokens = {}, options = {}, language = Tr8n.session.current_language)
-    language.translate(self, desc, tokens, options)
+  def translate(desc = '', tokens = {}, options = {})
+    Tr8n.session.current_language.translate(
+        Tr8n::Utils.normalize_tr_params(self, desc, tokens, options)
+    )
   end
 
-  def trl(desc = "", tokens = {}, options = {}, language = Tr8n.session.current_language)
-    translate(desc, tokens, options.merge(:skip_decorations => true), language)
+  def trl(desc = '', tokens = {}, options = {})
+    Tr8n.session.current_language.translate(
+        Tr8n::Utils.normalize_tr_params(self, desc, tokens, options.merge(:skip_decorations => true))
+    )
   end
 
   def tr8n_translated

data/lib/tr8n_core/ext/time.rb

@@ -31,7 +31,9 @@
 
 class Time
 
-  def translate(format = :default, language = Tr8n.session.current_language, options = {})
+  def translate(format = :default, options = {})
+    language = Tr8n.session.current_language
+
     label = (format.is_a?(String) ? format.clone : Tr8n.config.default_date_formats[format].clone)
     symbols = label.scan(/(%\w)/).flatten.uniq
 
@@ -78,8 +80,8 @@ class Time
   end
   alias :tr :translate
 
-  def trl(format = :default, language = Tr8n.session.current_language, options = {})
-    tr(format, language, options.merge!(:skip_decorations => true))
+  def trl(format = :default, options = {})
+    tr(format, options.merge!(:skip_decorations => true))
   end
 
 end

data/lib/tr8n_core/version.rb

@@ -30,5 +30,5 @@
 #++
 
 module Tr8nCore
-  VERSION = '4.0.12'
+  VERSION = '4.0.13'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tr8n_core
 version: !ruby/object:Gem::Version
-  version: 4.0.12
+  version: 4.0.13
 platform: ruby
 authors:
 - Michael Berkovich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-26 00:00:00.000000000 Z
+date: 2014-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.5'
 description: Tr8n core classes that can be used by any Ruby framework
 email:
 - michael@tr8nhub.com