translate-rails3 0.2.3 → 0.4.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: be316db288564b0402ea25c9a893925879036248
+  data.tar.gz: e0a2200895b4c73b58f28c40c1e31fe097f9b325
+SHA512:
+  metadata.gz: 77ff1b9a66bae72c2d21a926dcee31eb212019e61202ff1d1d7368c7ff3b195680a6ddd83b2d6b908621ec56467f1670dc70067b9c2f9fe30590bfcb6cd4fc6b
+  data.tar.gz: 8c7496dd20eab5a679bc8cb918785c0c31b0821bab38340f38aa9aba235b95fa6bbc4bf38adc39282286b6cabfb38dda8c80e9752a96c95dbe3889764f9faf99

data/README.md

@@ -21,12 +21,13 @@ Rake Tasks
 
 In addition to the web UI this plugin adds the following rake tasks:
 
-translate:untranslated
-translate:missing
-translate:remove_obsolete_keys
-translate:merge_keys
-translate:google
-translate:changed
+    translate:untranslated
+    translate:missing
+    translate:remove_obsolete_keys
+    translate:merge_keys
+    translate:google
+    translate:changed
+    translate:duplicates
 
 The missing task shows you any I18n keys in your code that do not have translations in the YAML file for your default locale, i.e. config/locales/sv.yml.
 
@@ -37,6 +38,8 @@ The google task is used for auto translating from one locale to another using Go
 
 The changed rake task can show you between one YAML file to another which keys have had their texts changed.
 
+The duplicates task can show you strings that are the same in both locales.
+
 Installation
 ------------
 

data/Rakefile

@@ -20,12 +20,13 @@ The plugin has been tested only with the simple I18n backend that ships
 with Rails.
 I18n texts are read from and written to YAML files under config/locales.
 
-This gem is a fork of the original https://github.com/mynewsdesk/translate
-and also includes work from this fork: https://github.com/milann/translate
+This gem is a fork of https://github.com/romanbsd/translate.
+From the original https://github.com/mynewsdesk/translate
+which also includes work from this fork: https://github.com/milann/translate
 EOF
-    gem.email = 'romanbsd@yahoo.com'
-    gem.homepage = 'https://github.com/romanbsd/translate'
-    gem.authors = ['Peter Marklund', 'Milan Novota', 'Roman Shterenzon']
+    gem.email = 'gsmedley@kanayo.com'
+    gem.homepage = 'https://github.com/gsmedley/translate'
+    gem.authors = ['Peter Marklund', 'Milan Novota', 'Roman Shterenzon', 'Garth Smedley']
     gem.add_dependency 'ya2yaml', '~> 0.30' # For UTF-8 support in YAML
   end
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-0.2.3
+0.4.0

data/app/controllers/translate_controller.rb

@@ -12,10 +12,12 @@ class TranslateController < ActionController::Base
     initialize_keys
     filter_by_key_pattern
     filter_by_text_pattern
+    filter_by_translated_text_pattern
     filter_by_translated_or_changed
     sort_keys
     paginate_keys
     @total_entries = @keys.size
+    @page_title = page_title
   end
 
   # POST /translate
@@ -26,7 +28,7 @@ class TranslateController < ActionController::Base
     Translate::Log.new(@from_locale, @to_locale, params[:key].keys).write_to_file
     force_init_translations # Force reload from YAML file
     flash[:notice] = "Translations stored"
-    redirect_to params.slice(:filter, :sort_by, :key_type, :key_pattern, :text_type, :text_pattern).merge({:action => :index})
+    redirect_to translate_path params.slice(:filter, :sort_by, :key_type, :key_pattern, :text_type, :text_pattern, :translated_text_type, :translated_text_pattern)
   end
 
   # GET /translate/reload
@@ -47,11 +49,32 @@ class TranslateController < ActionController::Base
     end
   end
 
+  def page_title
+    "Translate"
+  end
+
   def lookup(locale, key)
     I18n.backend.send(:lookup, locale, key)
   end
   helper_method :lookup
 
+  def from_locales
+    # Attempt to get the list of locale from configuration
+    from_loc = Rails.application.config.from_locales if Rails.application.config.respond_to?(:from_locales)
+    return I18n.available_locales if from_loc.blank?
+    raise StandardError, "from_locale expected to be an array" if from_loc.class != Array
+    from_loc
+  end
+  helper_method :from_locales
+
+  def to_locales
+    to_loc = Rails.application.config.to_locales if Rails.application.config.respond_to?(:to_locales)
+    return I18n.available_locales if to_loc.blank?
+    raise StandardError, "to_locales expected to be an array" if to_loc.class != Array
+    to_loc
+  end
+  helper_method :to_locales
+
   def filter_by_translated_or_changed
     params[:filter] ||= 'all'
     return if params[:filter] == 'all'
@@ -62,7 +85,16 @@ class TranslateController < ActionController::Base
       when 'translated'
         lookup(@to_locale, key).blank?
       when 'changed'
-        old_from_text(key).blank? || lookup(@from_locale, key) == old_from_text(key)
+        lookup(@from_locale, key).to_s == lookup(@to_locale, key).to_s
+      when 'list_changed'
+        fr = lookup(@from_locale, key).to_s.squish
+        to = lookup(@to_locale, key).to_s.squish
+        if fr.downcase != to.downcase
+          p '--'
+          p 'c:' + fr
+          p 'g:' + to
+        end
+        fr.downcase == to.downcase
       else
         raise "Unknown filter '#{params[:filter]}'"
       end
@@ -97,6 +129,20 @@ class TranslateController < ActionController::Base
     end
   end
 
+  def filter_by_translated_text_pattern
+    return if params[:translated_text_pattern].blank?
+    @keys.reject! do |key|
+      case params[:translated_text_type]
+      when 'contains' then
+        !lookup(@to_locale, key).present? || !lookup(@to_locale, key).to_s.downcase.index(params[:translated_text_pattern].downcase)
+      when 'equals' then
+        !lookup(@to_locale, key).present? || lookup(@to_locale, key).to_s.downcase != params[:translated_text_pattern].downcase
+      else
+        raise "Unknown translated_text_type '#{params[:translated_text_type]}'"
+      end
+    end
+  end
+
   def sort_keys
     params[:sort_by] ||= "key"
     case params[:sort_by]
@@ -143,39 +189,29 @@ class TranslateController < ActionController::Base
     I18n.default_locale
   end
 
+  def default_to_locale
+    :en
+  end
+
   def set_locale
     session[:from_locale] ||= default_locale
-    session[:to_locale] ||= :en
+    session[:to_locale] ||= default_to_locale
     session[:from_locale] = params[:from_locale] if params[:from_locale].present?
     session[:to_locale] = params[:to_locale] if params[:to_locale].present?
     @from_locale = session[:from_locale].to_sym
     @to_locale = session[:to_locale].to_sym
   end
 
-  def old_from_text(key)
-    return @old_from_text[key] if @old_from_text && @old_from_text[key]
-    @old_from_text = {}
-    text = key.split(".").inject(log_hash) do |hash, k|
-      hash ? hash[k] : nil
-    end
-    @old_from_text[key] = text
-  end
-  helper_method :old_from_text
+  def process_array_parameters(parameter)
+    reconstructed_hash = Hash.new
 
-  def log_hash
-    @log_hash ||= Translate::Log.new(@from_locale, @to_locale, {}).read
+    parameter.each do |key, value|
+      if value.is_a?(String)
+        reconstructed_hash[key] = value
+      elsif value.is_a?(Hash)
+        reconstructed_hash[key] = Translate::Keys.arraylize(value)
+      end
+    end
+    reconstructed_hash
   end
-
-	def process_array_parameters(parameter)
-		reconstructed_hash = Hash.new
-
-		parameter.each do |key, value|
-			if value.is_a?(String)
-				reconstructed_hash[key] = value
-			elsif value.is_a?(Hash)
-				reconstructed_hash[key] = Translate::Keys.arraylize(value)
-			end
-		end
-		reconstructed_hash
-	end
 end

data/app/helpers/translate_helper.rb

@@ -1,20 +1,5 @@
 module TranslateHelper
 
-	def from_locales
-		# Attempt to get the list of locale from configuration
-		from_loc = Rails.application.config.from_locales if Rails.application.config.respond_to?(:from_locales)
-		return I18n.available_locales if from_loc.blank?
-		raise StandardError, "from_locale expected to be an array" if from_loc.class != Array
-		from_loc
-	end
-
-	def to_locales
-		to_loc = Rails.application.config.to_locales if Rails.application.config.respond_to?(:to_locales)
-		return I18n.available_locales if to_loc.blank?
-		raise StandardError, "to_locales expected to be an array" if to_loc.class != Array
-		to_loc
-	end
-
   def simple_filter(labels, param_name = 'filter', selected_value = nil)
     selected_value ||= params[param_name]
     filter = []
@@ -47,15 +32,11 @@ module TranslateHelper
   end
 
   def translate_javascript_includes
-    sources = []
     if File.exists?(File.join(Rails.root, "public", "javascripts", "prototype.js"))
-      sources << "/javascripts/prototype.js"
+      javascript_include_tag("prototype.js")
     else
-      sources << "http://ajax.googleapis.com/ajax/libs/prototype/1.7.0.0/prototype.js"
+      javascript_include_tag("http://ajax.googleapis.com/ajax/libs/prototype/1.7.0.0/prototype.js")
     end
-    sources.map do |src|
-      %Q{<script src="#{src}" type="text/javascript"></script>}
-    end.join("\n").html_safe
   end
 
   def translate_link(key, text, from, to)
@@ -69,4 +50,28 @@ module TranslateHelper
     return nil unless method
     link_to_function 'Auto Translate', "#{method}('#{key}', \"#{escape_javascript(text)}\", '#{from}', '#{to}')", :style => 'padding: 0; margin: 0;'
   end
+
+  # copy/paste of missing function, because it was deprecated in Rails 4.1
+  def button_to_function(name, function=nil, html_options={})
+    message = "button_to_function is deprecated and will be removed from Rails 4.1. We recommend using Unobtrusive JavaScript instead. " +
+      "See http://guides.rubyonrails.org/working_with_javascript_in_rails.html#unobtrusive-javascript"
+    ActiveSupport::Deprecation.warn message
+
+    onclick = "#{"#{html_options[:onclick]}; " if html_options[:onclick]}#{function};"
+
+    tag(:input, html_options.merge(:type => 'button', :value => name, :onclick => onclick))
+  end
+
+  # copy/paste of missing function, because it was deprecated in Rails 4.1
+  def link_to_function(name, function, html_options={})
+    message = "link_to_function is deprecated and will be removed from Rails 4.1. We recommend using Unobtrusive JavaScript instead. " +
+      "See http://guides.rubyonrails.org/working_with_javascript_in_rails.html#unobtrusive-javascript"
+    ActiveSupport::Deprecation.warn message
+
+    onclick = "#{"#{html_options[:onclick]}; " if html_options[:onclick]}#{function}; return false;"
+    href = html_options[:href] || '#'
+
+    content_tag(:a, name, html_options.merge(:href => href, :onclick => onclick))
+  end
+
 end

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

@@ -7,6 +7,51 @@
 
     <%= translate_javascript_includes %>
 <script type="text/javascript">
+
+// Return elements which are in A but not in arg0 through argn
+Array.prototype.diff =
+  function() {
+    var a1 = this;
+    var a = a2 = null;
+    var n = 0;
+    while(n < arguments.length) {
+      a = [];
+      a2 = arguments[n];
+      var l = a1.length;
+      var l2 = a2.length;
+      var diff = true;
+      for(var i=0; i<l; i++) {
+        for(var j=0; j<l2; j++) {
+          if (a1[i] === a2[j]) {
+            diff = false;
+            break;
+          }
+        }
+        diff ? a.push(a1[i]) : diff = true;
+      }
+      a1 = a;
+      n++;
+    }
+    return a.unique();
+  };
+
+// Return new array with duplicate values removed
+Array.prototype.unique =
+  function() {
+    var a = [];
+    var l = this.length;
+    for(var i=0; i<l; i++) {
+      for(var j=i+1; j<l; j++) {
+        // If this[i] is found later in the array
+        if (this[i] === this[j])
+          j = ++i;
+      }
+      a.push(this[i]);
+    }
+    return a;
+  };
+
+
     var source_ids = [];
 
     function googleCallback(response) {
@@ -53,6 +98,50 @@
         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('') )
+              {
+                   missing_subs = key_subs.diff( val_subs )
+                   item.addClassName("translation-error");
+                   errors.push( item )
+                   item.select('.error-text')[0].innerHTML = "Missing substitution strings: " + missing_subs.join(', ')
+              }
+          }
+         });
+      return errors
+   }
+
+    function testAndSave()
+    {  
+      var errors = checkErrors()
+      
+      if( errors.length == 0 )
+      {
+        document.forms["translate_form"].submit();
+      }  
+      else 
+      {
+         alert( "Some translations have errors. Please review and correct errors before saving.")
+      }     
+    }
+
     /*
     prototypeUtils.js from http://jehiah.com/
     Licensed under Creative Commons.
@@ -123,232 +212,232 @@
 
 
 <style type="text/css">
-	/*reset.css*/
-	/* v1.0 | 20080212 */
-	html, body, div, span, applet, object, iframe,
-	h1, h2, h3, h4, h5, h6, p, blockquote, pre,
-	a, abbr, acronym, address, big, cite, code,
-	del, dfn, em, font, img, ins, kbd, q, s, samp,
-	small, strike, strong, sub, sup, tt, var,
-	b, u, i, center,
-	dl, dt, dd, ol, ul, li,
-	fieldset, form, label, legend,
-	table, caption, tbody, tfoot, thead, tr, th, td {
-		margin: 0;
-		padding: 0;
-		border: 0;
-		outline: 0;
-		font-size: 100%;
-		vertical-align: baseline;
-		background: transparent;
-	}
-	body {
-		line-height: 1;
-	}
-	ol, ul {
-		list-style: none;
-	}
-	blockquote, q {
-		quotes: none;
-	}
-	blockquote:before, blockquote:after,
-	q:before, q:after {
-		content: '';
-		content: none;
-	}
+  /*reset.css*/
+  /* v1.0 | 20080212 */
+  html, body, div, span, applet, object, iframe,
+  h1, h2, h3, h4, h5, h6, p, blockquote, pre,
+  a, abbr, acronym, address, big, cite, code,
+  del, dfn, em, font, img, ins, kbd, q, s, samp,
+  small, strike, strong, sub, sup, tt, var,
+  b, u, i, center,
+  dl, dt, dd, ol, ul, li,
+  fieldset, form, label, legend,
+  table, caption, tbody, tfoot, thead, tr, th, td {
+    margin: 0;
+    padding: 0;
+    border: 0;
+    outline: 0;
+    font-size: 100%;
+    vertical-align: baseline;
+    background: transparent;
+  }
+  body {
+    line-height: 1;
+  }
+  ol, ul {
+    list-style: none;
+  }
+  blockquote, q {
+    quotes: none;
+  }
+  blockquote:before, blockquote:after,
+  q:before, q:after {
+    content: '';
+    content: none;
+  }
 
-	/* remember to define focus styles! */
-	:focus {
-		outline: 0;
-	}
+  /* remember to define focus styles! */
+  :focus {
+    outline: 0;
+  }
 
-	/* remember to highlight inserts somehow! */
-	ins {
-		text-decoration: none;
-	}
-	del {
-		text-decoration: line-through;
-	}
+  /* remember to highlight inserts somehow! */
+  ins {
+    text-decoration: none;
+  }
+  del {
+    text-decoration: line-through;
+  }
 
-	/* tables still need 'cellspacing="0"' in the markup */
-	table {
-		border-collapse: collapse;
-		border-spacing: 0;
-	}
-	/*clear fix*/
-	.clearfix:after{content:".";display:block;height:0;clear:both;visibility:hidden;}
-	.clearfix{display:inline-block;}
-	html[xmlns] .clearfix {
-	    display: block;
-	}
-	* html .clearfix{height:1%;}
-	/*start layout*/
-	body{
-		background:#fff;
-		color:#333;
-		font-size:75%;
-		font-family:Arial;
-		margin:2em auto;
-		line-height:1.5em;
-	}
-	textarea,input,select{
-		font-family:Arial;
-		font-size:1em;
-	}
-	h1{
-		color:#d46021;
-		font-size:2em;
-		margin-bottom:0.5em;
-	}
-	h2{
-		text-align:left;
-		color:#d46021;
-		font-size:1.3em;
-		padding-left:0;
-	}
-	a{
-		color:#2158C7;
-	}
-	div#container{
-		width:960px;
-		margin:0 auto;
-		font-size:1em;
-	}
-	/*paging*/
-	div.paging{
-		margin-bottom:1em;
-		text-align:left;
-	}
-	div.paging div{
-		border:solid 1px red;
-		margin:1em 1em 0;
-		padding:0.5em;
-		border:solid 1px #d5d6d5;
-		background:#f1f1f1;
-	}
-	ul.paging{
-		display:inline-block;
-	}
-	ul.paging li{
-		display:block;
-		margin:0.2em 0;
-		float:left;
-	}
-	ul.paging li.selected a{
-		color:#fff;
-		background:#2158C7;
-		font-weight:bold;
-		padding:0.5em 0.7em;
-	}
-	ul.paging li a{
-		display:inline-block;
-		line-height:1em;
-		padding:0.5em 0.5em;
-	}
-	/*forms filter*/
-	fieldset{
-		padding:1em;
-		margin:1em;
-		border:solid 2px #d46021;
-	}
-	legend{
-		font-size:1.2em;
-		font-weight:bold;
-		padding:0 1em;
-		padding-bottom:0.5em;
-	}
-	label{
-		font-weight:bold;
-	}
-	fieldset span{padding-right:0.5em;}
-	div#show-sort label,
-	div#languages label,
-	div#filter-pattern label{
-		display:inline-block;
-		width:100px;
-		line-height:2em;
-	}
-	div#show-sort select,
-	div#languages select,
-	div#filter-pattern select{
-		width:120px;
-		margin-right:0.5em;
-	}
-	div#show-sort input.text-default,
-	div#languages input.text-default,
-	div#filter-pattern input.text-default{
-		width:200px;
-	}
-	p.hits{
-		margin-top:1em;
-	}
-	/*translation edit*/
-	div.translations{
-		margin:1em;
-		padding:1em;
-		border:solid 2px #d46021;
-	}
-	div.translations h2{
-		margin-bottom:1em;
-	}
-	p.translate{
-		background:red;
-		border:solid 1px #d5d6d5;
-		background:#f1f1f1;
-		margin:0.5em;
-		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;
-	}
-	div.translation input, div.translation textarea{
-		width:98%;
-		margin:1em 0;
-		display:inline-block;
-		padding:0.3em;
-	}
-	div.translation textarea{
-		height:50px;
-	}
-	div.translation em strong{
-		color:#333;
-		padding-right:0.5em;
-	}
-	p.translation em{
-		display:block;
-		font-size:0.8333em;
-	}
-	div.translation a{
-		padding:1em;
-	}
-	div.translation input.btnDefault{
-		margin:0 0 1em;
-		width:auto;
-	}
-	.focus-text{
-		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;
-		background:#f1f1f1;
-	}
-	.display{display:block !important;}
-	/*feedback*/
-	div#notice, div#error {
-		font-size:1em;
-		margin:1em;
+  /* tables still need 'cellspacing="0"' in the markup */
+  table {
+    border-collapse: collapse;
+    border-spacing: 0;
+  }
+  /*clear fix*/
+  .clearfix:after{content:".";display:block;height:0;clear:both;visibility:hidden;}
+  .clearfix{display:inline-block;}
+  html[xmlns] .clearfix {
+      display: block;
+  }
+  * html .clearfix{height:1%;}
+  /*start layout*/
+  body{
+    background:#fff;
+    color:#333;
+    font-size:75%;
+    font-family:Arial;
+    margin:2em auto;
+    line-height:1.5em;
+  }
+  textarea,input,select{
+    font-family:Arial;
+    font-size:1em;
+  }
+  h1{
+    color:#d46021;
+    font-size:2em;
+    margin-bottom:0.5em;
+  }
+  h2{
+    text-align:left;
+    color:#d46021;
+    font-size:1.3em;
+    padding-left:0;
+  }
+  a{
+    color:#2158C7;
+  }
+  div#container{
+    width:960px;
+    margin:0 auto;
+    font-size:1em;
+  }
+  /*paging*/
+  div.paging{
+    margin-bottom:1em;
+    text-align:left;
+  }
+  div.paging div{
+    border:solid 1px red;
+    margin:1em 1em 0;
+    padding:0.5em;
+    border:solid 1px #d5d6d5;
+    background:#f1f1f1;
+  }
+  ul.paging{
+    display:inline-block;
+  }
+  ul.paging li{
+    display:block;
+    margin:0.2em 0;
+    float:left;
+  }
+  ul.paging li.selected a{
+    color:#fff;
+    background:#2158C7;
+    font-weight:bold;
+    padding:0.5em 0.7em;
+  }
+  ul.paging li a{
+    display:inline-block;
+    line-height:1em;
+    padding:0.5em 0.5em;
+  }
+  /*forms filter*/
+  fieldset{
+    padding:1em;
+    margin:1em;
+    border:solid 2px #d46021;
+  }
+  legend{
+    font-size:1.2em;
+    font-weight:bold;
+    padding:0 1em;
+    padding-bottom:0.5em;
+  }
+  label{
+    font-weight:bold;
+  }
+  fieldset span{padding-right:0.5em;}
+  div#show-sort label,
+  div#languages label,
+  div#filter-pattern label{
+    display:inline-block;
+    width:100px;
+    line-height:2em;
+  }
+  div#show-sort select,
+  div#languages select,
+  div#filter-pattern select{
+    width:120px;
+    margin-right:0.5em;
+  }
+  div#show-sort input.text-default,
+  div#languages input.text-default,
+  div#filter-pattern input.text-default{
+    width:200px;
+  }
+  p.hits{
+    margin-top:1em;
+  }
+  /*translation edit*/
+  div.translations{
+    margin:1em;
+    padding:1em;
+    border:solid 2px #d46021;
+  }
+  div.translations h2{
+    margin-bottom:1em;
+  }
+  p.translate{
+    background:red;
+    border:solid 1px #d5d6d5;
+    background:#f1f1f1;
+    margin:0.5em;
+    padding:0.7em 0.5em 0.5em 1.5em;
+  }
+  div.translation{
+    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%;
+    margin:1em 0;
+    display:inline-block;
+    padding:0.3em;
+  }
+  div.translation textarea{
+    height:50px;
+  }
+  div.translation em strong{
+    color:#333;
+    padding-right:0.5em;
+  }
+  p.translation em{
+    display:block;
+    font-size:0.8333em;
+  }
+  div.translation a{
+    padding:1em;
+  }
+  div.translation input.btnDefault{
+    margin:0 0 1em;
+    width:auto;
+  }
+  .focus-text{
+    font-weight:bold;
+  }
+  div.selected{
+    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;}
+  /*feedback*/
+  div#notice, div#error {
+    font-size:1em;
+    margin:1em;
     padding: 1em;
-  	border: 1px solid red;
+    border: 1px solid red;
+  }
+  div#notice span, div#error span{
+    font-size:1.5em;
   }
-	div#notice span, div#error span{
-		font-size:1.5em;
-	}
 
   div#error {
     background-color: #F3C6CC;
@@ -358,34 +447,49 @@
     border-color: #72A974;
     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");
-			});
-			Event.observe(e,'blur', function (elm,e){
-				this.up(1).down(".translation-text").removeClassName("focus-text");
-				this.up(1).removeClassName("selected");
-			});
-		});
-	}
-	</script>
+  <script type="text/javascript">
+  onload = function (){
+    $$("div.translation input, div.translation textarea").each(function (e){
+      Event.observe(e,'focus', function (elm){
+        this.up(".single-translation").down(".translation-text").addClassName("focus-text");
+        this.up(".translation").addClassName("selected");
+      });
+      Event.observe(e,'blur', function (elm,e){
+        this.up(".single-translation").down(".translation-text").removeClassName("focus-text");
+        this.up(".translation").removeClassName("selected");
+      });
+    });
+
+    checkErrors()
+  }
+  </script>
   </head>
   <body>
-		<div id="container">
-			<% if @page_title -%><h1><%=h @page_title %></h1><% end -%>
-			  <% [:notice, :error].each do |message| %>
-    		  <%if flash[message] %>
-      		<div id="<%= message %>">
-        			<span><%= h(flash[message]) if flash[message] %></span>
-      		</div>
-      		<% end %>
-    		<% end %>
-		<%= yield %>
+    <div id="container">
+      <% if @page_title -%><h1><%=h @page_title %></h1><% end -%>
+        <% [:notice, :error].each do |message| %>
+          <%if flash[message] %>
+          <div id="<%= message %>">
+              <span><%= h(flash[message]) if flash[message] %></span>
+          </div>
+          <% end %>
+        <% end %>
+    <%= yield %>
     </div>
   </body>
 </html>

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,19 +6,22 @@
 	field_name = "key[#{key}]"
 %>
 
-<div class="translation">    
+<div class="translation single-translation" >    
 <% if from_text.present? %>
-	<p class="translation-text">
-		<%= simple_format(h(from_text)) %>
-	</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

@@ -1,5 +1,4 @@
 <%
-@page_title = "Translate"
 show_filters = ["all", "untranslated", "translated"]
 show_filters << "changed" if @from_locale != @to_locale
 %>
@@ -36,9 +35,14 @@ show_filters << "changed" if @from_locale != @to_locale
         <%= select_tag(:text_type, options_for_select(['contains', 'equals'], params[:text_type])) %>
         <%= text_field_tag(:text_pattern, params[:text_pattern], :size => 50, :id => "text_pattern_value", :class => "text-default") %>	     
       </p>
+      <p>
+       <label for="translated_text_pattern_value">Translated Text</label>
+       <%= select_tag(:translated_text_type, options_for_select(['contains', 'equals'], params[:translated_text_type])) %>
+       <%= text_field_tag(:translated_text_pattern, params[:translated_text_pattern], :size => 50, :id => "translated_text_pattern_value", :class => "text-default") %>       
+      </p>
       <p>
         <%= submit_tag "Search" %>
-        <%= link_to "clear", params.merge({:text_pattern => nil, :key_pattern => nil}) %>
+        <%= link_to "clear", params.merge({:text_pattern => nil, :translated_text_pattern => nil, :key_pattern => nil}) %>
       </p>
     </div>
   <% end %>
@@ -56,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") %>
@@ -66,9 +70,9 @@ show_filters << "changed" if @from_locale != @to_locale
       <%= hidden_field_tag(:text_pattern, params[:text_pattern], :id => "hid_text_pattern") %>
     </div>
     <div class="translations">
-      <h2>Translations from <%= @from_locale %> to <%= @to_locale %></h2>
+      <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| %>
         <%= 
@@ -81,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 %>

data/lib/tasks/translate.rake

@@ -33,6 +33,27 @@ class Hash
 end
 
 namespace :translate do
+  desc "Show duplicate keys for locale LOCALE"
+  task :duplicates => :environment do
+    from_locale = I18n.default_locale
+    duplicates = Translate::Keys.new.duplicate_keys
+
+    messages = []
+    duplicates.each do |locale, keys|
+      keys.each do |key|
+        from_text = I18n.backend.send(:lookup, from_locale, key)
+        next if from_text.blank?
+        messages << "#{locale}.#{key} (#{from_locale}.#{key}='#{from_text}')"
+      end
+    end
+      
+    if messages.present?
+      messages.each { |m| puts m }
+    else
+      puts "No duplicate keys"
+    end
+  end
+
   desc "Show untranslated keys for locale LOCALE"
   task :untranslated => :environment do
     from_locale = I18n.default_locale
@@ -42,6 +63,7 @@ namespace :translate do
     untranslated.each do |locale, keys|
       keys.each do |key|
         from_text = I18n.backend.send(:lookup, from_locale, key)
+        next if from_text.blank?
         messages << "#{locale}.#{key} (#{from_locale}.#{key}='#{from_text}')"
       end
     end

data/lib/translate.rb

@@ -2,7 +2,7 @@ require 'ya2yaml'
 
 module Translate
   class Engine < Rails::Engine
-  end if defined?(Rails) && Rails::VERSION::MAJOR == 3
+  end if defined?(Rails) && Rails::VERSION::MAJOR >= 3
 
   class << self
     # For configuring Google Translate API key

data/lib/translate/keys.rb

@@ -26,6 +26,15 @@ class Translate::Keys
     Translate::Keys.to_shallow_hash(I18n.backend.send(:translations)[locale.to_sym]).keys.sort
   end
 
+  def duplicate_keys
+    Translate::Keys.translated_locales.inject({}) do |missing, locale|
+      missing[locale] = i18n_keys(I18n.default_locale).map do |key|
+        I18n.backend.send(:lookup, locale, key) == I18n.backend.send(:lookup, I18n.default_locale, key) ? key : nil
+      end.compact
+      missing
+    end
+  end
+
   def untranslated_keys
     Translate::Keys.translated_locales.inject({}) do |missing, locale|
       missing[locale] = i18n_keys(I18n.default_locale).map do |key|

data/translate-rails3.gemspec

@@ -2,16 +2,18 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+# stub: translate-rails3 0.4.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "translate-rails3"
-  s.version = "0.2.3"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Peter Marklund", "Milan Novota", "Roman Shterenzon"]
-  s.date = "2012-01-22"
-  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 the original https://github.com/mynewsdesk/translate\nand also includes work from this fork: https://github.com/milann/translate\n"
-  s.email = "romanbsd@yahoo.com"
+  s.require_paths = ["lib"]
+  s.authors = ["Peter Marklund", "Milan Novota", "Roman Shterenzon", "Garth Smedley"]
+  s.date = "2015-01-15"
+  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"
   ]
@@ -50,13 +52,12 @@ Gem::Specification.new do |s|
     "spec/storage_spec.rb",
     "translate-rails3.gemspec"
   ]
-  s.homepage = "https://github.com/romanbsd/translate"
-  s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.15"
+  s.homepage = "https://github.com/gsmedley/translate"
+  s.rubygems_version = "2.4.3"
   s.summary = "Newsdesk translate plugin for Rails 3"
 
   if s.respond_to? :specification_version then
-    s.specification_version = 3
+    s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<ya2yaml>, ["~> 0.30"])

metadata

@@ -1,48 +1,48 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: translate-rails3
-version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.2.3
+version: !ruby/object:Gem::Version
+  version: 0.4.0
 platform: ruby
-authors: 
+authors:
 - Peter Marklund
 - Milan Novota
 - Roman Shterenzon
+- Garth Smedley
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-01-22 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2015-01-15 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: ya2yaml
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: "0.30"
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.30'
   type: :runtime
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.30'
 description: |
   This plugin provides a web interface for translating Rails I18n texts
   (requires Rails 3.0 or higher) from one locale to another.
   The plugin has been tested only with the simple I18n backend that ships
   with Rails.
   I18n texts are read from and written to YAML files under config/locales.
-  
-  This gem is a fork of the original https://github.com/mynewsdesk/translate
-  and also includes work from this fork: https://github.com/milann/translate
 
-email: romanbsd@yahoo.com
+  This gem is a fork of https://github.com/romanbsd/translate.
+  From the original https://github.com/mynewsdesk/translate
+  which also includes work from this fork: https://github.com/milann/translate
+email: gsmedley@kanayo.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.md
-files: 
+files:
 - MIT-LICENSE
 - README.md
 - Rakefile
@@ -76,32 +76,27 @@ files:
 - spec/spec_helper.rb
 - spec/storage_spec.rb
 - translate-rails3.gemspec
-homepage: https://github.com/romanbsd/translate
+homepage: https://github.com/gsmedley/translate
 licenses: []
-
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 2.4.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Newsdesk translate plugin for Rails 3
 test_files: []
-