tr8n_client_sdk 3.3.1 → 4.0.1

data/app/views/tr8n_client_sdk/tags/_scripts.html.erb

@@ -1,45 +1,103 @@
 <% if Tr8n.config.enabled? %>
+
   <style type="text/css">
-    .tr8n_fltr {<%=tr8n_style_attribute_tag('float', 'right')%> !important;}
-    .tr8n_fltl {<%=tr8n_style_attribute_tag('float', 'left')%> !important;}
-    .tr8n_txtr {<%=tr8n_style_attribute_tag('text-align', 'right')%> !important;}
-    .tr8n_txtl {<%=tr8n_style_attribute_tag('text-align', 'left')%> !important;}
+  .tr8n_fltr {
+    <%=tr8n_style_attribute_tag('float', 'right')%> !important;
+  }
+  .tr8n_fltl {
+    <%=tr8n_style_attribute_tag('float', 'left')%> !important;
+  }
+  .tr8n_txtr {
+    <%=tr8n_style_attribute_tag('text-align', 'right')%> !important;
+  }
+  .tr8n_txtl {
+    <%=tr8n_style_attribute_tag('text-align', 'left')%> !important;
+  }
   </style>
 
   <script>
-    (function() {
-      if (window.tr8n_already_initialized) return;
-      window.tr8n_already_initialized = true;
+    function tr8n_add_css(doc, value, inline) {
+      var css = null;
+      if (inline) {
+        css = doc.createElement('style');
+        css.type = 'text/css';
+        if (css.styleSheet){
+          css.styleSheet.cssText = value;
+        } else {
+          css.appendChild(document.createTextNode(value));
+        }
+      } else {
+        css = doc.createElement('link');
+        css.setAttribute('type', 'text/css');
+        css.setAttribute('rel', 'stylesheet');
+        css.setAttribute('media', 'screen');
+
+        if (value.indexOf('//') != -1) {
+          css.setAttribute('href', value);
+        } else {
+          css.setAttribute('href', '<%= tr8n_application.host %>' + value);
+        }
+      }
+      doc.getElementsByTagName('head')[0].appendChild(css);
+      return css;
+    }
 
-      var script = window.document.createElement('script');
-      script.setAttribute('id', 'tr8n-tools');
+    function tr8n_add_script(doc, id, src, onload) {
+      var script = doc.createElement('script');
+      script.setAttribute('id', id);
       script.setAttribute('type', 'application/javascript');
-      script.setAttribute('src', '<%= tr8n_application.tools['javascript'] %>');
+      if (src.indexOf('//') != -1) {
+        script.setAttribute('src', src);
+      } else {
+        script.setAttribute('src', '<%= tr8n_application.host %>' + src);
+      }
       script.setAttribute('charset', 'UTF-8');
-      script.onload = function() {
-        Tr8n.Utils.insertCSS(window.document, "<%= tr8n_application.tools['stylesheet'] %>", false);
-        Tr8n.Utils.insertCSS(window.document, "<%= tr8n_application.css %>", true);
-        Tr8n.app_key = '<%= tr8n_application.key %>';
-        Tr8n.host = '<%= tr8n_application.tools['host'] %>';
-        Tr8n.locale = '<%= tr8n_current_language.locale %>';
-        Tr8n.sources = [];
-        <%
-          if tr8n_application.feature_enabled?(:shortcuts)
-             tr8n_application.shortcuts.each do |key, script|
-        %>
-        shortcut.add('<%=key.html_safe%>', function() {
-          <%= script.html_safe %>
-        });
-        <%
-             end
-          end
-        %>
-        if (typeof(tr8n_on_ready) === 'function') {
-          tr8n_on_ready();
-        }
-      };
+      if (onload) script.onload = onload;
+      doc.getElementsByTagName('head')[0].appendChild(script);
+      return script;
+    }
+
+    (function() {
+      if (window.addEventListener) window.addEventListener('load', tr8n_init, false); // Standard
+      else if (window.attachEvent) window.attachEvent('onload', tr8n_init); // Microsoft
+      window.setTimeout(function() {  // just in case, hit it one more time a second later
+        tr8n_init();
+      }, 1000);
+
+      function tr8n_init() {
+        if (window.tr8n_already_initialized) return;
+        window.tr8n_already_initialized = true;
+
+        tr8n_add_css(window.document, '/assets/tr8n/tools.css', false);
+        tr8n_add_css(window.document, "<%= tr8n_application.css %>", true);
+
+        tr8n_add_script(window.document, 'tr8n-jssdk', '/assets/tools.js?t=<%=Time.now%>', function() {
+          Tr8n.app_key = '<%= tr8n_application.key %>';
+          Tr8n.host = '<%= tr8n_application.host %>';
+          Tr8n.sources = [];
+          Tr8n.default_locale = '<%= tr8n_application.default_locale %>';
+          Tr8n.page_locale = '<%= tr8n_current_language.locale %>';
+          Tr8n.locale = '<%= tr8n_current_language.locale %>';
 
-      window.document.getElementsByTagName('head')[0].appendChild(script);
+          <%
+            if tr8n_application.feature_enabled?(:shortcuts)
+               tr8n_application.shortcuts.each do |key, script|
+          %>
+          shortcut.add('<%=key.html_safe%>', function() {
+            <%= script.html_safe %>
+          });
+          <%
+               end
+            end
+          %>
+
+          if (typeof(tr8n_on_ready) === 'function') {
+            tr8n_on_ready();
+          }
+        });
+      }
     })();
   </script>
+
+
 <% end %>

data/config/routes.rb

@@ -1,34 +1,2 @@
-#--
-# Copyright (c) 2015 Translation Exchange Inc. http://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
-# 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.
-#++
-
-Rails.application.routes.draw do
-  get '/tr8n/upgrade' => 'tr8n_client_sdk/cache#upgrade'
+Tr8nClientSdk::Engine.routes.draw do
 end

data/lib/{tr8n_client_sdk/core/string.rb → tasks/tr8n_client_sdk.rake}

@@ -1,14 +1,6 @@
 #--
-# Copyright (c) 2014 Michael Berkovich, TranslationExchange.com
+# Copyright (c) 2010-2013 Michael Berkovich, tr8nhub.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
@@ -29,16 +21,19 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
 
-class String
+namespace :tr8n_client_sdk do
 
-  def tr8n_translated
-    return self if frozen?
-    @tr8n_translated = true
-    self.html_safe
+  task :init => :environment do
+    
   end
 
-  def tr8n_translated?
-    @tr8n_translated
+  task :cache do
+    require "tr8n_client_sdk/config"
+    Tr8n.config = Tr8nClientSdk::Config.new
+
+    Tr8n.config.init_application
+    g = Tr8nCore::Generators::Cache::File.new
+    g.run
   end
 
-end
+end

data/lib/tr8n_client_sdk/engine.rb

@@ -1,14 +1,6 @@
 #--
-# Copyright (c) 2015 Translation Exchange Inc. http://translationexchange.com
+# Copyright (c) 2013 Michael Berkovich, tr8nhub.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

data/lib/tr8n_client_sdk/extensions/action_common_methods.rb

@@ -1,14 +1,6 @@
 #--
-# Copyright (c) 2015 Translation Exchange Inc. http://translationexchange.com
+# Copyright (c) 2013 Michael Berkovich, tr8nhub.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
@@ -34,16 +26,16 @@ module Tr8nClientSdk
     ############################################################
     # There are three ways to call the tr method
     #
-    # tr(label, desc = '', tokens = {}, options = {})
+    # tr(label, desc = "", tokens = {}, options = {})
     # or
     # tr(label, tokens = {}, options = {})
     # or
-    # tr(:label => label, :description => '', :tokens => {}, :options => {})
+    # tr(:label => label, :description => "", :tokens => {}, :options => {})
     ############################################################
-    def tr(label, description = '', tokens = {}, options = {})
-      params = Tr8n::Utils.normalize_tr_params(label, description, tokens, options)
-      return params[:label].html_safe if params[:label].tr8n_translated?
+    def tr(label, description = "", tokens = {}, options = {})
+      return label.html_safe if label.tr8n_translated?
 
+      params = Tr8n::Utils.normalize_tr_params(label, description, tokens, options)
       params[:options][:caller] = caller
 
       if request
@@ -52,7 +44,7 @@ module Tr8nClientSdk
       end
 
       if Tr8n.config.disabled?
-        return Tr8n.config.default_language.translate(params[:label], params[:tokens], params[:options]).tr8n_translated.html_safe
+        return Tr8n::TranslationKey.substitute_tokens(params[:label], params[:tokens], params[:options]).tr8n_translated.html_safe
       end
 
       # Translate individual sentences
@@ -65,33 +57,32 @@ module Tr8nClientSdk
         return text.tr8n_translated.html_safe
       end
 
-      Tr8n.session.target_language.translate(params).tr8n_translated.html_safe
+      tr8n_current_language.translate(params).tr8n_translated.html_safe
     rescue Tr8n::Exception => ex
-      #pp ex, ex.backtrace
-      Tr8n.logger.error(ex.message)
-      #Tr8n.logger.error(ex.message + "\n=> " + ex.backtrace.join("\n=> "))
+      Tr8n::Logger.error("ERROR: #{label}")
+      Tr8n::Logger.error(ex.message + "\n=> " + ex.backtrace.join("\n=> "))
       label
     end
 
     # for translating labels
-    def trl(label, description = '', tokens = {}, options = {})
+    def trl(label, description = "", tokens = {}, options = {})
       params = Tr8n::Utils.normalize_tr_params(label, description, tokens, options)
       params[:options][:skip_decorations] = true
       tr(params)
     end
 
     # flash notice
-    def trfn(label, desc = '', tokens = {}, options = {})
+    def trfn(label, desc = "", tokens = {}, options = {})
       flash[:trfn] = tr(Tr8n::Utils.normalize_tr_params(label, desc, tokens, options))
     end
 
     # flash error
-    def trfe(label, desc = '', tokens = {}, options = {})
+    def trfe(label, desc = "", tokens = {}, options = {})
       flash[:trfe] = tr(Tr8n::Utils.normalize_tr_params(label, desc, tokens, options))
     end
 
     # flash warning
-    def trfw(label, desc = '', tokens = {}, options = {})
+    def trfw(label, desc = "", tokens = {}, options = {})
       flash[:trfw] = tr(Tr8n::Utils.normalize_tr_params(label, desc, tokens, options))
     end
 
@@ -99,32 +90,20 @@ module Tr8nClientSdk
     ## Common methods - wrappers
     ######################################################################
 
-    def tr8n_session
-      Tr8n.session
-    end
-
     def tr8n_application
-      tr8n_session.application
+      Tr8n.session.application
     end
 
     def tr8n_current_user
-      tr8n_session.current_user
+      Tr8n.session.current_user
     end
 
     def tr8n_current_translator
-      tr8n_session.current_translator
-    end
-
-    def tr8n_current_locale
-      tr8n_session.current_language.locale
+      Tr8n.session.current_translator
     end
 
     def tr8n_current_language
-      tr8n_session.current_language
-    end
-
-    def tr8n_language_dir
-      tr8n_current_language.dir
+      Tr8n.session.current_language
     end
 
   end

data/lib/tr8n_client_sdk/extensions/action_controller_extension.rb

@@ -1,14 +1,6 @@
 #--
-# Copyright (c) 2015 Translation Exchange Inc. http://translationexchange.com
+# Copyright (c) 2013 Michael Berkovich, tr8nhub.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
@@ -33,18 +25,10 @@ module Tr8nClientSdk
   module ActionControllerExtension
 
     def self.included(base)
-      base.send(:include, Tr8nClientSdk::ActionCommonMethods)
-      base.send(:include, InstanceMethods)
+      base.send(:include, Tr8nClientSdk::ActionCommonMethods) 
+      base.send(:include, InstanceMethods) 
       base.before_filter :tr8n_init_client_sdk
       base.after_filter :tr8n_reset_client_sdk
-      if defined? base.rescue_from
-        base.rescue_from 'Tr8n::Exception' do |e|
-          Tr8n.logger.error(e)
-          Tr8n.logger.error(e.backtrace)
-          Tr8n.session.reset
-          raise e
-        end
-      end
     end
 
     module InstanceMethods
@@ -60,7 +44,7 @@ module Tr8nClientSdk
         end
         Tr8n.config.default_locale
       end
-
+      
       # Overwrite this method in a controller to assign a custom source for all views
       def tr8n_source
         "/#{controller_name}/#{action_name}"
@@ -71,47 +55,19 @@ module Tr8nClientSdk
       # Overwrite this method in a controller to assign a custom component for all views
       def tr8n_component
         nil
-      end
-
-      def tr8n_cookie_name
-        "tr8n_#{tr8n_application.key}"
-      end
-
-      def tr8n_cookie
-        request.cookies[tr8n_cookie_name]
-      end
-
-      def tr8n_cookie_params
-        @tr8n_cookie_params ||= begin
-          if tr8n_cookie
-            cookie_params = Tr8n::Utils.decode_and_verify_params(tr8n_cookie, tr8n_application.secret)
-            Tr8n.logger.info(cookie_params.inspect)
-            cookie_params
-          else
-            {}
-          end
-        end
-      end
+      end  
 
-      def tr8n_translator_locale
-        tr8n_cookie_params["locale"]
-      end
-
-
-      def tr8n_locale
+      def tr8n_init_current_locale
         self.send(Tr8n.config.current_locale_method) if Tr8n.config.current_locale_method
       rescue
-        # fallback onto the cookie params from the service
-        return tr8n_translator_locale if tr8n_translator_locale
-
         # fallback to the default session based locale implementation
         # choose the first language from the accepted languages header
         session[:locale] = tr8n_user_preferred_locale unless session[:locale]
         session[:locale] = params[:locale] if params[:locale]
-        session[:locale] || Tr8n.config.default_locale
+        session[:locale]
       end
 
-      def tr8n_user
+      def tr8n_init_current_user
         self.send(Tr8n.config.current_user_method) if Tr8n.config.current_user_method
       rescue
         nil
@@ -120,26 +76,39 @@ module Tr8nClientSdk
       def tr8n_init_client_sdk
         return if Tr8n.config.disabled?
 
+        Tr8n.logger.info("Initializing request...")
         @tr8n_started_at = Time.now
 
-        Tr8n.session.init(
-          :cookies => request.cookies,
-          :locale => tr8n_locale,
-          :user => tr8n_user,
-          :source => tr8n_source,
-          :component => tr8n_component
-        )
+        Tr8n.session.init
+
+        translator = nil
 
-        I18n.enforce_available_locales = false
-        I18n.locale = Tr8n.session.current_language.locale
+        cookie_name = "tr8n_#{tr8n_application.key}"
+        if request.cookies[cookie_name]
+          Tr8n.logger.info("Cookie exists:")
+          cookie_params = Tr8n::Utils.decode_and_verify_params(request.cookies[cookie_name], tr8n_application.secret)
+          Tr8n.logger.info(cookie_params.inspect)
+          locale = cookie_params["locale"]
+          translator = Tr8n::Translator.new(cookie_params["translator"].merge(:application => tr8n_application)) unless cookie_params["translator"].nil?
+        else
+          Tr8n.logger.info("Cookie does not exist")
+        end
+
+        Tr8n.session.current_user = tr8n_init_current_user
+        Tr8n.session.current_translator = translator
+        Tr8n.session.current_language = tr8n_application.language(locale || tr8n_init_current_locale)
+        Tr8n.session.current_source = tr8n_source
+        Tr8n.session.current_component = tr8n_component
       end
 
       def tr8n_reset_client_sdk
-        return if Tr8n.config.disabled?
         @tr8n_finished_at = Time.now
+
+        Tr8n.logger.info("Resetting request...")
         tr8n_application.submit_missing_keys
         Tr8n.session.reset
-        Tr8n.logger.info("Request took #{@tr8n_finished_at - @tr8n_started_at} mls") if @tr8n_started_at
+
+        Tr8n.logger.info("Request took #{@tr8n_finished_at - @tr8n_started_at} mls")
       end
 
     end

data/lib/tr8n_client_sdk/extensions/action_view_extension.rb

@@ -1,14 +1,6 @@
 #--
-# Copyright (c) 2015 Translation Exchange Inc. http://translationexchange.com
+# Copyright (c) 2013 Michael Berkovich, tr8nhub.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
@@ -33,15 +25,6 @@ module Tr8nClientSdk
   module ActionViewExtension
     extend ActiveSupport::Concern
 
-    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
@@ -58,14 +41,14 @@ module Tr8nClientSdk
     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_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
@@ -84,25 +67,24 @@ module Tr8nClientSdk
     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 = {})
@@ -118,16 +100,16 @@ module Tr8nClientSdk
         return ""
       end
 
-      Tr8n.session.push_block_options(opts)
+      Thread.current[:block_options] ||= []
+      Thread.current[:block_options].push(opts)
 
       if block_given?
         ret = capture(&block)
       end
 
-      Tr8n.session.pop_block_options
+      Thread.current[:block_options].pop
       ret
     end
-    alias_method :tr8n_block, :tr8n_with_options_tag
 
     def tr8n_when_string_tag(time, opts = {})
       elapsed_seconds = Time.now - time
@@ -137,12 +119,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?
@@ -150,39 +132,27 @@ 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_current_language)
-      return "#{attr_name}:#{default}".html_safe if Tr8n.config.disabled?
       "#{attr_name}:#{lang.align(default)}".html_safe
     end
 
     def tr8n_style_directional_attribute_tag(attr_name = 'padding', default = 'right', value = '5px', lang = tr8n_current_language)
-      return "#{attr_name}-#{default}:#{value}".html_safe if Tr8n.config.disabled?
       "#{attr_name}-#{lang.align(default)}:#{value}".html_safe
     end
 
     def tr8n_dir_attribute_tag(lang = tr8n_current_language)
-      return "dir='ltr'" if Tr8n.config.disabled?
       "dir='#{lang.dir}'".html_safe
     end
 
-    def tr8n_lang_attribute_tag(lang = tr8n_current_language)
-      return "lang='en-US'" if Tr8n.config.disabled?
-      "lang='#{lang.locale}'".html_safe
-    end
-
   end
 end