tml 5.6.5 → 5.7.1

data/lib/tml/tokens/x_message/map.rb

@@ -0,0 +1,54 @@
+# encoding: UTF-8
+#--
+# Copyright (c) 2016 Translation Exchange, Inc
+#
+#  _______                  _       _   _             ______          _
+# |__   __|                | |     | | (_)           |  ____|        | |
+#    | |_ __ __ _ _ __  ___| | __ _| |_ _  ___  _ __ | |__  __  _____| |__   __ _ _ __   __ _  ___
+#    | | '__/ _` | '_ \/ __| |/ _` | __| |/ _ \| '_ \|  __| \ \/ / __| '_ \ / _` | '_ \ / _` |/ _ \
+#    | | | | (_| | | | \__ \ | (_| | |_| | (_) | | | | |____ >  < (__| | | | (_| | | | | (_| |  __/
+#    |_|_|  \__,_|_| |_|___/_|\__,_|\__|_|\___/|_| |_|______/_/\_\___|_| |_|\__,_|_| |_|\__, |\___|
+#                                                                                        __/ |
+#                                                                                       |___/
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#++
+
+####################################################################### 
+# 
+# Map Token
+#
+# {0} tagged himself/herself in {1,choice,singular#{1,number} {2,map,photo#photo|video#video}|plural#{1,number} {2,map,photo#photos|video#videos}}.
+#
+####################################################################### 
+
+class Tml::Tokens::XMessage::Map < Tml::Tokens::Data
+
+  attr_accessor :params
+
+  def initialize(label, opts)
+    @label = label
+    @short_name = opts[:index]
+    @full_name = "{#{@short_name}}"
+    @params = opts[:styles].collect{|style| style[:key]}
+    @case_keys = []
+    @context_keys = []
+  end
+
+end

data/lib/tml/translation_key.rb

@@ -34,7 +34,7 @@ require 'digest/md5'
 
 class Tml::TranslationKey < Tml::Base
   belongs_to :application, :language
-  attributes :id, :key, :label, :description, :locale, :level
+  attributes :id, :key, :label, :description, :locale, :level, :syntax
   has_many :translations # hashed by language
 
   def initialize(attrs = {})
@@ -68,6 +68,7 @@ class Tml::TranslationKey < Tml::Base
   end
 
   def set_translations(locale, translations)
+    return unless translations
     translations.each do |translation|
       translation.locale ||= locale
       translation.translation_key = self
@@ -199,6 +200,12 @@ class Tml::TranslationKey < Tml::Base
   end
 
   def substitute_tokens(translated_label, token_values, language, options = {})
+    if options[:syntax] == 'xmessage'
+      # pp "Translating #{translated_label} using xmessage syntax"
+      tokenizer = Tml::Tokenizers::XMessage.new(translated_label)
+      return tokenizer.substitute(language, token_values, options)
+    end
+
     if Tml::Tokenizers::Decoration.required?(translated_label)
       translated_label = Tml::Tokenizers::Decoration.new(translated_label, token_values, :allowed_tokens => decoration_tokens).substitute
     end

data/lib/tml/utils.rb

@@ -41,7 +41,7 @@ module Tml
     def self.normalize_tr_params(label, description, tokens, options)
       return label if label.is_a?(Hash)
 
-      if description.is_a?(Hash)
+      if description.is_a?(Hash) or description.is_a?(Array)
         return {
           :label        => label,
           :description  => nil,

data/lib/tml/version.rb

@@ -31,7 +31,7 @@
 #++
 
 module Tml
-  VERSION = '5.6.5'
+  VERSION = '5.7.1'
 
   def self.full_version
     "tml-ruby v#{Tml::VERSION} (Faraday v#{Faraday::VERSION})"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tml
 version: !ruby/object:Gem::Version
-  version: 5.6.5
+  version: 5.7.1
 platform: ruby
 authors:
 - Michael Berkovich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-23 00:00:00.000000000 Z
+date: 2017-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -84,9 +84,16 @@ files:
 - lib/tml/tokenizers/data.rb
 - lib/tml/tokenizers/decoration.rb
 - lib/tml/tokenizers/dom.rb
+- lib/tml/tokenizers/x_message.rb
 - lib/tml/tokens/data.rb
+- lib/tml/tokens/decoration.rb
+- lib/tml/tokens/map.rb
 - lib/tml/tokens/method.rb
 - lib/tml/tokens/transform.rb
+- lib/tml/tokens/x_message/choice.rb
+- lib/tml/tokens/x_message/data.rb
+- lib/tml/tokens/x_message/decoration.rb
+- lib/tml/tokens/x_message/map.rb
 - lib/tml/translation.rb
 - lib/tml/translation_key.rb
 - lib/tml/translator.rb