tr8n_client_sdk 1.1.1 → 3.2.2

data/lib/tr8n_client_sdk/extensions/action_view_extension.rb

@@ -1,6 +1,14 @@
 #--
-# Copyright (c) 2013 Michael Berkovich, tr8nhub.com
+# Copyright (c) 2014 Michael Berkovich, TranslationExchange.com
 #
+#  _______                  _       _   _             ______          _
+# |__   __|                | |     | | (_)           |  ____|        | |
+#    | |_ __ __ _ _ __  ___| | __ _| |_ _  ___  _ __ | |__  __  _____| |__   __ _ _ __   __ _  ___
+#    | | '__/ _` | '_ \/ __| |/ _` | __| |/ _ \| '_ \|  __| \ \/ / __| '_ \ / _` | '_ \ / _` |/ _ \
+#    | | | | (_| | | | \__ \ | (_| | |_| | (_) | | | | |____ >  < (__| | | | (_| | | | | (_| |  __/
+#    |_|_|  \__,_|_| |_|___/_|\__,_|\__|_|\___/|_| |_|______/_/\_\___|_| |_|\__,_|_| |_|\__, |\___|
+#                                                                                        __/ |
+#                                                                                       |___/
 # 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
@@ -25,74 +33,82 @@ module Tr8nClientSdk
   module ActionViewExtension
     extend ActiveSupport::Concern
 
-    def tr8n_options_for_select(options, selected = nil, description = nil, lang = Tr8n.config.current_language)
+    def trh(tokens = {}, options = {}, &block)
+      return '' unless block_given?
+
+      label = capture(&block)
+
+      tokenizer = Tr8n::Tokenizers::Dom.new(tokens, options)
+      tokenizer.translate(label).html_safe
+    end
+
+    def tr8n_options_for_select(options, selected = nil, description = nil, lang = Tr8n.session.current_language)
       options_for_select(options.tro(description), selected)
     end
 
     def tr8n_phrases_link_tag(search = "", phrase_type = :without, phrase_status = :any)
       return unless Tr8n.config.enabled?
-      return if Tr8n.config.current_language.default?
-      return unless Tr8n.config.current_translator.inline?
+      return if tr8n_current_language.default?
+      return unless tr8n_current_translator.inline?
 
-      link_to(image_tag(Tr8n.config.url_for("/assets/tr8n/translate_icn.gif"), :style => "vertical-align:middle; border: 0px;", :title => search),
-                        Tr8n.config.url_for("/tr8n/app/phrases/index?search=#{search}")).html_safe
+      link_to(image_tag(tr8n_application.url_for("/assets/tr8n/translate_icn.gif"), :style => "vertical-align:middle; border: 0px;", :title => search),
+              tr8n_application.url_for("/tr8n/app/phrases/index?search=#{search}")).html_safe
     end
 
-    def tr8n_language_flag_tag(lang = Tr8n.config.current_language, opts = {})
-      return "" unless Tr8n.config.application.feature_enabled?(:language_flags)
+    def tr8n_language_flag_tag(lang = tr8n_current_language, opts = {})
+      return "" unless tr8n_application.feature_enabled?(:language_flags)
       html = image_tag(lang.flag_url, :style => "vertical-align:middle;", :title => lang.native_name)
-      html << "&nbsp;".html_safe 
+      html << "&nbsp;".html_safe
       html.html_safe
     end
 
-    def tr8n_language_name_tag(lang = Tr8n.config.current_language, opts = {})
+    def tr8n_language_name_tag(lang = tr8n_current_language, opts = {})
       show_flag = opts[:flag].nil? ? true : opts[:flag]
       name_type = opts[:name].nil? ? :full : opts[:name] # :full, :native, :english, :locale
-      linked = opts[:linked].nil? ? true : opts[:linked] 
+      linked = opts[:linked].nil? ? true : opts[:linked]
 
       html = "<span style='white-space: nowrap'>"
       html << tr8n_language_flag_tag(lang, opts) if show_flag
       html << "<span dir='ltr'>"
 
       name = case name_type
-        when :native  then lang.native_name
-        when :english then lang.english_name
-        when :locale  then lang.locale
-        else lang.full_name
-      end
-
-#      if linked
-#        # Todo: use language selector
-##        html << link_to(name.html_safe, "/tr8n/language/switch?locale=#{lang.locale}&language_action=switch_language&source_url=#{CGI.escape(opts[:source_url]||'')}")
-#      else
-        html << name
-      #end
+               when :native  then lang.native_name
+               when :english then lang.english_name
+               when :locale  then lang.locale
+               else lang.full_name
+             end
 
+      html << name
       html << "</span></span>"
       html.html_safe
     end
 
+    def tr8n_language_selector_tag(opts = {})
+      return unless Tr8n.config.enabled?
+      render(:partial => '/tr8n_client_sdk/tags/language_selector', :locals => {:opts => opts})
+    end
+
     def tr8n_language_strip_tag(opts = {})
       opts[:flag] = opts[:flag].nil? ? false : opts[:flag]
-      opts[:name] = opts[:name].nil? ? :native : opts[:name] 
-      opts[:linked] = opts[:linked].nil? ? true : opts[:linked] 
-      opts[:javascript] = opts[:javascript].nil? ? false : opts[:javascript] 
+      opts[:name] = opts[:name].nil? ? :native : opts[:name]
+      opts[:linked] = opts[:linked].nil? ? true : opts[:linked]
+      opts[:javascript] = opts[:javascript].nil? ? false : opts[:javascript]
 
-      render(:partial => '/tr8n_client_sdk/tags/language_strip', :locals => {:opts => opts})    
+      render(:partial => '/tr8n_client_sdk/tags/language_strip', :locals => {:opts => opts})
     end
 
     def tr8n_flashes_tag(opts = {})
-      render(:partial => '/tr8n_client_sdk/tags/flashes', :locals => {:opts => opts})    
+      render(:partial => '/tr8n_client_sdk/tags/flashes', :locals => {:opts => opts})
     end
 
     def tr8n_scripts_tag(opts = {})
-      render(:partial => '/tr8n_client_sdk/tags/scripts', :locals => {:opts => opts})    
+      render(:partial => '/tr8n_client_sdk/tags/scripts', :locals => {:opts => opts})
     end
 
     def tr8n_select_month(date, options = {}, html_options = {})
       month_names = options[:use_short_month] ? Tr8n.config.default_abbr_month_names : Tr8n.config.default_month_names
       select_month(date, options.merge(
-        :use_month_names => month_names.collect{|month_name| Tr8n::Language.translate(month_name, options[:description] || "Month name")} 
+          :use_month_names => month_names.collect{|month_name| tr8n_current_language.translate(month_name, options[:description] || "Month name")}
       ), html_options)
     end
 
@@ -105,30 +121,6 @@ module Tr8nClientSdk
       Thread.current[:block_options] ||= []
       Thread.current[:block_options].push(opts)
 
-      #component = Tr8n.config.current_component_from_block_options
-      #if component
-      #  source = Tr8n.config.current_source_from_block_options
-      #  unless source.nil?
-      #    Tr8n::ComponentSource.find_or_create(component, source)
-      #  end
-      #end
-      #
-      #if Tr8n.config.current_user_is_authorized_to_view_component?(component)
-      #  selected_language = Tr8n.config.current_language
-      #
-      #  unless Tr8n.config.current_user_is_authorized_to_view_language?(component, selected_language)
-      #    Tr8n.config.set_language(Tr8n.config.default_language)
-      #  end
-      #
-      #  if block_given?
-      #    ret = capture(&block)
-      #  end
-      #
-      #  Tr8n.config.current_language = selected_language
-      #else
-      #  ret = ""
-      #end
-
       if block_given?
         ret = capture(&block)
       end
@@ -136,40 +128,7 @@ module Tr8nClientSdk
       Thread.current[:block_options].pop
       ret
     end
-
-    def tr8n_content_for_locales_tag(opts = {}, &block)
-      locale = Tr8n.config.current_language.locale
-
-      if opts[:only] 
-         return unless opts[:only].include?(locale)
-      end
-
-      if opts[:except]
-        return if opts[:except].include?(locale)
-      end
-
-      if block_given?
-        ret = capture(&block) 
-      end
-      ret
-    end
-
-    def tr8n_content_for_countries_tag(opts = {}, &block)
-      country = Tr8n.config.country_from_ip(tr8n_request_remote_ip)
-      
-      if opts[:only] 
-         return unless opts[:only].include?(country)
-      end
-
-      if opts[:except]
-        return if opts[:except].include?(country)
-      end
-
-      if block_given?
-        ret = capture(&block) 
-      end
-      ret
-    end
+    alias_method :tr8n_block, :tr8n_with_options_tag
 
     def tr8n_when_string_tag(time, opts = {})
       elapsed_seconds = Time.now - time
@@ -179,12 +138,12 @@ module Tr8nClientSdk
         tr('a moment ago', 'Time reference')
       elsif elapsed_seconds < 55.minutes
         elapsed_minutes = (elapsed_seconds / 1.minute).to_i
-        tr("{minutes||minute} ago", 'Time reference', :minutes => elapsed_minutes)
+        tr('{minutes || minute} ago', 'Time reference', :minutes => elapsed_minutes)
       elsif elapsed_seconds < 1.75.hours
-        tr("about an hour ago", 'Time reference')
+        tr('about an hour ago', 'Time reference')
       elsif elapsed_seconds < 12.hours
         elapsed_hours = (elapsed_seconds / 1.hour).to_i
-        tr("{hours||hour} ago", 'Time reference', :hours => elapsed_hours)
+        tr('{hours || hour} ago', 'Time reference', :hours => elapsed_hours)
       elsif time.today_in_time_zone?
         display_time(time, :time_am_pm)
       elsif time.yesterday_in_time_zone?
@@ -192,27 +151,35 @@ module Tr8nClientSdk
       elsif elapsed_seconds < 5.days
         time.tr(:day_time).gsub('/ ', '/').sub(/^[0:]*/,"")
       elsif time.same_year_in_time_zone?
-        time.tr(:monthname_abbr_time).gsub('/ ', '/').sub(/^[0:]*/,"")
+        time.tr(:monthname_abbr_time).gsub('/ ', '/').sub(/^[0:]*/, '')
       else
-        time.tr(:monthname_abbr_year_time).gsub('/ ', '/').sub(/^[0:]*/,"")
+        time.tr(:monthname_abbr_year_time).gsub('/ ', '/').sub(/^[0:]*/, '')
       end
     end
-    
+
+    def tr8n_url_tag(path)
+      tr8n_application.url_for(path)
+    end
+
     ######################################################################
     ## Language Direction Support
     ######################################################################
 
-    def tr8n_style_attribute_tag(attr_name = 'float', default = 'right', lang = Tr8n.config.current_language)
+    def tr8n_style_attribute_tag(attr_name = 'float', default = 'right', lang = tr8n_current_language)
       "#{attr_name}:#{lang.align(default)}".html_safe
     end
 
-    def tr8n_style_directional_attribute_tag(attr_name = 'padding', default = 'right', value = '5px', lang = Tr8n.config.current_language)
+    def tr8n_style_directional_attribute_tag(attr_name = 'padding', default = 'right', value = '5px', lang = tr8n_current_language)
       "#{attr_name}-#{lang.align(default)}:#{value}".html_safe
     end
 
-    def tr8n_dir_attribute_tag(lang = Tr8n.config.current_language)
+    def tr8n_dir_attribute_tag(lang = tr8n_current_language)
       "dir='#{lang.dir}'".html_safe
     end
 
+    def tr8n_lang_attribute_tag(lang = tr8n_current_language)
+      "lang=#{lang.locale}".html_safe
+    end
+
   end
 end

data/lib/{generators/tr8n_client_sdk/tr8n_client_sdk_generator.rb → tr8n_client_sdk/extensions/string.rb}

@@ -1,6 +1,14 @@
 #--
-# Copyright (c) 2013 Michael Berkovich, tr8nhub.com
+# Copyright (c) 2014 Michael Berkovich, TranslationExchange.com
 #
+#  _______                  _       _   _             ______          _
+# |__   __|                | |     | | (_)           |  ____|        | |
+#    | |_ __ __ _ _ __  ___| | __ _| |_ _  ___  _ __ | |__  __  _____| |__   __ _ _ __   __ _  ___
+#    | | '__/ _` | '_ \/ __| |/ _` | __| |/ _ \| '_ \|  __| \ \/ / __| '_ \ / _` | '_ \ / _` |/ _ \
+#    | | | | (_| | | | \__ \ | (_| | |_| | (_) | | | | |____ >  < (__| | | | (_| | | | | (_| |  __/
+#    |_|_|  \__,_|_| |_|___/_|\__,_|\__|_|\___/|_| |_|______/_/\_\___|_| |_|\__,_|_| |_|\__, |\___|
+#                                                                                        __/ |
+#                                                                                       |___/
 # 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
@@ -21,17 +29,16 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
 
-require 'rails/generators'
+class String
 
-class Tr8nClientSdkGenerator < Rails::Generators::Base
-
-  def self.source_root
-    @source_root ||= File.expand_path('../templates', __FILE__)
+  def tr8n_translated
+    return self if frozen?
+    @tr8n_translated = true
+    self.html_safe
   end
 
-  def copy_configuration
-    config_source = File.expand_path("#{self.class.source_root}/config/tr8n", __FILE__)
-    system "rsync -ruv #{config_source} #{Rails.root}/config"
+  def tr8n_translated?
+    @tr8n_translated
   end
-  
+
 end

data/lib/tr8n_client_sdk/railtie.rb

@@ -1,6 +1,14 @@
 #--
-# Copyright (c) 2013 Michael Berkovich, tr8nhub.com
+# Copyright (c) 2014 Michael Berkovich, TranslationExchange.com
 #
+#  _______                  _       _   _             ______          _
+# |__   __|                | |     | | (_)           |  ____|        | |
+#    | |_ __ __ _ _ __  ___| | __ _| |_ _  ___  _ __ | |__  __  _____| |__   __ _ _ __   __ _  ___
+#    | | '__/ _` | '_ \/ __| |/ _` | __| |/ _ \| '_ \|  __| \ \/ / __| '_ \ / _` | '_ \ / _` |/ _ \
+#    | | | | (_| | | | \__ \ | (_| | |_| | (_) | | | | |____ >  < (__| | | | (_| | | | | (_| |  __/
+#    |_|_|  \__,_|_| |_|___/_|\__,_|\__|_|\___/|_| |_|______/_/\_\___|_| |_|\__,_|_| |_|\__, |\___|
+#                                                                                        __/ |
+#                                                                                       |___/
 # 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
@@ -25,30 +33,22 @@ require 'rails'
 require 'pp'
 
 # Rails Extensions
-#require File.join(File.dirname(__FILE__), 'extensions/array_extension')
-#require File.join(File.dirname(__FILE__), 'extensions/date_extension')
-#require File.join(File.dirname(__FILE__), 'extensions/fixnum_extension')
-#require File.join(File.dirname(__FILE__), 'extensions/hash_extension')
-#require File.join(File.dirname(__FILE__), 'extensions/string_extension')
-#require File.join(File.dirname(__FILE__), 'extensions/time_extension')
-
 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|
-      require "tr8n_client_sdk/config"
-      Tr8n.config = Tr8nClientSdk::Config.new
-
       ActiveSupport.on_load(:action_view) do
         ::ActionView::Base.send :include, Tr8nClientSdk::ActionCommonMethods
         ::ActionView::Base.send :include, Tr8nClientSdk::ActionViewExtension
       end
       ActiveSupport.on_load(:action_controller) do
         include Tr8nClientSdk::ActionControllerExtension
-      end      
+      end
     end
   end
 end

data/lib/tr8n_client_sdk/version.rb

@@ -21,7 +21,6 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
 
-
 module Tr8nClientSdk
-  VERSION = "1.1.1"
+  VERSION = "3.2.2"
 end

data/lib/tr8n_client_sdk.rb

@@ -23,6 +23,7 @@
 
 require "tr8n_client_sdk/railtie"
 require "tr8n_client_sdk/engine"
+require "tr8n_core"
 
 module Tr8nClientSdk