translate-rails3-plus 0.0.1 → 0.0.3

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

@@ -53,6 +53,45 @@
         document.getElementsByTagName("head")[0].appendChild(s);
     }
 
+    function checkErrors()
+    {  
+    	var errors = [] 	
+    	$$('.translation-error').each(function(item) { 
+    		item.removeClassName("translation-error") 
+    		item.select('.error-text')[0].innerHTML = ""
+    	});
+
+    	$$('.single-translation').each(function(item) {
+            var val =  item.select('.edit-field')[0].value 
+            if( !val.blank() )
+            {
+            	var patt1=/\{[^\{\}]*\}/g;
+	            var val_subs = val.match(patt1)
+	            var key = item.select('.translation-text')[0].innerHTML 
+                var key_subs = key.match(patt1)
+	            if( val_subs == null ){ val_subs = [] }
+	            if( key_subs == null ){ key_subs = [] }
+	            if( val_subs.sort().join('') != key_subs.sort().join('') )
+	            {
+                   item.addClassName("translation-error");
+                   errors.push( item )
+                   item.select('.error-text')[0].innerHTML = "Mismatched {} substitution strings."
+	            }
+	        }
+         });
+    	return errors
+   }
+
+    function testAndSave()
+    {  
+    	var errors = checkErrors()
+     	
+    	if( errors.length == 0 || confirm( "Some transtalations have errors, save anyway?"))
+        {
+        	document.forms["translate_form"].submit();
+        }   	  
+    }
+
     /*
     prototypeUtils.js from http://jehiah.com/
     Licensed under Creative Commons.
@@ -299,10 +338,10 @@
 		padding:0.7em 0.5em 0.5em 1.5em;
 	}
 	div.translation{
-		padding:1em;
-		border-bottom:solid 0.2em #d46021;
-    border-left: solid 0.1em #D46021;
-		margin:0 1em 1em 1.6em;
+		padding: 11px;
+		border-bottom:solid 1px #d46021;
+        border-left: solid 1px #D46021;
+		margin:14px 12px 12px 19px;
 	}
 	div.translation input, div.translation textarea{
 		width:98%;
@@ -332,10 +371,10 @@
 		font-weight:bold;
 	}
 	div.selected{
-		margin:0 1em 1em 1em;
-		border-left:solid 0.6em #d46021;
-		border-right:solid 0.2em #d46021;
-		border-top:solid 0.2em #d46021;
+		margin:12px 10px 12px 12px;
+		border-left:solid 8px #d46021;
+		border-right:solid 2px #d46021;
+		border-top:solid 2px #d46021;
 		background:#f1f1f1;
 	}
 	.display{display:block !important;}
@@ -359,24 +398,33 @@
     color: #597B5C;
     background-color: #BCFFBD;
   }
+  .translation-error .edit-field
+  {
+  	border: 1px solid red;
+  }
+  .error-text
+  {
+  	color: red;
+  }
   .big-locale
   {
     font-size: 32px;
-    color: red;
   }
     </style>
 	<script type="text/javascript">
 	onload = function (){
 		$$("div.translation input, div.translation textarea").each(function (e){
 			Event.observe(e,'focus', function (elm){
-				this.up(1).down(".translation-text").addClassName("focus-text");
-				this.up(1).addClassName("selected");
+				this.up(".single-translation").down(".translation-text").addClassName("focus-text");
+				this.up(".translation").addClassName("selected");
 			});
 			Event.observe(e,'blur', function (elm,e){
-				this.up(1).down(".translation-text").removeClassName("focus-text");
-				this.up(1).removeClassName("selected");
+				this.up(".single-translation").down(".translation-text").removeClassName("focus-text");
+				this.up(".translation").removeClassName("selected");
 			});
 		});
+
+		checkErrors()
 	}
 	</script>
   </head>

data/app/views/translate/_array_form.html.erb

@@ -6,7 +6,7 @@
 
 <div class="translation">
 <% if from_text.present? %>
-	<p class="translation-text">
+
 		<ol>
 			<% from_text.each_with_index do |from_text_section, index| %>
 				<%
@@ -17,18 +17,21 @@
 					# for this element yet...
 					to_text = Array.new if to_text.blank?
 				%>
-				<li><%= from_text_section %></li>
-				<p class="edit-form">
-				<% if n_lines > 1 %>
-					<%= text_area_tag("#{field_name}[#{index}]", to_text[index], :size => "#{line_size}x#{n_lines}", :id => "#{key}[#{index}]") %>
-				<% else %>
-					<%= text_field_tag("#{field_name}[#{index}]", to_text[index], :size => line_size, :id => "#{key}[#{index}]") %>
-				<% end %>
-				<%= translate_link("#{key}[#{index}]", from_text_section, @from_locale, @to_locale) %>
+				<li class="single-translation">
+				  <p class="translation-text"><%= from_text_section %></p>
+				  <p class="edit-form" >
+				  <% if n_lines > 1 %>
+					<%= text_area_tag("#{field_name}[#{index}]", to_text[index], :size => "#{line_size}x#{n_lines}", :id => "#{key}[#{index}]", :class=>'edit-field') %>
+				  <% else %>
+					<%= text_field_tag("#{field_name}[#{index}]", to_text[index], :size => line_size, :id => "#{key}[#{index}]", :class=>'edit-field') %>
+				  <% end %>
+				  <%= translate_link("#{key}[#{index}]", from_text_section, @from_locale, @to_locale) %>
 				</p>
+				<div class="error-text"></div>
+				</li>
 			<% end %>
 		</ol>
-	</p>
+
 <% end %>
 <p>
 	<em>

data/app/views/translate/_string_form.html.erb

@@ -6,23 +6,22 @@
 	field_name = "key[#{key}]"
 %>
 
-<div class="translation">    
+<div class="translation single-translation" >    
 <% if from_text.present? %>
-	<p class="translation-text">
-		<% if from_text.starts_with?(" ") || from_text.ends_with?(" ")%>
-	      <%= simple_format("&rarr;" + h(from_text) + "&larr;") %>
-	    <% else %>
-	      <%= simple_format(h(from_text)) %>
-	    <% end  %>
-	</p>
+	<% if from_text.starts_with?(" ") || from_text.ends_with?(" ")%>
+      <%= simple_format("&rarr;" + h(from_text) + "&larr;", :class => "translation-text" ) %>
+    <% else %>
+      <%= simple_format(h(from_text), :class => "translation-text") %>
+    <% end  %>	
 <% end %>
 <p class="edit-form">
 <% if n_lines > 1 %>
-	<%= text_area_tag(field_name, to_text, :size => "#{line_size}x#{n_lines}", :id => key) %>
+	<%= text_area_tag(field_name, to_text, :size => "#{line_size}x#{n_lines}", :id => key, :class=>'edit-field') %>
 <% else %>
-	<%= text_field_tag(field_name, to_text, :size => line_size, :id => key) %>
+	<%= text_field_tag(field_name, to_text, :size => line_size, :id => key, :class=>'edit-field') %>
 <% end %>
 </p>
+<div class="error-text"></div>
 <p>
 	<em>
 		<%= translate_link(key, from_text, @from_locale, @to_locale) %>

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

@@ -60,7 +60,7 @@ show_filters << "changed" if @from_locale != @to_locale
 </div>
 
 <% if @total_entries > 0 %>
-  <%= form_tag(translate_path) do %>
+  <%= form_tag(translate_path, :name => 'translate_form') do %>
     <div>
       <%= hidden_field_tag(:filter, params[:filter], :id => "hid_filter") %>
       <%= hidden_field_tag(:sort_by, params[:sort_by], :id => "hid_sort_by") %>
@@ -72,7 +72,7 @@ show_filters << "changed" if @from_locale != @to_locale
     <div class="translations">
       <h2>Translations from <span class='big-locale'><%= @from_locale %></span> to <span class='big-locale'><%= @to_locale %></span></h2>
       <p class="translate">
-        <%= submit_tag "Save Translations" %>
+        <%= button_to_function 'Save Translations', 'testAndSave()' %>
       </p>
       <% @paginated_keys.each do |key| %>
         <%= 
@@ -85,7 +85,7 @@ show_filters << "changed" if @from_locale != @to_locale
       %>
       <% end %>
       <p class="translate">
-        <%= submit_tag "Save Translations" %>
+        <%= button_to_function 'Save Translations', 'testAndSave()' %>
       </p>
     </div>
   <% end %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: translate-rails3-plus
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -16,7 +16,7 @@ date: 2012-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ya2yaml
-  requirement: &23168796 !ruby/object:Gem::Requirement
+  requirement: &22370988 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -24,7 +24,7 @@ dependencies:
         version: '0.30'
   type: :runtime
   prerelease: false
-  version_requirements: *23168796
+  version_requirements: *22370988
 description: ! 'This plugin provides a web interface for translating Rails I18n texts
 
   (requires Rails 3.0 or higher) from one locale to another.
@@ -81,7 +81,6 @@ files:
 - spec/log_spec.rb
 - spec/spec_helper.rb
 - spec/storage_spec.rb
-- translate-rails3-plus.gemspec
 homepage: https://github.com/gsmedley/translate
 licenses: []
 post_install_message: 

data/translate-rails3-plus.gemspec

@@ -1,70 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = "translate-rails3-plus"
-  s.version = "0.0.1"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Peter Marklund", "Milan Novota", "Roman Shterenzon", "Garth Smedley"]
-  s.date = "2012-07-09"
-  s.description = "This plugin provides a web interface for translating Rails I18n texts\n(requires Rails 3.0 or higher) from one locale to another.\nThe plugin has been tested only with the simple I18n backend that ships\nwith Rails.\nI18n texts are read from and written to YAML files under config/locales.\n\nThis gem is a fork of https://github.com/romanbsd/translate.\nFrom the original https://github.com/mynewsdesk/translate\nwhich also includes work from this fork: https://github.com/milann/translate\n"
-  s.email = "gsmedley@kanayo.com"
-  s.extra_rdoc_files = [
-    "README.md"
-  ]
-  s.files = [
-    "MIT-LICENSE",
-    "README.md",
-    "Rakefile",
-    "VERSION",
-    "app/controllers/translate_controller.rb",
-    "app/helpers/translate_helper.rb",
-    "app/views/layouts/translate.html.erb",
-    "app/views/translate/_array_form.html.erb",
-    "app/views/translate/_pagination.html.erb",
-    "app/views/translate/_string_form.html.erb",
-    "app/views/translate/index.html.erb",
-    "config/routes.rb",
-    "init.rb",
-    "lib/tasks/translate.rake",
-    "lib/translate.rb",
-    "lib/translate/file.rb",
-    "lib/translate/keys.rb",
-    "lib/translate/log.rb",
-    "lib/translate/routes.rb",
-    "lib/translate/storage.rb",
-    "spec/controllers/translate_controller_spec.rb",
-    "spec/file_spec.rb",
-    "spec/files/translate/app/models/article.rb",
-    "spec/files/translate/app/views/category.erb",
-    "spec/files/translate/app/views/category.html",
-    "spec/files/translate/app/views/category.html.erb",
-    "spec/files/translate/app/views/category.rhtml",
-    "spec/files/translate/public/javascripts/application.js",
-    "spec/keys_spec.rb",
-    "spec/log_spec.rb",
-    "spec/spec_helper.rb",
-    "spec/storage_spec.rb",
-    "translate-rails3-plus.gemspec"
-  ]
-  s.homepage = "https://github.com/gsmedley/translate"
-  s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.16"
-  s.summary = "Newsdesk translate plugin for Rails 3"
-
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<ya2yaml>, ["~> 0.30"])
-    else
-      s.add_dependency(%q<ya2yaml>, ["~> 0.30"])
-    end
-  else
-    s.add_dependency(%q<ya2yaml>, ["~> 0.30"])
-  end
-end
-