tml-rails 5.0.1 → 5.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2088405b5d3e687320118711c6d8af1da0a6e512
-  data.tar.gz: 056a6c51fb7ccfb609eb8c303dd937aaffa517ef
+  metadata.gz: c55b2155d5864d1fcd05e6f0fa8ec005b00336af
+  data.tar.gz: 4e22781c61854eec7e9221f0904d970b214ce954
 SHA512:
-  metadata.gz: daf41e9d10c5e54cf2a78be03c65de63ea3cd844b4fa1554a6c02556ce0d4e1f383c13789c65518413a2d45441b8f029ee2afd25f618b1312e01ecef1e99b725
-  data.tar.gz: 1d26cb1bd823edcbcd39072ebf0f5561313e1b561786f00d16c4f9499ca73ac1866e1508032c569504a0f94ba9cf43c5346ae23ca8bd2d6b21d30f8eb4219242
+  metadata.gz: 6ca9668d6855391a64a53d80179c481c02242ded5147637307e0bb926a67d78638e8f7d587eafc5e6ce027b681523487c13e64263244abaea9c8ab062b07bbd9
+  data.tar.gz: e5afe0332d5f5e249f34a0b61aa7623b994b92b490b30cc7b69c22de93c5e254a1240f88a2e830ab0879b4bd3e7d0ec38f2bc172b3922fa208d4a8f87d13d82e

data/README.md

@@ -40,6 +40,7 @@ config/initializers/tml.rb
 ```ruby
 Tml.configure do |config|
   config.application = {
+    key:   YOUR_APPLICATION_KEY,
     token: YOUR_APPLICATION_TOKEN,
   }
   config.cache = {
@@ -264,7 +265,7 @@ And the i18n will use Translation Exchange as the backend for your translations.
 <%= tr("This is a nested key") %>
 ```
 
-The above calls are equivalent. 
+The above calls are equivalent.
 
 
 Logging
@@ -384,4 +385,4 @@ 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.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

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

@@ -7,36 +7,11 @@
     <%= tml_application.css %>
   </style>
 
-  <script>
-    (function() {
-      if (window.tml_already_initialized) return;
-      window.tml_already_initialized = true;
-
-      var script = window.document.createElement('script');
-      script.setAttribute('id', 'tml-tools');
-      script.setAttribute('type', 'application/javascript');
-      script.setAttribute('src', '<%= tml_application.tools['javascript'] %>');
-      script.setAttribute('charset', 'UTF-8');
-      script.onload = function() {
-        Tml.Utils.insertCSS(window.document, "<%= tml_application.tools['stylesheet'] %>", false);
-        Tml.app_key = '<%= tml_application.key %>';
-        Tml.host = '<%= tml_application.tools['host'] %>';
-        Tml.locale = '<%= tml_current_language.locale %>';
-        Tml.current_source = '<%= tml_current_source %>';
-        <%
-          if tml_application.feature_enabled?(:shortcuts)
-             tml_application.shortcuts.each do |key, script|
-        %>
-        shortcut.add('<%=key.html_safe%>', function() {<%= script.html_safe %>});
-        <%
-             end
-          end
-        %>
-        if (typeof(tml_on_ready) === 'function') {
-          tml_on_ready();
-        }
-      };
-      window.document.getElementsByTagName('head')[0].appendChild(script);
-    })();
-  </script>
+  <% if Tml.config.respond_to?(:agent) and Tml.config.agent and Tml.config.agent[:enabled] %>
+    <% if Tml.config.agent[:type].to_s == 'agent' %>
+        <%= render(:partial => '/tml_rails/tags/scripts_agent') %>
+    <% else %>
+        <%= render(:partial => '/tml_rails/tags/scripts_tools') %>
+    <% end %>
+  <% end %>
 <% end %>

data/app/views/tml_rails/tags/_scripts_agent.html.erb

@@ -0,0 +1,16 @@
+<script>
+    <%
+        agent_host = Tml.config.agent[:host] || 'https://cdn.translationexchange.com/tools/agent/' + (Tml.config.agent[:version] || 'stable') + '/agent.min.js'
+    %>
+    (function() {
+        var script = window.document.createElement('script');
+        script.setAttribute('id', 'tml-agent');
+        script.setAttribute('type', 'application/javascript');
+        script.setAttribute('src', '<%= agent_host %>');
+        script.setAttribute('charset', 'UTF-8');
+        script.onload = function() {
+            Trex.init("<%=tml_application.key%>", <%=Tml.config.agent.to_json.html_safe%>);
+        };
+        window.document.getElementsByTagName('head')[0].appendChild(script);
+    })();
+</script>

data/app/views/tml_rails/tags/_scripts_tools.html.erb

@@ -0,0 +1,32 @@
+<script>
+    (function() {
+        if (window.tml_already_initialized) return;
+        window.tml_already_initialized = true;
+
+        var script = window.document.createElement('script');
+        script.setAttribute('id', 'tml-tools');
+        script.setAttribute('type', 'application/javascript');
+        script.setAttribute('src', '<%= tml_application.tools['javascript'] %>');
+        script.setAttribute('charset', 'UTF-8');
+        script.onload = function() {
+            Tml.Utils.insertCSS(window.document, "<%= tml_application.tools['stylesheet'] %>", false);
+            Tml.app_key = '<%= tml_application.key %>';
+            Tml.host = '<%= tml_application.tools['host'] %>';
+            Tml.locale = '<%= tml_current_language.locale %>';
+            Tml.current_source = '<%= tml_current_source %>';
+            <%
+              if tml_application.feature_enabled?(:shortcuts)
+                 tml_application.shortcuts.each do |key, script|
+            %>
+            shortcut.add('<%=key.html_safe%>', function() {<%= script.html_safe %>});
+            <%
+                 end
+              end
+            %>
+            if (typeof(tml_on_ready) === 'function') {
+                tml_on_ready();
+            }
+        };
+        window.document.getElementsByTagName('head')[0].appendChild(script);
+    })();
+</script>

data/lib/i18n/backend/tml.rb

@@ -49,30 +49,38 @@ module I18n
         end
 
         def translate(locale, key, options = {})
-          super(locale, key, options).html_safe
+          translation = super(locale, key, options)
+          translation.is_a?(String) ? translation.html_safe : translation
+        end
+
+        def convert_to_tml(str)
+          str.gsub('%{', '{')
         end
 
         def lookup(locale, key, scope = [], options = {})
-          #pp ''
-          #pp [locale, key, scope, options]
+          # pp [locale, key, scope, options]
 
           default_key = super(application.default_locale, key, scope, options)
+          return default_key if key.to_s.match(/^(support|i18n)/)
 
-          #pp default_key
+          if default_key.nil?
+            default_key = key.to_s.gsub('_', ' ').capitalize
+          end
 
           default_key ||= key
           if default_key.is_a?(String)
-            translated_key = default_key.gsub('%{', '{')
-            translated_key = application.language(locale.to_s).translate(translated_key, options, options)
+            translated_key = application.language(locale.to_s).translate(convert_to_tml(default_key), options, options)
           elsif default_key.is_a?(Hash)
             translated_key = {}
+
             default_key.each do |key, value|
-              value = value.gsub('%{', '{')
-              translated_key[key] =  application.language(locale.to_s).translate(value, options, options)
+              if value.is_a?(String)
+                value = application.language(locale.to_s).translate(convert_to_tml(value), options, options)
+              end
+              translated_key[key] = value
             end
           end
 
-          #pp translated_key
           translated_key
         end
 

data/lib/tml_rails/extensions/action_controller_extension.rb

@@ -65,10 +65,14 @@ module TmlRails
         self.class.name
       end
 
+      def tml_cookie_name
+        Tml::Utils.cookie_name(Tml.config.application[:key])
+      end
+
       # Returns data from cookie set by the agent
       def tml_cookie
         @tml_cookie ||= begin
-          cookie = cookies[Tml::Utils.cookie_name(Tml.config.application[:key])]
+          cookie = cookies[tml_cookie_name]
           if cookie.blank?
             {}
           else

data/lib/tml_rails/version.rb

@@ -30,5 +30,5 @@
 #++
 
 module TmlRails
-  VERSION = '5.0.1'
+  VERSION = '5.1.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tml-rails
 version: !ruby/object:Gem::Version
-  version: 5.0.1
+  version: 5.1.1
 platform: ruby
 authors:
 - Michael Berkovich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-08 00:00:00.000000000 Z
+date: 2015-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -59,6 +59,8 @@ files:
 - app/views/tml_rails/tags/_language_strip.html.erb
 - app/views/tml_rails/tags/_powered_by_trex.html.erb
 - app/views/tml_rails/tags/_scripts.html.erb
+- app/views/tml_rails/tags/_scripts_agent.html.erb
+- app/views/tml_rails/tags/_scripts_tools.html.erb
 - config/routes.rb
 - lib/i18n/backend/tml.rb
 - lib/tasks/templates/tml.rb