interpret 0.1.5 → 0.2.0

data/app/controllers/interpret/missing_translations_controller.rb

@@ -0,0 +1,15 @@
+class Interpret::MissingTranslationsController < Interpret::BaseController
+  def index
+    unless I18n.locale == I18n.default_locale
+      res = ActiveRecord::Base.connection.execute("select t.value, t.key from
+                                                  translations t where
+                                                  t.locale ='#{I18n.default_locale}'
+                                                  and (select count(*) from
+                                                       translations t2 where
+                                                       t2.key = t.key and
+                                                       t2.locale ='#{I18n.locale}') =
+                                                         0")
+      @missing_translations = res.map{|x| {:ref_value => YAML.load(x["value"]), :key => x["key"]}}
+    end
+  end
+end

data/app/controllers/interpret/search_controller.rb

@@ -1,9 +1,17 @@
 class Interpret::SearchController < Interpret::BaseController
-
-  def perform
-    t = Interpret::Translation.arel_table
-    search_key = params[:key].split(" ").map{|x| "%#{CGI.escape(x)}%"}
-    search_value = params[:value].split(" ").map{|x| "%#{CGI.escape(x)}%"}
-    @translations = Interpret::Translation.locale(I18n.locale).where(t[:key].matches_all(search_key).or(t[:value].matches_all(search_value))  )
+  def index
+    if request.post?
+      opts = {}
+      opts[:key] = params[:key] if params[:key].present?
+      opts[:value] = params[:value] if params[:value].present?
+      redirect_to interpret_search_url(opts)
+    else
+      if params[:key].present? || params[:value].present?
+        t = Interpret::Translation.arel_table
+        search_key = params[:key].present? ? params[:key].split(" ").map{|x| "%#{CGI.escape(x)}%"} : []
+        search_value = params[:value].present? ? params[:value].split(" ").map{|x| "%#{CGI.escape(x)}%"} : []
+        @translations = Interpret::Translation.locale(I18n.locale).where(t[:key].matches_all(search_key).or(t[:value].matches_all(search_value))  )
+      end
+    end
   end
 end

data/app/controllers/interpret/translations_controller.rb

@@ -55,27 +55,15 @@ class Interpret::TranslationsController < Interpret::BaseController
     end
   end
 
-  def new
-    @reference = Interpret::Translation.find(params[:translation_id])
-    if @reference.locale === I18n.locale.to_s
-      redirect_to interpret_root_path
-      return
-    end
-    @translation = Interpret::Translation.new :locale => I18n.locale, :key => @reference.key
-  end
-
   def create
-    @reference = Interpret::Translation.find(params[:translation_id])
-    if @reference.locale == I18n.locale.to_s
-      redirect_to interpret_root_path
-      return
-    end
-    @translation = Interpret::Translation.new params[:interpret_translation].merge(:locale => I18n.locale, :key => @reference.key)
+    @translation = Interpret::Translation.new params[:interpret_translation]
 
     if @translation.save
-      redirect_to interpret_root_path(:locale => I18n.locale), :notice => "New translation created"
+      flash[:notice] = "New translation created for #{@translation.key}"
+      redirect_to request.env["HTTP_REFERER"]
     else
-      render :action => :new
+      flash[:alert] = "Error when creating a new translation"
+      redirect_to request.env["HTTP_REFERER"]
     end
   end
 

data/app/models/interpret/expiration_observer.rb

@@ -20,6 +20,9 @@ module Interpret
     def expire_cache(key)
     end
 
+    def expire_cache_all
+    end
+
   private
     def run_expiration(record)
       Interpret.backend.reload! if Interpret.backend

data/app/models/interpret/translation.rb

@@ -2,7 +2,7 @@ module Interpret
 
   class Translation < I18n::Backend::ActiveRecord::Translation
     default_scope order('locale ASC')
-    validates_presence_of :value
+    validates_uniqueness_of :key, :scope => :locale
 
     class << self
       # Generates a hash representing the tree structure of the translations
@@ -32,7 +32,7 @@ module Interpret
         translations.each do |e|
           LazyHash.add(res, "#{e.locale}.#{e.key}", e.value)
         end
-        if res.keys.size != 1
+        if res.any? && res.keys.size != 1
           raise IndexError, "Generated hash must have only one root key. Your translation data in database may be corrupted."
         end
         res
@@ -58,7 +58,7 @@ module Interpret
           records.each do |x|
             if tr = locale(lang).find_by_key(x.key)
               tr.value = x.value
-              tr.save!
+              tr.save(:validate => false)
             end
           end
         end
@@ -80,7 +80,7 @@ module Interpret
 
         # TODO: Replace with activerecord-import bulk inserts
         transaction do
-          records.each {|x| x.save!}
+          records.each {|x| x.save(:validate => false)}
         end
       end
 
@@ -196,7 +196,8 @@ module Interpret
           trans = locale(lang).find_by_key(key)
           if trans.nil?
             if value = get_value_from_hash(@languages[lang], key)
-              create! :locale => lang, :key => key, :value => value
+              foo = new( :locale => lang, :key => key, :value => value )
+              foo.save(:validate => false)
               Interpret.logger.info "New key created [#{key}] for language [#{lang}]"
             end
           end
@@ -212,7 +213,8 @@ module Interpret
       end
 
       def create_new_translation(missing_key, main_value)
-        create! :locale => I18n.default_locale, :key => missing_key, :value => main_value
+        foo = new(:locale => I18n.default_locale, :key => missing_key, :value => main_value)
+        foo.save(:validate => false)
         Interpret.logger.info "New key created [#{missing_key}] for language [#{I18n.default_locale}]"
 
         check_in_other_langs(missing_key)

data/app/views/interpret/missing_translations/index.html.erb

@@ -0,0 +1,33 @@
+<% if I18n.locale == I18n.default_locale %>
+  <p>There can't be missing translations for the main language</p>
+<% elsif @missing_translations.empty? %>
+  <p>There are no missing translations</p>
+<% else %>
+  <p>There are <%= @missing_translations.size %> missing translations in [<%= I18n.locale %>]. You can
+  create them below and you can see the translation key and also the original
+  content in the reference language [ <%= I18n.default_locale %> ]
+  </p>
+  <table>
+    <thead>
+      <tr class="header">
+        <th>Key</th>
+        <th>Value in [ <%= I18n.default_locale %> ]</th>
+        <th>Your translation to [ <%= I18n.locale %> ]</th>
+      </tr>
+    </thead>
+    <% @missing_translations.each do |trans| %>
+      <tr>
+        <td><%= trans[:key] %></td>
+        <td><%= trans[:ref_value] %></td>
+        <td>
+          <%= form_for Interpret::Translation.new, :url => interpret_translations_path do |f| %>
+            <%= f.hidden_field "locale", :value => I18n.locale %>
+            <%= f.hidden_field "key", :value => trans[:key] %>
+            <%= f.text_area :value, :rows => 4, :cols => 60 %>
+            <%= submit_tag "Create" %>
+          <% end %>
+        </td>
+      </tr>
+    <% end %>
+  </table>
+<% end %>

data/app/views/interpret/search/_blank_search.html.erb

@@ -0,0 +1,32 @@
+<% interpret_title "Interpret - Search" %>
+
+<div id="header">
+  <h1>Search translations</h1>
+</div>
+
+<div id="search">
+  <p>Enter a search term for the key and/or the value of the translation</p>
+
+  <%= form_tag interpret_search_path do %>
+    <%= label_tag "key", "Key value" %>
+    <br />
+    <%= text_field_tag "key" %>
+    <br />
+
+    <%= label_tag "value", "Translation text" %>
+    <br />
+    <%= text_field_tag "value" %>
+    <br />
+
+    <%= submit_tag "SEARCH" %>
+
+  <% end %>
+
+  <% content_for :sidebar do %>
+    <h2>Search</h2>
+    <p>
+      You can use this search feature to look into all the translations. Can be filtered by language, key and phrase.
+    </p>
+  <% end %>
+</div>
+

data/app/views/interpret/search/{perform.html.erb → _filled_search.html.erb}

@@ -18,7 +18,7 @@
     <%= @translations.size %> results found.
   </p>
   <div id="side_search">
-    <%= form_tag interpret_search_for_path do %>
+    <%= form_tag interpret_search_path do %>
       <%= label_tag "key", "Key value" %>
       <br />
       <%= text_field_tag "key", params[:key] %>

data/app/views/interpret/search/index.html.erb

@@ -1,31 +1,5 @@
-<% interpret_title "Interpret - Search" %>
-
-<div id="header">
-  <h1>Search translations</h1>
-</div>
-
-<div id="search">
-  <p>Enter a search term for the key and/or the value of the translation</p>
-
-  <%= form_tag interpret_search_for_path do %>
-    <%= label_tag "key", "Key value" %>
-    <br />
-    <%= text_field_tag "key" %>
-    <br />
-
-    <%= label_tag "value", "Translation text" %>
-    <br />
-    <%= text_field_tag "value" %>
-    <br />
-
-    <%= submit_tag "SEARCH" %>
-
-  <% end %>
-
-  <% content_for :sidebar do %>
-    <h2>Search</h2>
-    <p>
-      You can use this search feature to look into all the translations. Can be filtered by language, key and phrase.
-    </p>
-  <% end %>
-</div>
+<% unless @translations %>
+  <%= render "blank_search" %>
+<% else %>
+  <%= render "filled_search" %>
+<% end %>

data/app/views/interpret/translations/_listing.html.erb

@@ -2,6 +2,7 @@
   <thead>
     <tr class="header">
       <% if @references %>
+        <th>Key</th>
         <th>Master translation [<%= I18n.default_locale %>]</th>
       <% else %>
         <th>Key</th>
@@ -39,6 +40,7 @@
       <% @references.each do |x| %>
         <% trans = @translations.detect{|y| y.key == x.key} %>
         <tr<%= " id='translation_#{trans.id}'" if trans %><%= " class='protected'" if x.protected %>>
+          <td style='width:5%'><%= x.key %></td>
           <td style='width:50%'><%= x.value %></td>
           <td style='width:50%'>
             <% if trans %>
@@ -48,7 +50,7 @@
                   :activator => "#translation_#{trans.id}",
                   :sanitize => false %>
             <% else %>
-              <%= link_to "[Create missing translation]", new_interpret_translation_translation_path(x) %>
+              <%= link_to "Create this missing translation", interpret_missing_translations_path %>
             <% end %>
           </td>
         </tr>

data/app/views/layouts/interpret.html.erb

@@ -10,7 +10,8 @@
     <% unless @interpret_user && !@interpret_admin %>
       <%= interpret_section_link_to "Tools", interpret_tools_path %> |
     <% end %>
-    <%= interpret_section_link_to "Search", interpret_search_path %>
+    <%= interpret_section_link_to "Search", interpret_search_path %> |
+    <%= interpret_section_link_to "Missing translations", interpret_missing_translations_path %>
     <hr />
   </div>
   <div class="menu grid_4">
@@ -18,6 +19,7 @@
     <% Interpret::Translation.available_locales.each do |locale| %>
       <% opts = {:locale => locale} %>
       <% opts[:key] = params[:key] if params[:key] %>
+      <% opts[:value] = params[:value] if params[:value] %>
       <%= link_to locale, opts %>
     <% end %>
     <hr />

data/config/routes.rb

@@ -1,9 +1,7 @@
 Rails.application.routes.draw do
   scope Interpret.scope do
     namespace :interpret do
-      resources :translations, :only => [:edit, :update] do
-        resources :translations, :only => [:new, :create]
-
+      resources :translations, :only => [:edit, :update, :create] do
         collection do
           get :live_edit
         end
@@ -19,7 +17,7 @@ Rails.application.routes.draw do
       end
 
       match "search", :to => "search#index"
-      match "search_for", :to => "search#perform"
+      resources :missing_translations
 
       root :to => "translations#index"
     end

data/lib/interpret/version.rb

@@ -1,3 +1,3 @@
 module Interpret
-  VERSION = "0.1.5"
+  VERSION = "0.2.0"
 end

data/lib/tasks/interpret.rake

@@ -2,12 +2,12 @@ namespace :interpret do
   desc 'Copy all the translations from config/locales/*.yml into DB backend'
   task :dump => :environment do
     Interpret::Translation.dump
-    eval(Interpret.sweeper.classify).instance.send(:run_expiration) if Interpret.sweeper
+    eval(Interpret.sweeper.classify).instance.send(:expire_cache_all) if Interpret.sweeper
   end
 
   desc 'Synchronize the keys used in db backend with the ones on *.yml files'
   task :update => :environment do
     Interpret::Translation.update
-    eval(Interpret.sweeper.classify).instance.send(:run_expiration) if Interpret.sweeper
+    eval(Interpret.sweeper.classify).instance.send(:expire_cache_all) if Interpret.sweeper
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: interpret
 version: !ruby/object:Gem::Version 
-  hash: 17
-  prerelease: false
+  hash: 23
+  prerelease: 
   segments: 
   - 0
-  - 1
-  - 5
-  version: 0.1.5
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Roger Campos
@@ -15,13 +15,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-03 00:00:00 +02:00
-default_executable: 
+date: 2011-10-07 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -33,11 +32,11 @@ dependencies:
         - 3
         version: 3.0.3
   type: :runtime
-  version_requirements: *id001
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
   name: i18n
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -49,11 +48,11 @@ dependencies:
         - 0
         version: 0.5.0
   type: :runtime
-  version_requirements: *id002
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
   name: i18n-active_record
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -63,11 +62,11 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id003
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
   name: ya2yaml
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -79,11 +78,11 @@ dependencies:
         - 0
         version: 0.30.0
   type: :runtime
-  version_requirements: *id004
+  requirement: *id004
 - !ruby/object:Gem::Dependency 
   name: best_in_place
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -95,11 +94,11 @@ dependencies:
         - 7
         version: 0.1.7
   type: :runtime
-  version_requirements: *id005
+  requirement: *id005
 - !ruby/object:Gem::Dependency 
   name: lazyhash
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -111,11 +110,11 @@ dependencies:
         - 1
         version: 0.1.1
   type: :runtime
-  version_requirements: *id006
+  requirement: *id006
 - !ruby/object:Gem::Dependency 
   name: rspec-rails
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -126,7 +125,7 @@ dependencies:
         - 5
         version: "2.5"
   type: :development
-  version_requirements: *id007
+  requirement: *id007
 description: Manage your app translations with an i18n active_record backend
 email: 
 - roger@itnig.net
@@ -142,13 +141,16 @@ files:
 - README.md
 - Rakefile
 - app/controllers/interpret/base_controller.rb
+- app/controllers/interpret/missing_translations_controller.rb
 - app/controllers/interpret/search_controller.rb
 - app/controllers/interpret/tools_controller.rb
 - app/controllers/interpret/translations_controller.rb
 - app/models/interpret/expiration_observer.rb
 - app/models/interpret/translation.rb
+- app/views/interpret/missing_translations/index.html.erb
+- app/views/interpret/search/_blank_search.html.erb
+- app/views/interpret/search/_filled_search.html.erb
 - app/views/interpret/search/index.html.erb
-- app/views/interpret/search/perform.html.erb
 - app/views/interpret/tools/index.html.erb
 - app/views/interpret/translations/_listing.html.erb
 - app/views/interpret/translations/index.html.erb
@@ -261,7 +263,6 @@ files:
 - test_app/public/stylesheets/private.css
 - test_app/script/rails
 - test_app/vendor/plugins/.gitkeep
-has_rdoc: true
 homepage: https://github.com/rogercampos/interpret
 licenses: []
 
@@ -291,7 +292,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: interpret
-rubygems_version: 1.3.7
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Manage your app translations with an i18n active_record backend