tml-rails 4.3.6 → 4.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 31518cae75a56656469869252dc6393c4685f142
-  data.tar.gz: 99b866f3875844de045df3cdd2a2b9875c29d5a0
+  metadata.gz: 9326f9cd017dbc9d697e2c7dab50c0ff2d70c41b
+  data.tar.gz: 1898fcb898316d57b4de91356a66524dd18c5a4c
 SHA512:
-  metadata.gz: 63d6f040d7c11669c625a4f9c9eb97229f44c88eb1d780f16557c74375a0858deba3a884bedee6e6ae2ef23704ec0b6f0b84d132a8e36cb83353747b683fe6da
-  data.tar.gz: 0aca72492fd0871e46dbcd67dde9ce1394718c5312c2c316ce3c72bf48ee67b8c93d03a9eb1d25ed86bf83a613d116a0eb752626288df9aba3686a720160269d
+  metadata.gz: 598ce0a929c08a22c956d35857bb63f5e52959b3e2381e5a3a1ec79bd0c5df1223b56efdee91bf72edd1f5c3bda03659a271639a7a61921b704724d7be442b6e
+  data.tar.gz: 2470d1f1ac1f5024299fadaf636e7408e5cc38c50a251493d00c1ae7263bf7fc65904b69385d218a6f28f16a1fcda1c5bfe73932156797403ffbd6c6b91eebd8

data/README.md

@@ -53,11 +53,44 @@ 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, Dalli::Client.new('localhost:11211', {:namespace => 'myapplication'})
-config.identity_cache_store = :mem_cache_store, Dalli::Client.new('localhost:11211', {:namespace => 'myapplication'})
+config.cache_store = :mem_cache_store, { :namespace => 'my_cache' }
+```
+
+Memcache for multiple servers
+
+```ruby
+config.cache_store = :mem_cache_store, '123.456.78.9:1001', '123.456.78.9:1002'
+```
+
+Memcache with Dalli
+
+```ruby
+config.cache_store = :mem_cache_store, Dalli::Client.new('localhost:11211', {
+  :namespace => 'my_cache'
+})
+```
+
+Redis
+
+```ruby
+config.cache_store = :redis_store, {
+  :host => 'localhost',
+  :port => 6379,
+  :db => 0,
+  :namespace => 'my_cache',
+  :expires_in => 90.minutes
+}
+```
+
+Tip: to clear up Redis cache
+
+```sh
+$ redis-cli FLUSHALL
 ```
 
 Then all you need to do is specify that you want to use the Rails cache adapter:
@@ -76,11 +109,12 @@ Alternatively, you can provide a separate memcache server to store your translat
 
 ```ruby
 config.cache = {
-    :enabled  => true,
-    :adapter  => 'memcache',
-    :host     => 'localhost:11211',
-    :version  => 1,
-    :timeout  => 3600
+    :enabled    => true,
+    :adapter    => 'memcache',
+    :host       => 'localhost:11211',
+    :namespace  => 'translations',
+    :version    => 1,
+    :timeout    => 3600
 }
 ```
 
@@ -88,11 +122,14 @@ You can also use Redis to persist your translations cache:
 
 ```ruby
 config.cache = {
-    :enabled  => true,
-    :adapter  => 'redis',
-    :host     => 'localhost:6379',
-    :version  => 1,
-    :timeout  => 3600
+    :enabled    => true,
+    :adapter    => 'redis',
+    :host       => 'localhost',
+    :port       => 6379,
+    :password   => 'password',
+    :namespace  => 'translations',
+    :version    => 1,
+    :timeout    => 3600
 }
 ```
 

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

@@ -0,0 +1,46 @@
+<%
+   opts[:element] ||= 'div'
+   opts[:class] ||= 'dropdown'
+%>
+
+<<%= opts[:element] %> class="<%= opts[:class] %>" style="<%= opts[:style] %>">
+  <a href="#" role="button" class="<%= opts[:class] || 'dropdown' %>-toggle" data-toggle="dropdown">
+    <%= tml_language_name_tag(tml_current_language, opts) %>
+  </a>
+
+  <ul class="dropdown-menu" role="menu">
+
+    <% tml_application.languages.each do |lang| %>
+
+      <li role="presentation">
+        <%=link_to({:locale => lang.locale}) do %>
+
+          <%= tml_language_name_tag(lang, opts) %>
+
+        <% end %>
+      </li>
+
+    <% end %>
+
+    <% if opts[:toggle] %>
+      <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') %>
+        </a>
+      </li>
+    <% end %>
+
+    <li role='presentation' class='divider'></li>
+
+    <div style="font-size:8px;color:#ccc;text-align: center">
+      <a href="http://translationexchange.com">
+        <img style="padding: 10px;border: 0px;background-repeat: no-repeat;background-size: 14px 17px;
+             background-image:url(data:image/gif;base64,iVBORw0KGgoAAAANSUhEUgAAAEMAAABQCAYAAABCiMhGAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyRpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYxIDY0LjE0MDk0OSwgMjAxMC8xMi8wNy0xMDo1NzowMSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNS4xIE1hY2ludG9zaCIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDpCQTg4MTEyOEU0NkIxMUUzODhCMEJEOUNDRDQ0QkU0MiIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDpCQTg4MTEyOUU0NkIxMUUzODhCMEJEOUNDRDQ0QkU0MiI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOkJBODgxMTI2RTQ2QjExRTM4OEIwQkQ5Q0NENDRCRTQyIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOkJBODgxMTI3RTQ2QjExRTM4OEIwQkQ5Q0NENDRCRTQyIi8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+mszKSAAAAqFJREFUeNrsnE1IFVEYhr+53QiKEIkgpCBwJSH9SITkqkVELXJZ0iYIqRaBCZWgoWKikRBI1KVNmyg3gVKQ0CZE+9kHQYukaGP2I6iEP1ffc+dc7iwK5s5Mx3PPvC88zGxm5s4zc85853JmvNardwTxwC1wGuyWdGQGvARduaH23wUJkJHFcgoclnTmKzgIIT8yWOlNsQiVPeB+8c74hmWNMNXqzqimh0JqlIxVeigkr2Tk6aGQtQwdlEIZlEEZlEEZEZONuf0YmASLYNNGPRI1e8FFsHUjZNwAg5Zd3GHwHuw02Uw+WShCZRr0m+4zPljc9D+alpG1WMYW0zJsfgplxMGTYp1BGZRBGZRBGZRBGZRBGZRBGZRBGQxlUAZlUAZlUAZlUAZlUAZlUAZlUIbDMmyeYr3KO6OUJdMyGiyWcdS0DPV+ykMLRRwD16JuHGc60gV9Fd6KP/Vxs/hTEDvBbIT9nQLNEdp8XkpTH0/GMRl3bladJpi7EWQcB89dfLSW24EdAeOsM0T2gQkWXX4bf6P7mlTL2KFFbE97Ob4NvAO70j42UcdTbyHU2jo28Qwe7zXYb2nl6mXE3DzwF6DJ5kGrkjFv4EBP4laHBjKjZDz7zwfJgTOWi3iVG2qfVTKui//ZhMTaXmD9Hmi1XMSf4m9UMubAIfAY/Epg58t62QcuWyxhQfx37A7grvgcHKipgdU5UPWX538LuBlh8Deu+4oVS2X8BN8h4p+j1jlNMOW+5lQ8+QmpsIQpusr5vsYV8EUqNElWoKojHpYKTlIyusFtqfAkIWMA9IgDiStD/cXXIY4kjowHoE0cSlQZj8AlcSxRZDwF58XBhJGxFlgfBWfF0YSR4QXK62ZxOGFk1OtR7QlxPGFkjIBGSUHWBRgAlJNpO4bVinwAAAAASUVORK5CYII=);"/>
+        <br>
+        Powered By Translation Exchange
+      </a>
+    </div>
+  </ul>
+</<%= opts[:element] %>>
+

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

@@ -0,0 +1,17 @@
+<%= link_to('#',
+      :onclick => opts[:method] || 'Tml.UI.LanguageSelector.show(); return false;',
+      :style => (opts[:style] || 'padding-right:5px;text-decoration:none'),
+      :class => opts[:class]
+    ) do %>
+  <% unless opts[:hide_flag] %>
+    <%= image_tag(tml_current_language.flag_url, :style => "align:middle") %>
+    &nbsp;
+  <% end %>
+  <% if opts[:language] == :native %>
+    <%= tml_current_language.native_name %>
+  <% elsif opts[:language] == :english %>
+    <%= tml_current_language.english_name %>
+  <% else %>
+    <%= tml_current_language.english_name %>
+  <% end %>
+<% end %>

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

@@ -0,0 +1,15 @@
+<div style="<%=opts[:style]%>" class="<%=opts[:class]%>">
+  <% tml_application.languages.each_with_index do |lang, index| %>
+    <% next if opts[:limit] and index >= opts[:limit] %>
+
+
+    <%= link_to(params.merge(:locale => lang.locale), :style => (opts[:style] || 'padding-right:5px;text-decoration:none'), :class => opts[:class]) do %>
+      <% if opts[:flags_only] or opts[:flags] %>
+        <%= image_tag(lang.flag_url) %>
+      <% else %>
+        <%= tml_language_name_tag(lang, opts) %>
+      <% end %>
+    <% end %>
+
+  <% end %>
+</div>

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

@@ -0,0 +1,32 @@
+<script>
+  function tml_change_locale(locale) {
+    var query_parts = window.location.href.split('#');
+    var anchor = query_parts.length > 1 ? query_parts[1] : null;
+    query_parts = query_parts[0].split('?');
+    var query = query_parts.length > 1 ? query_parts[1] : null;
+
+    var params = {};
+    if (query) {
+      var vars = query.split('&');
+      for (var i = 0; i < vars.length; i++) {
+        var pair = vars[i].split('=');
+        params[pair[0]] = pair[1];
+      }
+    }
+    params['locale'] = locale;
+
+    query = [];
+    var keys = Object.keys(params);
+    for (i = 0; i < keys.length; i++) {
+      query.push(keys[i] + "=" + params[keys[i]]);
+    }
+
+    var destination = query_parts[0];
+    if (query.length > 0)
+      destination = destination + '?' + query.join("&");
+    if (anchor)
+      destination = destination + '#' + anchor;
+
+    window.location = destination;
+  }
+</script>

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

@@ -0,0 +1,15 @@
+<%= render(:partial => '/tml_rails/tags/language_selector_js') %>
+
+<select id="tml_language_selector" onchange="tml_change_locale(this.options[this.selectedIndex].value)" style="<%=opts[:style]%>" class="<%=opts[:class]%>">
+  <% tml_application.languages.each do |lang| %>
+    <option dir='ltr' value="<%=lang.locale%>" <%="selected" if lang.locale == tml_current_locale %>>
+      <% if opts[:language] == :native %>
+        <%= lang.native_name %>
+      <% elsif opts[:language] == :english %>
+        <%= lang.english_name %>
+      <% else %>
+        <%= lang.english_name %>
+      <% end %>
+    </option>
+  <% end %>
+</select>

data/lib/tasks/tml.rake

@@ -42,17 +42,17 @@ namespace :tml do
 
     desc 'generates local file cache'
     task :generate => :environment do
-      Tml::Generators::Cache::File.new.run
+      Tml::Generators::File.new.run
     end
 
     desc 'rolls back to the previous version'
     task :rollback => :environment do
-      Tml::Generators::Cache::File.new.rollback
+      Tml::Generators::File.new.rollback
     end
 
     desc 'rolls up to the next version'
     task :rollup => :environment do
-      Tml::Generators::Cache::File.new.rollup
+      Tml::Generators::File.new.rollup
     end
 
   end

data/lib/tml/cache_adapters/rails.rb

@@ -33,7 +33,6 @@
 class Tml::CacheAdapters::Rails < Tml::Cache
 
   def initialize
-    Tml.logger.info('Initializing Rails cache...')
     @cache = Rails.cache
   end
 
@@ -91,7 +90,7 @@ class Tml::CacheAdapters::Rails < Tml::Cache
   end
 
   def clear(opts = {})
-    info("Cache clear")
+    info('Cache clear')
   rescue Exception => ex
     warn("Failed to clear cache: #{ex.message}")
   end

data/lib/tml_rails/extensions/action_controller_extension.rb

@@ -113,17 +113,18 @@ module TmlRails
         end
 
         unless tml_session_params[:locale]
-          if tml_tools_enabled? # gets translator and locale from the cookie
-            tml_session_params.merge!(:cookies => request.cookies)
-          else
-            session[:locale] = tml_user_preferred_locale unless session[:locale]
-            session[:locale] = params[:locale] if params[:locale]
-            tml_session_params.merge!(:locale => session[:locale] || Tml.config.default_locale)
-          end
+          tml_session_params.merge!(:cookies => cookies)
+          tml_session_params.merge!(:change_locale => true) if params[:locale]
+          tml_session_params.merge!(:locale => params[:locale] || tml_user_preferred_locale)
         end
 
         Tml.session.init(tml_session_params)
 
+        # if user sets locale manually, update the cookie for future use
+        if tml_session_params[:change_locale]
+          cookies[Tml.session.cookie_name] = Tml::Utils.encode(Tml.session.cookie_params)
+        end
+
         if defined? I18n.enforce_available_locales
           I18n.enforce_available_locales = false
         end

data/lib/tml_rails/extensions/action_view_extension.rb

@@ -56,36 +56,42 @@ module TmlRails
     end
 
     def tml_language_flag_tag(lang = tml_current_language, opts = {})
-      return "" unless tml_application.feature_enabled?(:language_flags)
-      html = image_tag(lang.flag_url, :style => "vertical-align:middle;", :title => lang.native_name)
-      html << "&nbsp;".html_safe 
+      return '' unless tml_application.feature_enabled?(:language_flags)
+      html = image_tag(lang.flag_url, :style => (opts[:style] || 'vertical-align:middle;'), :title => lang.native_name)
+      html << '&nbsp;&nbsp;'.html_safe
       html.html_safe
     end
 
     def tml_language_name_tag(lang = tml_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] 
+      name_type = opts[:language].nil? ? :english : opts[:language] # :full, :native, :english, :locale
 
-      html = "<span style='white-space: nowrap'>"
+      html = []
+      html << "<span style='white-space: nowrap'>"
       html << tml_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 :full then lang.full_name
         when :locale  then lang.locale
-        else lang.full_name
+        else lang.english_name
       end
 
-      html << name
-      html << "</span></span>"
-      html.html_safe
+      html << name.to_s
+      html << '</span></span>'
+      html.join().html_safe
     end
 
     def tml_language_selector_tag(type = nil, opts = {})
       return unless Tml.config.enabled?
-      render(:partial => '/tml_rails/tags/language_selector', :locals => {:type => type, :opts => opts})
+
+      type ||= :default
+      unless [:bootstrap, :default, :inline, :select].include?(type.to_sym)
+        return "Unsupported language selector #{type}"
+      end
+
+      render(:partial => "/tml_rails/tags/language_selector_#{type}", :locals => {:opts => opts})
     end
 
     def tml_language_strip_tag(opts = {})

data/lib/tml_rails/version.rb

@@ -30,5 +30,5 @@
 #++
 
 module TmlRails
-  VERSION = '4.3.6'
+  VERSION = '4.3.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tml-rails
 version: !ruby/object:Gem::Version
-  version: 4.3.6
+  version: 4.3.7
 platform: ruby
 authors:
 - Michael Berkovich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-28 00:00:00.000000000 Z
+date: 2015-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -49,7 +49,11 @@ files:
 - README.md
 - Rakefile
 - app/controllers/tml_rails/tools_controller.rb
-- app/views/tml_rails/tags/_language_selector.html.erb
+- app/views/tml_rails/tags/_language_selector_bootstrap.html.erb
+- app/views/tml_rails/tags/_language_selector_default.html.erb
+- app/views/tml_rails/tags/_language_selector_inline.html.erb
+- app/views/tml_rails/tags/_language_selector_js.html.erb
+- app/views/tml_rails/tags/_language_selector_select.html.erb
 - 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

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

@@ -1,82 +0,0 @@
-<% if tml_session.tools_enabled? or type.blank? %>
-  <%
-     if tml_session.tools_enabled?
-       opts[:method] = 'Tml.UI.LanguageSelector.show(); return false;'
-     end
-  %>
-
-  <%= link_to('#',
-        :onclick => (opts[:method] || "alert('Custom language selector can be specified by passing it in the method attribute of the language selector tag.');"),
-        :style => (opts[:style] || 'padding-right:5px;text-decoration:none'),
-        :class => opts[:class]
-      ) do %>
-    <% unless opts[:hide_flag] %>
-      <%= image_tag(tml_current_language.flag_url, :style => "align:middle") %>
-      &nbsp;
-    <% end %>
-    <% if opts[:language] == :native %>
-      <%= tml_current_language.native_name %>
-    <% elsif opts[:language] == :english %>
-      <%= tml_current_language.english_name %>
-    <% else %>
-      <%= tml_current_language.english_name %>
-    <% end %>
-  <% end %>
-
-<% elsif type == :list %>
-  <div style="padding-top:10px;">
-    <% tml_application.languages.each_with_index do |lang, index| %>
-      <% next if opts[:limit] and index >= opts[:limit] %>
-      <%= link_to(params.merge(:locale => lang.locale), :style => (opts[:style] || 'padding-right:5px;text-decoration:none'), :class => opts[:class]) do %>
-        <% if opts[:flags_only] or opts[:flags] %>
-          <%= image_tag(lang.flag_url) %>
-        <% end %>
-        <% unless opts[:flags_only] %>
-          <%= lang.english_name %>
-        <% end %>
-      <% end %>
-    <% end %>
-  </div>
-
-<% elsif type == :dropdown %>
-
-  <script>
-    function tml_change_locale(selector) {
-      var query_parts = window.location.href.split('?');
-      var query = query_parts.length > 1 ? query_parts[1] : null;
-      var params = {};
-      if (query) {
-        var vars = query.split('&');
-        for (var i = 0; i < vars.length; i++) {
-          var pair = vars[i].split('=');
-          params[pair[0]] = pair[1];
-        }
-      }
-      params['locale'] = selector.options[selector.selectedIndex].value;
-
-      query = [];
-      var keys = Object.keys(params);
-      for (var i = 0; i < keys.length; i++) {
-        query.push(encodeURIComponent(keys[i]) + "=" + encodeURIComponent(params[keys[i]]));
-      }
-
-      var destination = query_parts[0] + '?' + query.join("&");
-      window.location = destination;
-    }
-  </script>
-
-  <select id="tml_language_selector" onchange="tml_change_locale(this)" style="<%=opts[:style]%>" class="<%=opts[:class]%>">
-    <% tml_application.languages.each do |lang| %>
-      <option dir='ltr' value="<%=lang.locale%>" <%="selected" if lang.locale == tml_current_locale %>>
-        <% if opts[:language] == :native %>
-          <%= lang.native_name %>
-        <% elsif opts[:language] == :english %>
-          <%= lang.english_name %>
-        <% else %>
-          <%= lang.english_name %>
-        <% end %>
-      </option>
-    <% end %>
-  </select>
-
-<% end %>