rails-i18nterface 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aeb4d1740a7368ee270f9f502b2644c2a6146ef5
-  data.tar.gz: ba8719e7acfc76dbe813dc6111638a721f4ad884
+  metadata.gz: 741fb9cf5e4fdabfc051baa4c2b43ca5f04a7201
+  data.tar.gz: ca9b5b7425033c98dccbdb44d1d4d331e1df7d5a
 SHA512:
-  metadata.gz: 0eb51763b0fd7d65122e5a6a3e39fbafc78d17dbf441a732258f84d4c461eff309e4d04fd275c6e6d91b0be4a1d744b292c19aec13d3f8e44b307e48d0b69914
-  data.tar.gz: 364ca7bbf0d33d75c717c83590a3d4a1ee4219644bca8e51220249ea3c2d62d0030d1bb8feb821dbac1c20807b07f8dbc116c1e2bacd0fa54bb760c4a3024c89
+  metadata.gz: 7b5dc47ecb71caa7d6342cbdf9d2ff26b6febbbf1468decb2035745a3a18fb0aa9d41df62a51524483d727b99d83e0dc3a5e01986efdb68b99eb9dbc487c1837
+  data.tar.gz: d61684d23f7c064a794126fc329e3df35f1caefda8fc05f01ebd29ee89bdce959fe3fbab606f492ed48a25173ff405e62e42b73a710590b33e6a8976c47a3320

data/README.md

@@ -1,10 +1,10 @@
 # Rails I18nterface
 
+[![Gem Version](https://badge.fury.io/rb/rails-i18nterface.png)](http://badge.fury.io/rb/rails-i18nterface)
 [![Dependency Status](https://gemnasium.com/mose/rails-i18nterface.png)](https://gemnasium.com/mose/rails-i18nterface)
 [![Build Status](https://secure.travis-ci.org/mose/rails-i18nterface.png?branch=master)](http://travis-ci.org/mose/rails-i18nterface)
 [![Coverage Status](https://coveralls.io/repos/mose/rails-i18nterface/badge.png?branch=master)](https://coveralls.io/r/mose/rails-i18nterface)
 [![Code Climate](https://codeclimate.com/github/mose/rails-i18nterface.png)](https://codeclimate.com/github/mose/rails-i18nterface)
-[![Gem Version](https://badge.fury.io/rb/rails-i18nterface.png)](http://badge.fury.io/rb/rails-i18nterface)
 
 ![rails-i18nterface](http://mose.fr/rails-i18nterface.png)
 
@@ -61,15 +61,16 @@ Where `[:en]` and `[:ja, :es, :fr]` could be replaced by locale list of your cho
 
 ## Todo
 
-* fix the code smell reported by code climate (done)
-  * extract code from the controller to a lib (dmostly done)
-  * refactor the libs in a cleaner way (mostly done)
-  * apply rubocop and follow his law (done)
+* <s>fix the code smell reported by code climate</s> (done)
+  * <s>extract code from the controller to a lib</s> (done)
+  * <s>refactor the libs in a cleaner way</s> (done)
+  * <s>apply rubocop and follow his law</s> (done)
+* <s>remove those damn global variables</s> (done)
+* <s>extend testing to refactored libs</s> (done)
+* add a way in the config to ignore some gem locales
 * make the application thread-safe
-* remove those damn global variables (done)
-* extend testing to refactored libs (mostly done)
 * change navigation to an ajax-driven reload
-* add a way to gather .one and .other and .few under same translation line
+* add a way to gather .one and .other and .few under same translation line (not sure actually)
 * add support for other i18n backends (gettext)
 
 ## Note for upgrade 0.1.x to 0.2.x
@@ -104,9 +105,9 @@ Check the [Changelog](https://github.com/mose/rails-i18nterface/blob/master/chan
 ## License
 
 ```
-Copyright 2009 Peter Marklund, Joakim Westerlund, Claudius Coenen
-Copyright 2011 Larry Sprock, Artin Boghosain, Michal Hantl
-Copyright 2013 Mose
+Copyright 2009-2011 Peter Marklund, Joakim Westerlund, Claudius Coenen
+Copyright 2011-2013 Larry Sprock, Artin Boghosain, Michal Hantl
+Copyright 2013-2015 Mose
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -11,13 +11,24 @@ require "bundler/gem_tasks"
 
 require "rake/testtask"
 
-
 require "rspec/core/rake_task" # RSpec 2.0
+
+desc "launch rspec tests"
 task :spec do
   RSpec::Core::RakeTask.new(:spec) do |t|
     t.rspec_opts = ["-c", "-f progress", "-r ./spec/spec_helper.rb"]
-    t.pattern = 'spec/**/*_spec.rb'
+    t.pattern = 'spec/{controllers,lib,requests}/*_spec.rb'
+  end
+end
+
+desc "launch selenium tests on SauceLabs"
+task :sauce do
+  RSpec::Core::RakeTask.new(:sauce) do |t|
+    t.rspec_opts = ["-c", "-f progress", "-r ./spec/spec_helper.rb"]
+    t.pattern = 'spec/selenium/*_spec.rb'
   end
 end
 
 task :default => :spec
+
+

data/app/controllers/rails_i18nterface/translate_controller.rb

@@ -2,20 +2,17 @@
 
 module RailsI18nterface
   class TranslateController < RailsI18nterface::ApplicationController
-
     include Utils
 
     before_filter :init
-    before_filter :init_translations
 
     def index
-      @dbvalues = {}
       @keys = RailsI18nterface::Keys.new(Rails.root, @from_locale, @to_locale)
       @keys.apply_filters(params)
-      paginate_keys
+      @keys.paginate(@page, @per_page)
       @total_entries = @keys.all_keys.size
       @page_title = 'Translate'
-      @show_filters = ['all', 'untranslated', 'translated']
+      @show_filters = %w(all untranslated translated)
     end
 
     def destroy
@@ -25,11 +22,11 @@ module RailsI18nterface
 
     def export
       locale = params[:locale].to_sym
-      keys = {locale => I18n.backend.send(:translations)[locale] || {}}
+      keys = { locale => I18n.backend.send(:translations)[locale] || {} }
       remove_blanks keys
       yaml = keys_to_yaml(keys)
       response.headers['Content-Disposition'] = "attachment; filename=#{locale}.yml"
-      render :text => yaml
+      render text: yaml
     end
 
     def update
@@ -40,7 +37,8 @@ module RailsI18nterface
       yaml.write_to_file
       force_init_translations
       flash[:notice] = 'Translations stored'
-      redirect_to root_path(params.slice(:filter, :sort_by, :key_type, :key_pattern, :text_type, :text_pattern))
+      reload
+      # redirect_to root_path(params.slice(:filter, :sort_by, :key_type, :key_pattern, :text_type, :text_pattern))
     end
 
     def reload
@@ -49,19 +47,7 @@ module RailsI18nterface
       redirect_to root_path(params.slice(:filter, :sort_by, :key_type, :key_pattern, :text_type, :text_pattern))
     end
 
-    private
-
-    def paginate_keys
-      params[:page] ||= 1
-      @paginated_keys = @keys.all_keys[offset, @per_page]
-    end
-
-    def offset
-      (params[:page].to_i - 1) * @per_page
-    end
-
-
-  protected
+    protected
 
     def init
       init_session
@@ -71,14 +57,14 @@ module RailsI18nterface
     end
 
     def init_sort
-      params[:sort_by] = 'key' unless params[:sort_by]
+      params[:sort_by] ||= 'key'
     end
 
     def init_assigns
       @from_locale = session[:from_locale].to_sym
       @to_locale = session[:to_locale].to_sym
       @per_page = session[:per_page]
-      @sort_by = params[:sort_by] || 'key'
+      @page = (params[:page] || 1).to_i
     end
 
     def init_session
@@ -99,4 +85,4 @@ module RailsI18nterface
     end
 
   end
-end
+end

data/app/helpers/rails_i18nterface/translate_helper.rb

@@ -1,11 +1,9 @@
 # encoding: utf-8
 
 module RailsI18nterface
-  module TranslateHelper
 
-    def lookup(locale, key)
-      I18n.backend.send(:lookup, locale, key)
-    end
+  # various views helpers
+  module TranslateHelper
 
     def simple_filter(labels, param_name = 'filter')
       filter = []
@@ -13,23 +11,14 @@ module RailsI18nterface
         if label.to_s == params[param_name].to_s
           filter << "<i>#{label}</i>"
         else
-          link_params = params.merge({param_name.to_s => label})
-          link_params.merge!({'page' => nil}) if param_name.to_s != 'page'
+          link_params = params.merge(param_name.to_s => label)
+          link_params.merge!('page' => nil) if param_name.to_s != 'page'
           filter << link_to(label, link_params)
         end
       end
       filter.join(' | ')
     end
 
-    def n_lines(text, line_size)
-      n_lines = 1
-      if text.present?
-        n_lines = text.to_s.split("\n").size
-        n_lines = text.to_s.length / line_size + 1 if n_lines == 1 && text.to_s.length > line_size
-      end
-      n_lines
-    end
-
     def build_namespace(h)
       out = '<ul>'
       dirs = {}
@@ -57,11 +46,15 @@ module RailsI18nterface
       k != '' && k += '.'
       h.each do |key, val|
         if val.is_a? Hash
-          out << '<li class="dir"><span class="display" data-id="%s"></span>%s <span class="num">(%d)</span>' %
-            [ k + key.to_s, key.to_s, val.length]
+          out << sprintf(
+            '<li class="dir"><span class="display" data-id="%s"></span>%s <span class="num">(%d)</span>',
+            k + key.to_s, 
+            key.to_s, 
+            val.length
+          )
           out << list_namespace(k + key.to_s, val)
         else
-          out << '<li class="item" data-id="%s">%s' % [ k + key.to_s, key]
+          out << sprintf('<li class="item" data-id="%s">%s', k + key.to_s, key)
         end
         out << '</li>'
       end
@@ -69,4 +62,4 @@ module RailsI18nterface
     end
 
   end
-end
+end

data/app/views/rails_i18nterface/translate/index.html.erb

@@ -1,38 +1,39 @@
 <%= form_tag(params, :method => :get, :name => 'filter_form') do %>
-<%= hidden_field_tag(:filter, params[:filter]) %>
-<%= hidden_field_tag(:sort_by, params[:sort_by]) %>
-<div id="top">
-  <h1>
-    <div class="right">
-     <%= select_tag(:from_locale, options_for_select(I18n.available_locales, @from_locale.to_sym)) %> <span>to</span>
-     <%= select_tag(:to_locale, options_for_select(I18n.available_locales, @to_locale.to_sym)) %>
-     <%= submit_tag "Display" %>
-    </div>
-    <%= link_to '.. /', '../' %>
-    <%= link_to @page_title, root_path %></a>
-    <div class="center">
-     <label>Show:</label> <%=  simple_filter(@show_filters).html_safe %>
-      Found <strong><%= @keys.all_keys.size %></strong> messages
-      <%= link_to "Reload messages", translate_reload_path(params) %>
-    </div>
-  </h1>
-  <% flash.each do |key, msg| %>
-    <div class="flash" id="<%= key %>"><%= msg %></div>
-  <% end %>
-</div>
-<div id="searchbox">
-  Per page
-  <%= text_field_tag(:per_page, session[:per_page], size: 2) %>
-   <%= select_tag(:key_type, options_for_select([["Key contains", 'contains'], ["Key starts with", 'starts_with']], params[:key_type])) %>
-   <%= text_field_tag(:key_pattern, params[:key_pattern], :size => 50, :id => "key_pattern_value", :class => "text-default") %>
+  <%= hidden_field_tag(:filter, params[:filter]) %>
+  <%= hidden_field_tag(:sort_by, params[:sort_by]) %>
+  <div id="top">
+    <h1>
+      <div class="right">
+        <%= select_tag(:from_locale, options_for_select(I18n.available_locales, @from_locale.to_sym)) %> <span>to</span>
+        <%= select_tag(:to_locale, options_for_select(I18n.available_locales, @to_locale.to_sym)) %>
+        <%= submit_tag "Display" %>
+      </div>
+      <%= link_to '.. /', '../' %>
+      <%= link_to @page_title, root_path %></a>
+      <div class="center">
+        <label>Show:</label> <%=  simple_filter(@show_filters).html_safe %>
+        Found <strong><%= @total_entries %></strong> messages
+        <%= link_to "Reload messages", translate_reload_path %>
+        <%# link_to "Reload messages", translate_reload_path(params) %>
+      </div>
+    </h1>
+    <% flash.each do |key, msg| %>
+      <div class="flash" id="<%= key %>"><%= msg %></div>
+    <% end %>
+  </div>
+  <div id="searchbox">
+    <%= text_field_tag(:per_page, session[:per_page], size: 2) %>
+    Per page
+    <%= select_tag(:key_type, options_for_select([["Key contains", 'contains'], ["Key starts with", 'starts_with']], params[:key_type])) %>
+    <%= text_field_tag(:key_pattern, params[:key_pattern], :size => 50, :id => "key_pattern_value", :class => "text-default") %>
 
-   <%= select_tag(:text_type, options_for_select([['Text contains','contains'], ['Text equals','equals']], params[:text_type])) %>
-   <%= text_field_tag(:text_pattern, params[:text_pattern], :size => 50, :id => "text_pattern_value", :class => "text-default") %>
+    <%= select_tag(:text_type, options_for_select([['Text contains','contains'], ['Text equals','equals']], params[:text_type])) %>
+    <%= text_field_tag(:text_pattern, params[:text_pattern], :size => 50, :id => "text_pattern_value", :class => "text-default") %>
 
     <%= link_to "clear", params.merge({:text_pattern => nil, :key_pattern => nil}), class: 'btn' %>
     <%= submit_tag "Search" %>
     <%= link_to "Export language file", translate_export_path(:locale => @to_locale), class: 'btn sep' %>
-</div>
+  </div>
 <% end %>
 
 <div id="namespaces">
@@ -41,94 +42,79 @@
 
 <div id="inside">
   <div class="paging">
-    <%= render :partial => 'pagination', :locals => {:total_entries => @keys.all_keys.size, :per_page => @per_page} %>
+    <%= render :partial => 'pagination', :locals => { :total_entries => @total_entries, :per_page => @per_page } %>
   </div>
 
-  <% if @keys.all_keys.size > 0 %>
-  <%= form_tag(translate_path, method: :put) do %>
-    <div>
-        <%= hidden_field_tag(:filter, params[:filter], :id => "hid_filter") %>
-        <%= hidden_field_tag(:sort_by, params[:sort_by], :id => "hid_sort_by") %>
-        <%= hidden_field_tag(:key_type, params[:key_type], :id => "hid_key_type") %>
-        <%= hidden_field_tag(:key_pattern, params[:key_pattern], :id => "hid_key_pattern") %>
-        <%= hidden_field_tag(:text_type, params[:text_type], :id => "hid_text_type") %>
-        <%= hidden_field_tag(:text_pattern, params[:text_pattern], :id => "hid_text_pattern") %>
-    </div>
-    <div class="translations">
-      <p class="translate">
-        Translations from <b><%= @from_locale %></b> to <b><%= @to_locale %></b> -
-        <label>Sort by:</label> <%= simple_filter(["key", "text"], 'sort_by').html_safe %>
-  	    <%= submit_tag "Save Translations", style: 'float:right;' %>
-  	  </p>
-  	  <% @paginated_keys.each do |key|
-  	      from_text = lookup(@from_locale, key)
-  	      to_text = lookup(@to_locale, key)
-  	      line_size = 100
-  	      n_lines = n_lines(from_text, line_size)
-  	      field_name = "key[#{key}]"
-          tid = key.split('.').join("_")
-
-      %>
-  	  <div class="translation">
-      	<p class="edit-form">
-  		  <% if n_lines > 1 %>
-          <div class="right">
-              <% if @keys.files[key] %>
+  <% if @total_entries > 0 %>
+    <%= form_tag(translate_path, method: :put) do %>
+      <%= hidden_field_tag(:filter, params[:filter], :id => "hid_filter") %>
+      <%= hidden_field_tag(:sort_by, params[:sort_by], :id => "hid_sort_by") %>
+      <%= hidden_field_tag(:key_type, params[:key_type], :id => "hid_key_type") %>
+      <%= hidden_field_tag(:key_pattern, params[:key_pattern], :id => "hid_key_pattern") %>
+      <%= hidden_field_tag(:text_type, params[:text_type], :id => "hid_text_type") %>
+      <%= hidden_field_tag(:text_pattern, params[:text_pattern], :id => "hid_text_pattern") %>
+      <div class="translations">
+        <p class="translate">
+          Translations from <b><%= @from_locale %></b> to <b><%= @to_locale %></b> -
+          <label>Sort by:</label> <%= simple_filter(["key", "text"], 'sort_by').html_safe %>
+          <%= submit_tag "Save Translations", style: 'float:right;' %>
+        </p>
+      <% @keys.translations.each do |tr| %>
+        <div class="translation">
+          <p class="edit-form">
+            <div class="right">
+              <% if tr.files %>
                 <div class="files">
-                  <div class="count">found in <%= @keys.files[key].count %> files</div>
+                  <div class="count">
+                    found in <%= tr.files.count %> files
+                  </div>
                   <div class="filelist">
-                    <div><%= @keys.files[key].join("</div><div>").html_safe %></div>
+                    <div><%= tr.files.join("</div><div>").html_safe %></div>
                   </div>
                 </div>
               <% end %>
-  			    <span class="key"><%=h key %></span>
-            <a href="#" class="delete" title="Delete this key from database">X</a>
-  			  </div>
-          <div class="long-translation">
-  		      <div class="translation-text">
-        			<pre id="<%= tid %>_original"><%= from_text %></pre>
-              <div class="clear"></div>
-  		      </div>
-            <div class="translation-textarea">
-  			      <%= text_area_tag(field_name, to_text, :rows => n_lines, :id => tid) %>
-              <div class="clear"></div>
-  		      </div>
-            <div class="clear"></div>
-  		    </div>
-        <% else %>
-          <div class="right">
-            <% if @keys.files[key] %>
-              <div class="files">
-                <div class="count">found in <%= @keys.files[key].count %> files</div>
-                <div class="filelist">
-                  <div><%= @keys.files[key].join("</div><div>").html_safe %></div>
+              <span class="key">
+                <%= h tr.key %>
+                <% if tr.persisted %>
+                  (saved)
+                <% else %>
+                  (unsaved)
+                <% end %>
+              </span>
+              <a href="#" class="delete" title="Delete this key from database">X</a>
+            </div>
+            <% if tr.lines > 1 %>
+              <div class="long-translation">
+                <div class="translation-text">
+                  <pre id="<%= tr.id %>_original"><%= tr.from_text %></pre>
+                  <div class="clear"></div>
+                </div>
+                <div class="translation-textarea">
+                  <%= text_area_tag("key[#{tr.key}]", tr.to_text, :rows => tr.lines, :id => tr.id) %>
+                  <div class="clear"></div>
                 </div>
+                <div class="clear"></div>
+              </div>
+            <% else %>
+              <div class="translation-text">
+                <code class="keytext" id="<%= tr.id %>_original"><%= tr.from_text %></code>
               </div>
+              <a class="change multiline" href="#" title="click to transform in a multi-line translation">&#9654;</a>
+              <%= text_field_tag("key[#{tr.key}]", tr.to_text, :size => tr.lines, :id => tr.id) %>
             <% end %>
-    			  <span class="key"><%=h key %></span>
-            <a href="#" class="delete" title="Delete this key from database">X</a>
-    			</div>
-          <div class="translation-text">
-            <code class="keytext" id="<%= tid %>_original"><%= from_text %></code>
-          </div>
-          <a class="change multiline" href="#" title="click to transform in a multi-line translation">&#9654;</a>
-    			<%= text_field_tag(field_name, to_text, :size => line_size, :id => tid) %>
-    		<% end %>
-  		  </p>
-  		<p>
-  	</p>
-  	</div>
-  <% end %>
-    <p class="translate">
-      Translations from <%= @from_locale %> to <%= @to_locale %>
-      <%= submit_tag "Save Translations", style: 'float:right' %>
-  	</p>
-  </div>
-  <% end %>
+          </p>
+        </div>
+      <% end %>
+      <p class="translate">
+        Translations from <b><%= @from_locale %></b> to <b><%= @to_locale %></b>
+        <%= submit_tag "Save Translations", style: 'float:right' %>
+      </p>
+    </div>
+    <% end %>
   <% end %>
 
   <div class="paging clear">
-    <%= render :partial => 'pagination', :locals => {:total_entries => @keys.all_keys.size, :per_page => @per_page} %>
+    <%= render :partial => 'pagination', :locals => { :total_entries => @total_entries, :per_page => @per_page } %>
   </div>
 
-</div>
+</div>