rails-i18nterface 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d59eaee1ac2132b444d68917c3b806ceb8c67b0
-  data.tar.gz: 78c730d3102298405f2a7f950922c847e8a620a3
+  metadata.gz: 5b88e2c4e5270456757b8c9a9b998f5ddb7def00
+  data.tar.gz: 64757f096941c68ed2ffa7862379a76a9f9c04e7
 SHA512:
-  metadata.gz: a9d4dd157eeecf8bcde799f4d4fc1e4c17ef3af10b1041e7e0742404729d8e8ee26edd5924e455f264d62e7ae2f93be81e16879f828951cbbeb1167d5955a18f
-  data.tar.gz: 36c97ab831b493816f5b24c6b6d85bea7e546e2774f47dfc53472536800b19f84a2787b664be87ecfae43ebb2b4b50599b77688fe5c2db954538c12a89e5e859
+  metadata.gz: 70d0037c6d3ffc3386801e895de0843a8560cb39b2d861abfd6de87e8553233940da641f9e4c89b7116bc5675292aab1a625a381ece2dbe725773e12eba4d2ed
+  data.tar.gz: cc9315ef2a375204dba6cb998125f12b42cb1d94bc71fd3353f3fab79264854b7c45a971cf5c3ae1aafbfd7382a2b1734c5e069d63d7fe86b6cf9f3983f53c43

data/README.md

@@ -45,10 +45,12 @@ rake db:migrate
 ### Protect access
 
 You may want to protect the translation engine to admin and create a constraint
-in your routes:
+in your routes (note that you don't want to mount it when you launch tests):
 ```ruby
 constraints AdminConstraint.new do
-  mount RailsI18nterface::Engine => "/translate", :as => "translate_engine"
+  unless Rails.env.test?
+    mount RailsI18nterface::Engine => "/translate", :as => "translate_engine"
+  end
 end
 ```
 

data/app/assets/javascripts/rails_i18nterface/base.js

@@ -58,5 +58,21 @@ $.domReady(function() {
     filter = $(this).data("id");
     filterThat(filter,false);
   });
-
+  $(".delete").on("click", function(e) {
+    e.preventDefault();
+    e.stopPropagation();
+    key = $(this).previous().text();
+    if (confirm("Are you sure you want to delete the key "+key+" from database ?")) {
+      $.ajax({
+        url: 'delete/'+key,
+        method: 'delete',
+        success: function(resp) {
+          alert(resp);
+        },
+        error: function(resp,msg) {
+          alert("Error: "+resp.statusText);
+        }
+      })
+    }
+  });
 });

data/app/assets/stylesheets/rails_i18nterface/application.css

@@ -390,16 +390,53 @@ div.translation em strong {
 .translation .right {
   float: right;
 }
-.translation .right .file {
-  padding: 0 5px;
+.translation .files {
+  padding: 1px 5px;
   background-color: #369;
   color: #fff;
-  border-radius: 3px;
+  border-radius: 3px 3px 0 0;
+  float: right;
+  display: inline;
+  margin-left: 10px;
+  position: relative;
+  cursor: pointer;
+}
+
+.translation .files .count {
+  display: inline-block;
+
+}
+.translation .files .filelist {
+  display: none;
+  position: absolute;
+  top: 15px;
+  right: 0;
+  left: auto;
+  width: 300px;
+  background-color: #fff;
+  padding: 5px 10px;
+  border: 1px solid #369;
+  z-index: 1;
+  color: #000;
+}
+.translation .files:hover .filelist {
   display: block;
 }
 .translation .key {
   color: #666;
 }
+.translation .delete {
+  padding: 0 5px;
+  text-decoration: none;
+  background-color: #999;
+  color: #fff;
+  border-radius: 10px;
+  font-size: 10px;
+  font-weight: bold;
+}
+.translation .delete:hover {
+  background-color: #900;
+}
 .translation .keytext {
   padding: 5px;
   color: #678;

data/app/controllers/rails_i18nterface/translate_controller.rb

@@ -17,11 +17,25 @@ module RailsI18nterface
       @total_entries = @keys.size
     end
 
+    def destroy
+      term = Translation.find_by_key(params[:key])
+      if term.destroy!
+        render json: 'ok'
+      else
+        render json: 'error'
+      end
+    end
+
     def load_db_translations
       @versions = {}
       @dbvalues = {@to_locale => {}}
       (Translation.where(:locale => @to_locale) || []).each { |translation|
         @versions[translation.key] = translation.updated_at.to_i
+        yaml_value = I18n.backend.send(:lookup, @to_locale, translation.key)
+        if (yaml_value and translation.value != yaml_value)
+          translation.value = yaml_value
+          Translation.where(key: translation.key).first.update_attribute(:value, yaml_value)
+        end
         @dbvalues[@to_locale][translation.key] = translation.value
         @keys << translation.key
       }

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

@@ -79,14 +79,19 @@
   	  <div class="translation">
       	<p class="edit-form">
   			<%= hidden_field_tag("version[#{key}]", @versions[key] || '0') %>
-  		<% if n_lines > 1 %>
-          <span class="right">
+  		  <% if n_lines > 1 %>
+          <div class="right">
+              <% if @files[key] %>
+                <div class="files">
+                  <div class="count">found in <%= @files[key].count %> files</div>
+                  <div class="filelist">
+                    <div><%= @files[key].join("</div><div>").html_safe %></div>
+                  </div>
+                </div>
+              <% end %>
   			    <span class="key"><%=h key %></span>
-  			      <% if @files[key] %>
-  				      <span class="file"><%= @files[key].join("</span><span class=\"file\">").html_safe %></span>
-  			      <% end %>
-  			    </span>
-  			  </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>
@@ -98,21 +103,26 @@
   		      </div>
             <div class="clear"></div>
   		    </div>
-      <% else %>
-  		  <span class="translation-text">
-  			  <code class="keytext" id="<%= tid %>_original"><%= from_text %></code>
-  		  </span>
-        <span class="right">
-  			  <span class="key" ><%=h key %></span>
-  			    <% if @files[key] %>
-  				    <span class="file"><%= @files[key].join("</span><span class=\"file\">").html_safe %></span>
-  			    <% end %>
-  			  </span>
-  			</span>
+        <% else %>
+          <div class="right">
+            <% if @files[key] %>
+              <div class="files">
+                <div class="count">found in <%= @files[key].count %> files</div>
+                <div class="filelist">
+                  <div><%= @files[key].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="translation-text">
+            <code class="keytext" id="<%= tid %>_original"><%= from_text %></code>
+          </div>
 
-  			<%= text_field_tag(field_name, to_text, :size => line_size, :id => tid) %>
-  		<% end %>
-  		</p>
+    			<%= text_field_tag(field_name, to_text, :size => line_size, :id => tid) %>
+    		<% end %>
+  		  </p>
   		<p>
   	</p>
   	</div>

data/config/routes.rb

@@ -4,4 +4,5 @@ RailsI18nterface::Engine.routes.draw do
   put '/translate' => 'translate#update'
   get '/reload' => 'translate#reload', :as => 'translate_reload'
   get '/export' => 'translate#export', :as => 'translate_export'
+  delete '/delete/*key' => 'translate#destroy', format: false
 end

data/lib/rails-i18nterface/version.rb

@@ -1,3 +1,3 @@
 module RailsI18nterface
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/spec/internal/log/test.log

@@ -519,3 +519,13 @@ Migrating to CreateTranslations (20110921112044)
    (0.4ms)  CREATE TABLE "translations" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "locale" varchar(255), "key" varchar(255), "value" text, "interpolations" text, "is_proc" boolean DEFAULT 'f', "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) 
    (0.1ms)  INSERT INTO "schema_migrations" ("version") VALUES ('20110921112044')
    (151.3ms)  commit transaction
+Connecting to database specified by database.yml
+   (0.1ms)  select sqlite_version(*)
+   (214.8ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+   (158.7ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+   (0.1ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" 
+Migrating to CreateTranslations (20110921112044)
+   (0.0ms)  begin transaction
+   (0.3ms)  CREATE TABLE "translations" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "locale" varchar(255), "key" varchar(255), "value" text, "interpolations" text, "is_proc" boolean DEFAULT 'f', "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) 
+   (0.1ms)  INSERT INTO "schema_migrations" ("version") VALUES ('20110921112044')
+   (129.3ms)  commit transaction

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails-i18nterface
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Mose