tml-rails 4.4.2 → 4.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e992a68bd9ca23d3a6c095d44db4d4cf4e0bb77
-  data.tar.gz: 1a7847dfb32417c88636343cb4570fcd18842067
+  metadata.gz: 8315876d08b00acf7d136a653d4b4532f2354742
+  data.tar.gz: 2a5b78a61e089c7acb94744f9ec4901e8658d67a
 SHA512:
-  metadata.gz: f1c837e64efcdf9136754b9b0d4ad25576bfac7c9c215cf02c2adbf95ec020fe24868438a3081802428293e8f700bb156cc741379f7ab9771123d72ea51e62b6
-  data.tar.gz: e57f7967637af87ffa84a1292892c696e517cafdc47e32db0d6f89c4e859ad709f226d598aa6257e7b98fc3dab239835de8794737baaf06a4142835302178aae
+  metadata.gz: 4e00d95c6f7594f2bd2c46f383894b6232ec9fab1ee472f4c72215a51f0211976b518a5b779b7a8a0c86ed11b126b1886a60129f4c144709d573a4bd154448d2
+  data.tar.gz: 5edcd87ae7c437239e971a06051ca83cdfbe34522da699978d85b3b68ec77e568c72fade41702fc543726750cecb2b15a29db576441d1a17316a8ae1e96d9724

data/README.md

@@ -40,11 +40,11 @@ config/initializers/tml.rb
 ```ruby
 Tml.configure do |config|
   config.application = {
-    :token => YOUR_APPLICATION_TOKEN,
+    token: YOUR_APPLICATION_TOKEN,
   }
   config.cache = {
-    :enablec => true,
-    :adapter => 'rails'
+    enabled: true,
+    adapter: 'rails'
   }
 end
 ```
@@ -53,21 +53,19 @@ Tml must be used with caching enabled.
 
 If you are already using Rails caching, you probably already specify it in your production file, like the following:
 
-Memcache
-
 config/environments/production.rb
 
 ```ruby
 config.cache_store = :mem_cache_store, { :namespace => 'my_cache' }
 ```
 
-Memcache for multiple servers
+Memcache for multiple servers:
 
 ```ruby
 config.cache_store = :mem_cache_store, '123.456.78.9:1001', '123.456.78.9:1002'
 ```
 
-Memcache with Dalli
+Memcache with Dalli:
 
 ```ruby
 config.cache_store = :mem_cache_store, Dalli::Client.new('localhost:11211', {
@@ -75,14 +73,14 @@ config.cache_store = :mem_cache_store, Dalli::Client.new('localhost:11211', {
 })
 ```
 
-Redis
+For Redis:
 
 ```ruby
 config.cache_store = :redis_store, {
-  :host => 'localhost',
-  :port => 6379,
-  :db => 0,
-  :namespace => 'my_cache'
+  host:       'localhost',
+  port:       6379,
+  db:         0,
+  namespace:  'my_cache'
 }
 ```
 
@@ -98,8 +96,8 @@ config/initializers/tml.rb
 
 ```ruby
 config.cache = {
-  :enabled    => true,
-  :adapter    => 'rails'
+  enabled:  true,
+  adapter:  'rails'
 }
 ```
 
@@ -107,10 +105,10 @@ Alternatively, you can provide a separate memcache server to store your translat
 
 ```ruby
 config.cache = {
-    :enabled    => true,
-    :adapter    => 'memcache',
-    :host       => 'localhost:11211',
-    :namespace  => 'translations'
+  enabled:    true,
+  adapter:    'memcache',
+  host:       'localhost:11211',
+  namespace:  'translations'
 }
 ```
 
@@ -118,12 +116,12 @@ You can also use Redis to persist your translations cache:
 
 ```ruby
 config.cache = {
-    :enabled    => true,
-    :adapter    => 'redis',
-    :host       => 'localhost',
-    :port       => 6379,
-    :password   => 'password',
-    :namespace  => 'translations'
+  enabled:    true,
+  adapter:    'redis',
+  host:       'localhost',
+  port:       6379,
+  password:   'password',
+  namespace:  'translations'
 }
 ```
 
@@ -151,10 +149,10 @@ To specify in-memory, file-based cache, provide the following configuration:
 
 ```ruby
 config.cache = {
-  :enabled    => true,
-  :adapter    => 'file',
-  :path       => 'config/tml',
-  :version    => 'current'
+  enabled:  true,
+  adapter:  'file',
+  path:     'config/tml',
+  version:  'current'
 }
 ```
 
@@ -176,7 +174,7 @@ In the HEAD section of your layout, add:
 Now you can simply add the default language selector anywhere on your page using:
 
 ```ruby
-<%= tml_language_selector_tag %>
+<%= tml_language_selector_tag(:popup) %>
 ```
 
 The default language selector is used to enable/disable translation modes. It may be useful on staging or translation
@@ -203,7 +201,7 @@ To use a list language selector that uses locale in the url parameter, use:
 If you want to see just a list of flags, use:
 
 ```ruby
-<%= tml_language_selector_tag(:list, {
+<%= tml_language_selector_tag(:flags, {
     :flags_only => true
 }) %>
 ```

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

@@ -59,7 +59,11 @@
       <li role='presentation' class='divider'></li>
       <li role='presentation'>
         <a href='javascript:void(0);' onclick='Tml.Utils.toggleInlineTranslations()'>
-          <%= tr(opts[:toggle_label] || 'Help Us Translate') %>
+          <% if Tml.session.inline_mode? %>
+            <%= tr(opts[:toggle_label_close] || 'Disable Translation Mode') %>
+          <% else %>
+            <%= tr(opts[:toggle_label] || 'Help Us Translate') %>
+          <% end %>
         </a>
       </li>
     <% end %>
@@ -68,7 +72,7 @@
 
     <div class="trex-dropdown-footer">
       <a href="http://translationexchange.com" style="color: #888;">
-        <%= tr("Powered By {brand}", brand: "Translation Exchange") %>
+        <%= tr('Powered By {brand}', brand: 'Translation Exchange') %>
       </a>
     </div>
   </ul>

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

@@ -57,14 +57,18 @@
     <% if opts[:toggle] %>
       <li class='trex-credit' dir="<%= tml_current_language.dir %>">
         <a href='javascript:void(0);' onclick='Tml.Utils.toggleInlineTranslations()'>
-          <%= tr(opts[:toggle_label] || 'Help Us Translate') %>
+          <% if Tml.session.inline_mode? %>
+            <%= tr(opts[:toggle_label_close] || 'Disable Translation Mode') %>
+          <% else %>
+            <%= tr(opts[:toggle_label] || 'Help Us Translate') %>
+          <% end %>
         </a>
       </li>
     <% end %>
 
     <li class="trex-credit" dir="<%= tml_current_language.dir %>">
       <a href="http://translationexchange.com">
-        Powered by Translation Exchange
+        <%= tr('Powered By {brand}', brand: 'Translation Exchange') %>
       </a>
     </li>
   </ul>

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

@@ -22,7 +22,7 @@
         Tml.app_key = '<%= tml_application.key %>';
         Tml.host = '<%= tml_application.tools['host'] %>';
         Tml.locale = '<%= tml_current_language.locale %>';
-        Tml.sources = [];
+        Tml.current_source = '<%= tml_current_source %>';
         <%
           if tml_application.feature_enabled?(:shortcuts)
              tml_application.shortcuts.each do |key, script|

data/lib/tml_rails/extensions/action_common_methods.rb

@@ -123,6 +123,10 @@ module TmlRails
       tml_session.current_language
     end
 
+    def tml_current_source
+      tml_session.current_source
+    end
+
     def tml_language_dir
       tml_current_language.dir
     end

data/lib/tml_rails/extensions/action_controller_extension.rb

@@ -34,9 +34,13 @@ module TmlRails
 
     def self.included(base)
       base.send(:include, TmlRails::ActionCommonMethods)
-      base.send(:include, InstanceMethods) 
-      base.before_filter :tml_init
-      base.after_filter :tml_reset
+      base.send(:include, InstanceMethods)
+
+      if Tml.config.auto_init
+        base.before_filter :tml_init
+        base.after_filter :tml_reset
+      end
+
       if defined? base.rescue_from
         base.rescue_from 'Tml::Exception' do |e|
           Tml.logger.error(e)

data/lib/tml_rails/extensions/action_view_extension.rb

@@ -206,5 +206,17 @@ module TmlRails
       "lang='#{lang.locale}'".html_safe
     end
 
+    def tml_lang_attributes_tag(lang = tml_current_language)
+      "#{tml_lang_attribute_tag(lang)} #{tml_dir_attribute_tag(lang)}".html_safe
+    end
+
+    def tml_stylesheet_link_tag(ltr, rtl, attrs = {})
+      if tml_current_language.right_to_left?
+        stylesheet_link_tag(rtl, attrs)
+      else
+        stylesheet_link_tag(ltr, attrs)
+      end
+    end
+
   end
 end

data/lib/tml_rails/version.rb

@@ -30,5 +30,5 @@
 #++
 
 module TmlRails
-  VERSION = '4.4.2'
+  VERSION = '4.4.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tml-rails
 version: !ruby/object:Gem::Version
-  version: 4.4.2
+  version: 4.4.3
 platform: ruby
 authors:
 - Michael Berkovich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-24 00:00:00.000000000 Z
+date: 2015-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails