translate-rails3-plus 0.0.4 → 0.0.5

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.5

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) {
@@ -55,41 +100,46 @@
 
     function checkErrors()
     {  
-    	var errors = [] 	
-    	$$('.translation-error').each(function(item) { 
-    		item.removeClassName("translation-error") 
-    		item.select('.error-text')[0].innerHTML = ""
-    	});
+      var errors = []   
+      $$('.translation-error').each(function(item) { 
+        item.removeClassName("translation-error") 
+        item.select('.error-text')[0].innerHTML = ""
+      });
 
-    	$$('.single-translation').each(function(item) {
+      $$('.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 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('') )
-	            {
+              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 = "Mismatched {} substitution strings."
-	            }
-	        }
+                   item.select('.error-text')[0].innerHTML = "Missing substitution strings: " + missing_subs.join(', ')
+              }
+          }
          });
-    	return errors
+      return errors
    }
 
     function testAndSave()
     {  
-    	var errors = checkErrors()
-     	
-    	if( errors.length == 0 || confirm( "Some transtalations have errors, save anyway?"))
-        {
-        	document.forms["translate_form"].submit();
-        }   	  
+      var errors = checkErrors()
+      
+      if( errors.length == 0 )
+      {
+        document.forms["translate_form"].submit();
+      }  
+      else 
+      {
+         alert( "Some transtalations have errors. Please review and correct errors before saving.")
+      }     
     }
 
     /*
@@ -162,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: 11px;
-		border-bottom:solid 1px #d46021;
+  /* 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;
+    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;
@@ -400,11 +450,11 @@
   }
   .translation-error .edit-field
   {
-  	border: 1px solid red;
+    border: 1px solid red;
   }
   .error-text
   {
-  	color: red;
+    color: red;
   }
   .big-locale
   {
@@ -412,34 +462,34 @@
     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(".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");
-			});
-		});
+  <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>
+    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>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: translate-rails3-plus
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   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: &24746952 !ruby/object:Gem::Requirement
+  requirement: &26156184 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -24,7 +24,7 @@ dependencies:
         version: '0.30'
   type: :runtime
   prerelease: false
-  version_requirements: *24746952
+  version_requirements: *26156184
 description: ! 'This plugin provides a web interface for translating Rails I18n texts
 
   (requires Rails 3.0 or higher) from one locale to another.
@@ -106,3 +106,4 @@ signing_key:
 specification_version: 3
 summary: Newsdesk translate plugin for Rails 3
 test_files: []
+has_rdoc: