lit 0.1.0 → 0.2.0

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2012 Prograils.com
+Copyright (c) 2013 Prograils.com
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -1,9 +1,9 @@
 # Lost in translation
 ### Rails i18n web interface
 
-Translate your apps with pleasure (sort of...) and for free. It's simple i18n 
-web interface, build on top of twitter bootstrap, that one may find helpful in 
-translating app by non-technicals. 
+Translate your apps with pleasure (sort of...) and for free. It's simple i18n
+web interface, build on top of twitter bootstrap, that one may find helpful in
+translating app by non-technicals.
 
 Highly inspired by Copycopter by thoughtbot.
 
@@ -15,6 +15,7 @@ Highly inspired by Copycopter by thoughtbot.
 4. Possibility to synchronize between environments or even apps
 5. Easy to install - works as an engine, comes with simple generator
 6. You can always export all translations to plain old YAML file
+7. Has build in wysiwyg editor ([jQuery TE](http://jqueryte.com/))
 
 ### Screenshots
 
@@ -30,6 +31,7 @@ gem "lit"
 2. run `bundle install`
 
 3. run installation generator `bundle exec rails g lit:install`
+  (for production/staging environment `redis` is suggested as key value engine. `hash` will not work in multi process environment)
 
 4. After doing above and restarting app, point your browser to ```http://app/lit```
 
@@ -41,17 +43,18 @@ You may want to take a look at generated initializer in `config/initializers/lit
 
 ### ToDo
 
-* ~~Versioning~~ 
+* ~~Versioning~~
 * ~~API~~
 * ~~Synchronization between environments~~
 * Rewrite initializer
 * Rewrite exporter (which is now code from copycopter)
 * ~~Support for array types (ie. `date.abbr_day_names`)~~
 * ~~Generator~~
-* Support for wysiwyg
+* ~~Support for wysiwyg~~
 * Better cache
 * ~~Support for other key value providers (ie. Redis does not support Array types in easy way)~~ (not applicable, as array storage works now with redis).
 * Integration with ActiveAdmin
+* Support for Proc defaults (like in `I18n.t("not_exising_keys", :default=> lambda{|_, options| "text"})` )
 
 
 ### License

data/app/assets/javascripts/lit/application.js

@@ -18,4 +18,5 @@
 
 $(document).ready(function(){
   $('.title').tooltip();
+
 });

data/app/assets/javascripts/lit/jquery-te-1.4.0.min.js

@@ -0,0 +1,9 @@
+/*!
+ *
+ * jQuery TE 1.4.0 , http://jqueryte.com/
+ * Copyright (C) 2013, Fatih Koca (fattih@fattih.com), (http://jqueryte.com/about)
+
+ * jQuery TE is provided under the MIT LICENSE.
+ *
+*/
+(function(e){e.fn.jqte=function(t){function l(e,t,n,r,i){var s=f.length+1;return f.push({name:e,cls:s,command:t,key:n,tag:r,emphasis:i})}var n=[{title:"Text Format"},{title:"Font Size"},{title:"Color"},{title:"Bold",hotkey:"B"},{title:"Italic",hotkey:"I"},{title:"Underline",hotkey:"U"},{title:"Ordered List",hotkey:"."},{title:"Unordered List",hotkey:","},{title:"Subscript",hotkey:"down arrow"},{title:"Superscript",hotkey:"up arrow"},{title:"Outdent",hotkey:"left arrow"},{title:"Indent",hotkey:"right arrow"},{title:"Justify Left"},{title:"Justify Center"},{title:"Justify Right"},{title:"Strike Through",hotkey:"K"},{title:"Add Link",hotkey:"L"},{title:"Remove Link"},{title:"Cleaner Style",hotkey:"Delete"},{title:"Horizontal Rule",hotkey:"H"},{title:"Source"}];var r=[["p","Normal"],["h1","Header 1"],["h2","Header 2"],["h3","Header 3"],["h4","Header 4"],["h5","Header 5"],["h6","Header 6"],["pre","Preformatted"]];var i=["10","12","16","18","20","24","28"];var s=["0,0,0","68,68,68","102,102,102","153,153,153","204,204,204","238,238,238","243,243,243","255,255,255",null,"255,0,0","255,153,0","255,255,0","0,255,0","0,255,255","0,0,255","153,0,255","255,0,255",null,"244,204,204","252,229,205","255,242,204","217,234,211","208,224,227","207,226,243","217,210,233","234,209,220","234,153,153","249,203,156","255,229,153","182,215,168","162,196,201","159,197,232","180,167,214","213,166,189","224,102,102","246,178,107","255,217,102","147,196,125","118,165,175","111,168,220","142,124,195","194,123,160","204,0,0","230,145,56","241,194,50","106,168,79","69,129,142","61,133,198","103,78,167","166,77,121","153,0,0","180,95,6","191,144,0","56,118,29","19,79,92","11,83,148","53,28,117","116,27,71","102,0,0","120,63,4","127,96,0","39,78,19","12,52,61","7,55,99","32,18,77","76,17,48"];var o=["Web Address","E-mail Address","Picture URL"];var u=e.extend({status:true,css:"jqte",title:true,titletext:n,button:"OK",format:true,formats:r,fsize:true,fsizes:i,funit:"px",color:true,linktypes:o,b:true,i:true,u:true,ol:true,ul:true,sub:true,sup:true,outdent:true,indent:true,left:true,center:true,right:true,strike:true,link:true,unlink:true,remove:true,rule:true,source:true,placeholder:false,br:true,p:true,change:"",focus:"",blur:""},t);e.fn.jqteVal=function(t){e(this).closest("."+u.css).find("."+u.css+"_editor").html(t)};var a=navigator.userAgent.toLowerCase();if(/msie [1-7]./.test(a))u.title=false;var f=[];l("format","formats","","",false);l("fsize","fSize","","",false);l("color","colors","","",false);l("b","Bold","B",["b","strong"],true);l("i","Italic","I",["i","em"],true);l("u","Underline","U",["u"],true);l("ol","insertorderedlist","¾",["ol"],true);l("ul","insertunorderedlist","¼",["ul"],true);l("sub","subscript","(",["sub"],true);l("sup","superscript","&",["sup"],true);l("outdent","outdent","%",["blockquote"],false);l("indent","indent","'",["blockquote"],true);l("left","justifyLeft","","",false);l("center","justifyCenter","","",false);l("right","justifyRight","","",false);l("strike","strikeThrough","K",["strike"],true);l("link","linkcreator","L",["a"],true);l("unlink","unlink","",["a"],false);l("remove","removeformat",".","",false);l("rule","inserthorizontalrule","H",["hr"],false);l("source","displaysource","","",false);return this.each(function(){function B(){if(window.getSelection)return window.getSelection();else if(document.selection&&document.selection.createRange&&document.selection.type!="None")return document.selection.createRange()}function j(e,t){var n,r=B();if(window.getSelection){if(r.anchorNode&&r.getRangeAt)n=r.getRangeAt(0);if(n){r.removeAllRanges();r.addRange(n)}if(!a.match(/msie/))document.execCommand("StyleWithCSS",false,false);document.execCommand(e,false,t)}else if(document.selection&&document.selection.createRange&&document.selection.type!="None"){n=document.selection.createRange();n.execCommand(e,false,t)}q(false,false)}function F(t,n,r){if(v.not(":focus"))v.focus();if(window.getSelection){var i=B(),s,o,u;if(i.anchorNode&&i.getRangeAt){s=i.getRangeAt(0);o=document.createElement(t);e(o).attr(n,r);u=s.extractContents();o.appendChild(u);s.insertNode(o);i.removeAllRanges();if(n=="style")q(e(o),r);else q(e(o),false)}}else if(document.selection&&document.selection.createRange&&document.selection.type!="None"){var a=document.selection.createRange();var f=a.htmlText;var l="<"+t+" "+n+'="'+r+'">'+f+"</"+t+">";document.selection.createRange().pasteHTML(l)}}function q(e,t){var n=I();n=n?n:e;if(n&&t==false){if(n.parent().is("[style]"))n.attr("style",n.parent().attr("style"));if(n.is("[style]"))n.find("*").attr("style",n.attr("style"))}else if(e&&t&&e.is("[style]")){var r=t.split(";");r=r[0].split(":");if(e.is("[style*="+r[0]+"]"))e.find("*").css(r[0],r[1]);R(e)}}function R(t){if(t){var t=t[0];if(document.body.createTextRange){var n=document.body.createTextRange();n.moveToElementText(t);n.select()}else if(window.getSelection){var r=window.getSelection();var n=document.createRange();if(t!="undefined"&&t!=null){n.selectNodeContents(t);r.removeAllRanges();r.addRange(n);if(e(t).is(":empty")){e(t).append(" ");R(e(t))}}}}}function U(){if(!p.data("sourceOpened")){var t=I();var n="http://";W(true);if(t){var r=t.prop("tagName").toLowerCase();if(r=="a"&&t.is("[href]")){n=t.attr("href");t.attr(S,"")}else F("a",S,"")}else y.val(n).focus();g.click(function(t){if(e(t.target).hasClass(u.css+"_linktypetext")||e(t.target).hasClass(u.css+"_linktypearrow"))X(true)});w.find("a").click(function(){var t=e(this).attr(u.css+"-linktype");w.data("linktype",t);E.find("."+u.css+"_linktypetext").html(w.find("a:eq("+w.data("linktype")+")").text());V(n);X()});V(n);y.focus().val(n).bind("keypress keyup",function(e){if(e.keyCode==13){z(h.find("["+S+"]"));return false}});b.click(function(){z(h.find("["+S+"]"))})}else W(false)}function z(t){y.focus();R(t);t.removeAttr(S);if(w.data("linktype")!="2")j("createlink",y.val());else{j("insertImage",y.val());v.find("img").each(function(){var t=e(this).prev("a");var n=e(this).next("a");if(t.length>0&&t.html()=="")t.remove();else if(n.length>0&&n.html()=="")n.remove()})}W();v.trigger("change")}function W(e){Q("["+S+"]:not([href])");h.find("["+S+"][href]").removeAttr(S);if(e){p.data("linkOpened",true);d.show()}else{p.data("linkOpened",false);d.hide()}X()}function X(e){if(e)w.show();else w.hide()}function V(e){var t=w.data("linktype");if(t=="1"&&(y.val()=="http://"||y.is("[value^=http://]")||!y.is("[value^=mailto]")))y.val("mailto:");else if(t!="1"&&!y.is("[value^=http://]"))y.val("http://");else y.val(e)}function J(t){if(!p.data("sourceOpened")){if(t=="fSize")styleField=P;else if(t=="colors")styleField=H;K(styleField,true);styleField.find("a").unbind("click").click(function(){var n=e(this).attr(u.css+"-styleval");if(t=="fSize"){styleType="font-size";n=n+u.funit}else if(t=="colors"){styleType="color";n="rgb("+n+")"}var r=G(styleType);F("span","style",styleType+":"+n+";"+r);K("",false);e("."+u.css+"_title").remove();v.trigger("change")})}else K(styleField,false);W(false)}function K(e,t){var n="",r=[{d:"fsizeOpened",f:P},{d:"cpallOpened",f:H}];if(e!=""){for(var i=0;i<r.length;i++){if(e==r[i]["f"])n=r[i]}}if(t){p.data(n["d"],true);n["f"].slideDown(100);for(var i=0;i<r.length;i++){if(n["d"]!=r[i]["d"]){p.data(r[i]["d"],false);r[i]["f"].slideUp(100)}}}else{for(var i=0;i<r.length;i++){p.data(r[i]["d"],false);r[i]["f"].slideUp(100)}}}function Q(t){h.find(t).each(function(){e(this).before(e(this).html()).remove()})}function G(e){var t=I();if(t&&t.is("[style]")&&t.css(e)!=""){var n=t.css(e);t.css(e,"");var r=t.attr("style");t.css(e,n);return r}else return""}function Y(){Z(true);D.find("a").click(function(){e("*",this).click(function(e){e.preventDefault();return false});et(e(this).text());var t=e(this).attr(u.css+"-formatval");j("formatBlock","<"+t+">");Z(false)})}function Z(e){var t=e?true:false;t=e&&D.data("status")?true:false;if(t||!e)D.data("status",false).slideUp(200);else D.data("status",true).slideDown(200)}function et(e){var t=D.closest("."+u.css+"_tool").find("."+u.css+"_tool_label").find("."+u.css+"_tool_text");if(e.length>10)e=e.substr(0,7)+"...";t.html(e)}function tt(e){var t,n,r;t=e.replace(/\n/gim,"").replace(/\r/gim,"").replace(/\t/gim,"").replace(/ /gim," ");n=[/\<span(|\s+.*?)><span(|\s+.*?)>(.*?)<\/span><\/span>/gim,/<(\w*[^p])\s*[^\/>]*>\s*<\/\1>/gim,/\<div(|\s+.*?)>(.*?)\<\/div>/gim,/\<strong(|\s+.*?)>(.*?)\<\/strong>/gim,/\<em(|\s+.*?)>(.*?)\<\/em>/gim];r=["<span$2>$3</span>","","<p$1>$2</p>","<b$1>$2</b>","<i$1>$2</i>"];for(A=0;A<5;A++){for(var i=0;i<n.length;i++){t=t.replace(n[i],r[i])}}if(!u.p)t=t.replace(/\<p(|\s+.*?)>(.*?)\<\/p>/ig,"<br/>$2");if(!u.br){n=[/\<br>(.*?)/ig,/\<br\/>(.*?)/ig];r=["<p>$1</p>","<p>$1</p>"];for(var i=0;i<n.length;i++){t=t.replace(n[i],r[i])}}if(!u.p&&!u.br)t=t.replace(/\<p>(.*?)\<\/p>/ig,"<div>$1</div>");return t}function nt(){var e=v.text()==""&&v.html().length<12?"":v.html();l.val(tt(e))}function rt(){v.html(tt(l.val()))}function it(t){var n=false,r=I(),i;if(r){e.each(t,function(t,s){i=r.prop("tagName").toLowerCase();if(i==s)n=true;else{r.parents().each(function(){i=e(this).prop("tagName").toLowerCase();if(i==s)n=true})}});return n}else return false}function st(t){for(var n=0;n<f.length;n++){if(u[f[n].name]&&f[n].emphasis&&f[n].tag!="")it(f[n].tag)?p.find("."+u.css+"_tool_"+f[n].cls).addClass(m):e("."+u.css+"_tool_"+f[n].cls).removeClass(m)}if(u.format&&e.isArray(u.formats)){var r=false;for(var i=0;i<u.formats.length;i++){var s=[];s[0]=u.formats[i][0];if(u.formats[i][0].length>0&&it(s)){et(u.formats[i][1]);r=true;break}}if(!r)et(u.formats[0][1])}K("",false);Z(false)}if(!e(this).data("jqte")||e(this).data("jqte")==null||e(this).data("jqte")=="undefined")e(this).data("jqte",true);else e(this).data("jqte",false);if(!u.status||!e(this).data("jqte")){if(e(this).closest("."+u.css).length>0){var t=e(this).closest("."+u.css).find("."+u.css+"_editor").html();var n="";e(e(this)[0].attributes).each(function(){if(this.nodeName!="style")n=n+" "+this.nodeName+'="'+this.nodeValue+'"'});var r=e(this).is("[data-origin]")&&e(this).attr("data-origin")!=""?e(this).attr("data-origin"):"textarea";var i=">"+t;if(r=="input"||r=="option"){t=t.replace(/"/g,"&#34;").replace(/'/g,"&#39;").replace(/</g,"<").replace(/>/g,">");i='value="'+t+'">'}var o=e(this).clone();e(this).data("jqte",false).closest("."+u.css).before(o).remove();o.replaceWith("<"+r+n+i+"</"+r+">")}return}var l=e(this);var r=e(this).prop("tagName").toLowerCase();e(this).attr("data-origin",r);var c=e(this).is("[value]")||r=="textarea"?e(this).val():e(this).html();c=c.replace(/&#34;/g,'"').replace(/&#39;/g,"'").replace(/</g,"<").replace(/>/g,">").replace(/&/g,"&");e(this).after('<div class="'+u.css+'"></div>');var h=e(this).next("."+u.css);h.html('<div class="'+u.css+"_toolbar"+'" role="toolbar" unselectable></div><div class="'+u.css+'_linkform" style="display:none" role="dialog"></div><div class="'+u.css+"_editor"+'"></div>');var p=h.find("."+u.css+"_toolbar");var d=h.find("."+u.css+"_linkform");var v=h.find("."+u.css+"_editor");var m=u.css+"_tool_depressed";d.append('<div class="'+u.css+'_linktypeselect" unselectable></div><input class="'+u.css+'_linkinput" type="text/css" value=""><div class="'+u.css+'_linkbutton" unselectable>'+u.button+'</div> <div style="height:1px;float:none;clear:both"></div>');var g=d.find("."+u.css+"_linktypeselect");var y=d.find("."+u.css+"_linkinput");var b=d.find("."+u.css+"_linkbutton");g.append('<div class="'+u.css+'_linktypeview" unselectable></div><div class="'+u.css+'_linktypes" role="menu" unselectable></div>');var w=g.find("."+u.css+"_linktypes");var E=g.find("."+u.css+"_linktypeview");var S=u.css+"-setlink";v.after('<div class="'+u.css+"_source "+u.css+'_hiddenField"></div>');var x=h.find("."+u.css+"_source");l.appendTo(x);if(r!="textarea"){var n="";e(l[0].attributes).each(function(){if(this.nodeName!="type"&&this.nodeName!="value")n=n+" "+this.nodeName+'="'+this.nodeValue+'"'});l.replaceWith("<textarea "+n+">"+c+"</textarea>");l=x.find("textarea")}v.attr("contenteditable","true").html(c);for(var T=0;T<f.length;T++){if(u[f[T].name]){var N=f[T].key.length>0?u.titletext[T].hotkey!=null&&u.titletext[T].hotkey!="undefined"&&u.titletext[T].hotkey!=""?" (Ctrl+"+u.titletext[T].hotkey+")":"":"";var C=u.titletext[T].title!=null&&u.titletext[T].title!="undefined"&&u.titletext[T].title!=""?u.titletext[T].title+N:"";p.append('<div class="'+u.css+"_tool "+u.css+"_tool_"+f[T].cls+'" role="button" data-tool="'+T+'" unselectable><a class="'+u.css+'_tool_icon" unselectable></a></div>');p.find("."+u.css+"_tool[data-tool="+T+"]").data({tag:f[T].tag,command:f[T].command,emphasis:f[T].emphasis,title:C});if(f[T].name=="format"&&e.isArray(u.formats)){var k=u.formats[0][1].length>0&&u.formats[0][1]!="undefined"?u.formats[0][1]:"";p.find("."+u.css+"_tool_"+f[T].cls).find("."+u.css+"_tool_icon").replaceWith('<a class="'+u.css+'_tool_label" unselectable><span class="'+u.css+'_tool_text" unselectable>'+k+'</span><span class="'+u.css+'_tool_icon" unselectable></span></a>');p.find("."+u.css+"_tool_"+f[T].cls).append('<div class="'+u.css+'_formats" unselectable></div>');for(var L=0;L<u.formats.length;L++){p.find("."+u.css+"_formats").append("<a "+u.css+'-formatval="'+u.formats[L][0]+'" class="'+u.css+"_format"+" "+u.css+"_format_"+L+'" role="menuitem" unselectable>'+u.formats[L][1]+"</a>")}p.find("."+u.css+"_formats").data("status",false)}else if(f[T].name=="fsize"&&e.isArray(u.fsizes)){p.find("."+u.css+"_tool_"+f[T].cls).append('<div class="'+u.css+'_fontsizes" unselectable></div>');for(var L=0;L<u.fsizes.length;L++){p.find("."+u.css+"_fontsizes").append("<a "+u.css+'-styleval="'+u.fsizes[L]+'" class="'+u.css+"_fontsize"+'" style="font-size:'+u.fsizes[L]+u.funit+'" role="menuitem" unselectable>Abcdefgh...</a>')}}else if(f[T].name=="color"&&e.isArray(s)){p.find("."+u.css+"_tool_"+f[T].cls).append('<div class="'+u.css+'_cpalette" unselectable></div>');for(var A=0;A<s.length;A++){if(s[A]!=null)p.find("."+u.css+"_cpalette").append("<a "+u.css+'-styleval="'+s[A]+'" class="'+u.css+"_color"+'" style="background-color: rgb('+s[A]+')" role="gridcell" unselectable></a>');else p.find("."+u.css+"_cpalette").append('<div class="'+u.css+"_colorSeperator"+'"></div>')}}}}w.data("linktype","0");for(var T=0;T<3;T++){w.append("<a "+u.css+'-linktype="'+T+'" unselectable>'+u.linktypes[T]+"</a>");E.html('<div class="'+u.css+'_linktypearrow" unselectable></div><div class="'+u.css+'_linktypetext">'+w.find("a:eq("+w.data("linktype")+")").text()+"</div>")}var O="";if(/msie/.test(a))O="-ms-";else if(/chrome/.test(a)||/safari/.test(a)||/yandex/.test(a))O="-webkit-";else if(/mozilla/.test(a))O="-moz-";else if(/opera/.test(a))O="-o-";else if(/konqueror/.test(a))O="-khtml-";else O="";if(u.placeholder&&u.placeholder!=""){h.prepend('<div class="'+u.css+'_placeholder" unselectable><div class="'+u.css+'_placeholder_text">'+u.placeholder+"</div></div>");var M=h.find("."+u.css+"_placeholder");M.click(function(){v.focus()})}h.find("[unselectable]").css(O+"user-select","none").addClass("unselectable").attr("unselectable","on").on("selectstart mousedown",false);var _=p.find("."+u.css+"_tool");var D=p.find("."+u.css+"_formats");var P=p.find("."+u.css+"_fontsizes");var H=p.find("."+u.css+"_cpalette");var I=function(){var t,n;if(window.getSelection){n=getSelection();t=n.anchorNode}if(!t&&document.selection&&document.selection.createRange&&document.selection.type!="None"){n=document.selection;var r=n.getRangeAt?n.getRangeAt(0):n.createRange();t=r.commonAncestorContainer?r.commonAncestorContainer:r.parentElement?r.parentElement():r.item(0)}if(t){return t.nodeName=="#text"?e(t.parentNode):e(t)}else return false};_.unbind("click").click(function(t){if(e(this).data("command")=="displaysource"&&!p.data("sourceOpened")){p.find("."+u.css+"_tool").addClass(u.css+"_hiddenField");e(this).removeClass(u.css+"_hiddenField");p.data("sourceOpened",true);l.css("height",v.outerHeight());x.removeClass(u.css+"_hiddenField");v.addClass(u.css+"_hiddenField");l.focus();W(false);K("",false);Z();if(u.placeholder&&u.placeholder!="")M.hide()}else{if(!p.data("sourceOpened")){if(e(this).data("command")=="linkcreator"){if(!p.data("linkOpened"))U();else{W(false);Z(false)}}else if(e(this).data("command")=="formats"){if(e(this).data("command")=="formats"&&!e(t.target).hasClass(u.css+"_format"))Y();K("",false);if(v.not(":focus"))v.focus()}else if(e(this).data("command")=="fSize"||e(this).data("command")=="colors"){if(e(this).data("command")=="fSize"&&!e(t.target).hasClass(u.css+"_fontsize")||e(this).data("command")=="colors"&&!e(t.target).hasClass(u.css+"_color"))J(e(this).data("command"));Z(false);if(v.not(":focus"))v.focus()}else{if(v.not(":focus"))v.focus();j(e(this).data("command"),null);K("",false);Z(false);X();e(this).data("emphasis")==true&&!e(this).hasClass(m)?e(this).addClass(m):e(this).removeClass(m);x.addClass(u.css+"_hiddenField");v.removeClass(u.css+"_hiddenField")}}else{p.data("sourceOpened",false);p.find("."+u.css+"_tool").removeClass(u.css+"_hiddenField");x.addClass(u.css+"_hiddenField");v.removeClass(u.css+"_hiddenField")}if(u.placeholder&&u.placeholder!="")v.html()!=""?M.hide():M.show()}v.trigger("change")}).hover(function(t){if(u.title&&e(this).data("title")!=""&&(e(t.target).hasClass(u.css+"_tool")||e(t.target).hasClass(u.css+"_tool_icon"))){e("."+u.css+"_title").remove();h.append('<div class="'+u.css+'_title"><div class="'+u.css+'_titleArrow"><div class="'+u.css+'_titleArrowIcon"></div></div><div class="'+u.css+'_titleText">'+e(this).data("title")+"</div></div>");var n=e("."+u.css+"_title:first");var r=n.find("."+u.css+"_titleArrowIcon");var i=e(this).position();var s=i.left+e(this).outerWidth()-n.outerWidth()/2-e(this).outerWidth()/2;var o=i.top+e(this).outerHeight()+5;n.delay(400).css({top:o,left:s}).fadeIn(200)}},function(){e("."+u.css+"_title").remove()});var ot=null;v.bind("keypress keyup keydown drop cut copy paste DOMCharacterDataModified DOMSubtreeModified",function(){if(!p.data("sourceOpened"))e(this).trigger("change");X();if(e.isFunction(u.change))u.change();if(u.placeholder&&u.placeholder!="")e(this).text()!=""?M.hide():M.show()}).bind("change",function(){if(!p.data("sourceOpened")){clearTimeout(ot);ot=setTimeout(nt,10)}}).keydown(function(e){if(e.ctrlKey){for(var t=0;t<f.length;t++){if(u[f[t].name]&&e.keyCode==f[t].key.charCodeAt(0)){if(f[t].command!=""&&f[t].command!="linkcreator")j(f[t].command,null);else if(f[t].command=="linkcreator")U();return false}}}}).bind("mouseup keyup",st).focus(function(){if(e.isFunction(u.focus))u.focus();h.addClass(u.css+"_focused");if(/opera/.test(a)){var t=document.createRange();t.selectNodeContents(v[0]);t.collapse(false);var n=window.getSelection();n.removeAllRanges();n.addRange(t)}}).focusout(function(){_.removeClass(m);K("",false);Z(false);X();if(e.isFunction(u.blur))u.blur();h.removeClass(u.css+"_focused");if(e.isArray(u.formats))et(u.formats[0][1])});l.bind("keydown keyup",function(){setTimeout(rt,0);e(this).height(e(this)[0].scrollHeight);if(e(this).val()=="")e(this).height(0)}).focus(function(){h.addClass(u.css+"_focused")}).focusout(function(){h.removeClass(u.css+"_focused")})})}})(jQuery)

data/app/assets/javascripts/lit/localizations.js.coffee

@@ -2,10 +2,11 @@
 $(document).ready ->
   $('td.localization_row[data-editing=0]').on 'click', ->
     $this = $(this)
-    edited_rows[$this.data('id')] = $this.html()
-    unless parseInt($this.data('editing'))
-      $this.data('editing', '1')
-      $.get $this.data('edit')
+    if parseInt($this.data('editing'))==0
+      edited_rows[$this.data('id')] = $this.html()
+      unless parseInt($this.data('editing'))
+        $this.data('editing', '1')
+        $.get $this.data('edit')
   $('td.localization_row').on 'click', 'form button.cancel', (e)->
     $this = $(this)
     if $this[0].localName=='button'
@@ -19,3 +20,5 @@ $(document).ready ->
     $parent = $this.parents('tr.localization_versions_row')
     $parent.addClass('hidden')
     $parent.children('td').html('')
+  $('tr.localization_key_row').on 'click', 'input.wysiwyg_switch', (e)->
+    $(this).parents('form').find("textarea").jqte()

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

@@ -9,6 +9,7 @@
  * compiled file, but it's generally better to create a new file per style scope.
  *
  *= require './bootstrap_and_overrides.css'
+ *= require './jquery-te-1.4.0.css'
  *= require_self
  */
 .detail_wrapper{

data/app/assets/stylesheets/lit/jquery-te-1.4.0.css.scss

@@ -0,0 +1,457 @@
+/*!
+ *
+ * jQuery TE 1.4.0 , http://jqueryte.com/
+ * Copyright (C) 2013, Fatih Koca (fattih@fattih.com), (http://jqueryte.com/about)
+
+ * jQuery TE is provided under the MIT LICENSE.
+ *
+*/
+
+/* editor's general field */
+.jqte {
+	/*margin:30px 0;
+	border:#000 1px solid;
+	border-radius:5px; -webkit-border-radius:5px; -moz-border-radius:5px;
+	box-shadow:0 0 3px #999; -webkit-box-shadow:0 0 3px #999; -moz-box-shadow:0 0 3px #999;
+	overflow:hidden;
+	transition:box-shadow 0.4s, border 0.4s; -webkit-transition:-webkit-box-shadow 0.4s, border 0.4s; -moz-transition:-moz-box-shadow 0.4s, border 0.4s; -o-transition:-o-box-shadow 0.4s, border 0.4s;
+}
+.jqte * {
+	color:#333;
+	font-family:Arial, Helvetica, sans-serif;
+	font-size:14px;
+}
+.jqte_focused {
+	border-color:#00AAE7;
+	box-shadow:0 0 10px #00BDFF; -webkit-box-shadow:0 0 10px #00BDFF; -moz-box-shadow:0 0 10px #00BDFF;
+}
+/* toolbar */
+.jqte_toolbar {
+	overflow:auto;
+	padding:3px 4px;
+	background:#EEE;
+	border-bottom:#BBB 1px solid;
+}
+.jqte_tool {
+	float:left;
+	margin:0;
+	padding:0;
+	cursor:pointer;
+}
+.jqte_tool, .jqte_tool_icon, .jqte_tool_label {
+	border:#EEE 1px solid;
+	border-radius:3px; -webkit-border-radius:3px; -moz-border-radius:3px
+}
+.jqte_hiddenField {
+	display:none
+}
+.jqte_tool_icon {
+	display:block;
+	width:22px;
+	height:22px;
+	background:image-url('lit/jquery-te.png') no-repeat
+}
+.jqte_tool.jqte_tool_1 .jqte_tool_label {
+	position:relative;
+	display:block;
+	padding:3px;
+	width:70px;
+	height:16px;
+	overflow:hidden;
+}
+.jqte_tool.jqte_tool_1 .jqte_tool_text {
+	font:bold 13px Arial,sans-serif;
+	color:#222;
+}
+.jqte_tool.jqte_tool_1 .jqte_tool_icon {
+	position:absolute;
+	top:10px;
+	right:2px;
+	width:6px;
+	height:4px;
+	background-position:-19px -23px;
+	border:none;
+	border-radius:none; -webkit-border-radius:none; -moz-border-radius:none
+}
+.jqte_tool.jqte_tool_2 .jqte_tool_icon {
+	background-position:0 0
+}
+.jqte_tool.jqte_tool_3 .jqte_tool_icon {
+	background-position:-22px 0
+}
+.jqte_tool.jqte_tool_4 .jqte_tool_icon {
+	background-position:-44px 0
+}
+.jqte_tool.jqte_tool_5 .jqte_tool_icon {
+	background-position:-66px 0
+}
+.jqte_tool.jqte_tool_6 .jqte_tool_icon {
+	background-position:-88px 0
+}
+.jqte_tool.jqte_tool_7 .jqte_tool_icon {
+	background-position:-110px 0
+}
+.jqte_tool.jqte_tool_8 .jqte_tool_icon {
+	background-position:-132px 0
+}
+.jqte_tool.jqte_tool_9 .jqte_tool_icon {
+	background-position:-154px 0
+}
+.jqte_tool.jqte_tool_10 .jqte_tool_icon {
+	background-position:-176px 0
+}
+.jqte_tool.jqte_tool_11 .jqte_tool_icon {
+	background-position:-198px 0
+}
+.jqte_tool.jqte_tool_12 .jqte_tool_icon {
+	background-position:-220px 0
+}
+.jqte_tool.jqte_tool_13 .jqte_tool_icon {
+	background-position:-242px 0
+}
+.jqte_tool.jqte_tool_14 .jqte_tool_icon {
+	background-position:-264px 0
+}
+.jqte_tool.jqte_tool_15 .jqte_tool_icon {
+	background-position:-286px 0
+}
+.jqte_tool.jqte_tool_16 .jqte_tool_icon {
+	background-position:-308px 0
+}
+.jqte_tool.jqte_tool_17 .jqte_tool_icon {
+	background-position:-330px 0
+}
+.jqte_tool.jqte_tool_18 .jqte_tool_icon {
+	background-position:-352px 0
+}
+.jqte_tool.jqte_tool_19 .jqte_tool_icon {
+	background-position:-374px 0
+}
+.jqte_tool.jqte_tool_20 .jqte_tool_icon {
+	background-position:-396px 0
+}
+.jqte_tool.jqte_tool_21 .jqte_tool_icon {
+	background-position:-418px 0
+}
+.jqte_tool:hover {
+	background-color:#FFF;
+	border-color:#FFF
+}
+.jqte_tool:hover .jqte_tool_icon, .jqte_tool:hover .jqte_tool_label {
+	border:#AAA 1px solid
+}
+.jqte_tool:active .jqte_tool_icon, .jqte_tool:active .jqte_tool_label {
+	border:#777 1px solid
+}
+.jqte_tool.jqte_tool_1:hover .jqte_tool_icon, .jqte_tool.jqte_tool_1:active .jqte_tool_icon {
+	border:none
+}
+.jqte_tool_depressed {
+	background-color:#DDD;
+	border-color:#CCC
+}
+.jqte_tool_depressed .jqte_tool_icon {
+	border-color:#AAA
+}
+.jqte_tool_depressed:hover {
+	background-color:#EEE
+}
+/* link form area */
+.jqte_linkform {
+	padding:5px 10px;
+	background:#DDD;
+	border-bottom:#BBB 1px solid;
+}
+.jqte_linktypeselect {
+	position:relative;
+	float:left;
+	width:130px;
+	background:#EEE;
+	cursor:pointer
+}
+.jqte_linktypeselect:Active {
+	background:#FFF
+}
+.jqte_linktypeview {
+	padding:3px 5px;
+	border:#333 1px solid;
+	color:#777;
+	border-radius:3px; -webkit-border-radius:3px; -moz-border-radius:3px;
+	outline:none
+}
+.jqte_linktypetext {
+	font-size:12px;
+}
+.jqte_linktypearrow {
+	position:absolute;
+	bottom:8px; right:6px;
+	width:7px;
+	height:6px;
+	margin:0 auto;
+	background:image-url('lit/jquery-te.png') -7px -23px no-repeat;
+}
+.jqte_linktypes {
+	display:none;
+	position:absolute;
+	top:22px; left:1px;
+	width:125px;
+	background:#FFF;
+	border:#333 1px solid;
+	box-shadow:0 1px 4px #AAA; -webkit-box-shadow:0 1px 4px #AAA; -moz-box-shadow:0 1px 4px #AAA
+}
+.jqte_linktypes a {
+	display:block;
+	padding:4px 5px;
+	font-size:12px;
+}
+.jqte_linktypes a:hover {
+	background:#DDD
+}
+.jqte_linkinput {
+	float:left;
+	margin:0 5px;
+	padding:3px 5px;
+	width:300px;
+	background:#EEE;
+	border:#333 1px solid;
+	color:#777;
+	font-size:12px;
+	border-radius:3px; -webkit-border-radius:3px; -moz-border-radius:3px;
+	outline:none;
+}
+.jqte_linkinput:focus, .jqte_linkinput:hover {
+	background:#FFF;
+	border-color:#000;
+}
+.jqte_linkbutton {
+	float:left;
+	padding:3px 12px;
+	background:#AAA;
+	border:#333 1px solid;
+	color:#FFF;
+	font-size:12px;
+	font-weight:bold;
+	cursor:pointer;
+	border-radius:3px; -webkit-border-radius:3px; -moz-border-radius:3px;
+	box-shadow:inset 0 1px #EEE; -webkit-box-shadow:inset 0 1px #EEE; -moz-box-shadow:inset 0 1px #EEE;
+}
+.jqte_linkbutton:hover {
+	background:#A1A1A1
+}
+.jqte_linkbutton:active {
+	box-shadow:inset 0 1px #CCC; -webkit-box-shadow:inset 0 1px #CCC; -moz-box-shadow:inset 0 1px #CCC;
+	background:#888;
+}
+
+/* text format menu */
+.jqte_formats {
+	display:none;
+	position:absolute;
+	width:180px;
+	oveflow-x:hidden;
+	overflow-y:auto;
+	background:#FFF;
+	border:#AAA 1px solid;
+	box-shadow:0 0 5px #AAA; -webkit-box-shadow:0 0 5px #AAA; -moz-box-shadow:0 0 5px #AAA;
+	z-index:100;
+}
+.jqte_format {
+	display:block;
+	padding:4px 7px;
+	font-size:13px
+}
+.jqte_format:hover {
+	background:#DDD
+}
+.jqte_format_1, .jqte_format_2, .jqte_format_3, .jqte_format_4, .jqte_format_5, .jqte_format_6 {
+	font-weight:bold
+}
+.jqte_format_1 {
+	font-size:22px
+}
+.jqte_format_2 {
+	font-size:20px
+}
+.jqte_format_3 {
+	font-size:18px
+}
+.jqte_format_4 {
+	font-size:16px
+}
+.jqte_format_5 {
+	font-size:14px
+}
+.jqte_format_6 {
+	font-size:12px
+}
+.jqte_format_7 {
+	font-family:"Courier New", Courier, monospace
+}
+
+/* font size menu */
+.jqte_fontsizes {
+	display:none;
+	position:absolute;
+	width:180px;
+	height:198px;
+	oveflow-x:hidden;
+	overflow-y:auto;
+	background:#FFF;
+	border:#AAA 1px solid;
+	box-shadow:0 0 5px #AAA; -webkit-box-shadow:0 0 5px #AAA; -moz-box-shadow:0 0 5px #AAA
+}
+.jqte_fontsize {
+	display:block;
+	padding:3px 7px;
+}
+.jqte_fontsize:hover {
+	background:#DDD
+}
+
+/* color pallette */
+.jqte_cpalette {
+	display:none;
+	position:absolute;
+	padding:6px;
+	width:144px;
+	background:#FFF;
+	border:#AAA 1px solid;
+	box-shadow:0 0 5px #AAA; -webkit-box-shadow:0 0 5px #AAA; -moz-box-shadow:0 0 5px #AAA
+}
+.jqte_color {
+	display:block;
+	float:left;
+	width:16px;
+	height:16px;
+	border:#FFF 1px solid;
+}
+.jqte_color:hover {
+	border-color:#000
+}
+.jqte_colorSeperator {
+    float:none;
+    clear:both;
+    height:7px;
+}
+
+/* editor area */
+.jqte_editor, .jqte_source {
+	padding:10px;
+	background:#FFF;
+	min-height:100px;
+	max-height:900px;
+	overflow:auto;
+	outline:none;
+	word-wrap:break-word; -ms-word-wrap:break-word;
+	resize:vertical
+}
+.jqte_editor div, .jqte_editor p {
+	margin:0 0 7px
+}
+.jqte_editor a:link, .jqte_editor a:link * {
+	color:#0066FF !important;
+	text-decoration:underline;
+}
+.jqte_editor blockquote {
+	margin-top:0;
+	margin-bottom:7px
+}
+.jqte_editor img {
+    float:left;
+	margin:0 10px 5px 0
+}
+.jqte_editor a[jqte-setlink], .jqte_editor a[jqte-setlink] * {
+	background:#3297FD !important;
+	color:#FFF !important
+}
+.jqte_editor h1, .jqte_editor h2, .jqte_editor h3, .jqte_editor h4, .jqte_editor h5, .jqte_editor h6, .jqte_editor pre {
+	display:block;
+	margin:0 0 3px;
+}
+.jqte_editor h1, .jqte_editor h1 * {
+	font-size:26px
+}
+.jqte_editor h2, .jqte_editor h2 * {
+	font-size:24px
+}
+.jqte_editor h3, .jqte_editor h3 * {
+	font-size:22px
+}
+.jqte_editor h4, .jqte_editor h4 * {
+	font-size:20px
+}
+.jqte_editor h5, .jqte_editor h5 * {
+	font-size:18px
+}
+.jqte_editor h6, .jqte_editor h6 * {
+	font-size:15px
+}
+.jqte_editor pre, .jqte_editor pre * {
+	font-family:"Courier New", Courier, monospace
+}
+
+/* source area */
+.jqte_source, .jqte_source textarea {
+	background:#FFF1E8
+}
+.jqte_source textarea {
+	margin:0 !important;
+	padding:0 !important;
+	display:block !important;
+	width:100% !important;
+	min-height:100px;
+	font-family:Courier, Arial, sans-serif !important;
+	font-weight:normal;
+	font-size:15px;
+	overflow:hidden !important;
+	outline:none;
+	resize:none;
+}
+.jqte_source textarea, .jqte_source textarea:focus {
+	css_shadow:none !important;
+	background:none !important;
+	border:none !important;
+}
+
+/* title box */
+.jqte_title {
+	display:none;
+	position:absolute;
+	z-index:9999;
+}
+.jqte_titleArrow {
+	position:relative;
+}
+.jqte_titleArrowIcon {
+	width:7px;
+	height:6px;
+	margin:0 auto;
+	background:image-url('lit/jquery-te.png') 0 -23px no-repeat;
+}
+.jqte_titleText {
+	padding:5px 7px;
+	margin-top:0;
+	min-width:5px;
+	min-height:1px;
+	max-width:400px;
+	background:#000;
+	border-radius:3px; -webkit-border-radius:3px; -moz-border-radius:3px;
+	word-wrap:break-word; -ms-word-wrap:break-word
+}
+.jqte_titleText, .jqte_titleText * {
+	color:#FFF;
+	font-size:11px
+}
+
+/* placeholder */
+.jqte_placeholder {
+	position:relative;
+	display:none;
+}
+.jqte_placeholder_text {
+	position:absolute;
+	top:43px;
+	left:10px;
+	font-size:14px;
+	color:#CCC;
+}

data/app/controllers/lit/localization_keys_controller.rb

@@ -36,16 +36,12 @@ module Lit
       def get_localization_scope
         @search_options = params.slice(*valid_keys)
         @search_options[:include_completed] = '1' if @search_options.empty?
-        @scope = LocalizationKey.uniq.search(@search_options)
+        @scope = LocalizationKey.uniq.preload(:localizations => :locale).search(@search_options)
       end
 
       def get_localization_keys
-        key_parts = if @search_options[:key_prefix].present?
-                       key_parts = @search_options[:key_prefix].split('.').length
-                      else
-                       0
-                      end
-        @prefixes = @scope.uniq.pluck(:localization_key).map{|lk| lk.split('.').shift(key_parts+1).join('.') }.uniq.sort
+        key_parts = @search_options[:key_prefix].to_s.split('.').length
+        @prefixes = @scope.reorder(nil).uniq.pluck(:localization_key).map{|lk| lk.split('.').shift(key_parts+1).join('.') }.uniq.sort
         if @search_options[:key_prefix].present?
           parts = @search_options[:key_prefix].split('.')
           @parent_prefix = parts[0,parts.length-1].join('.')
@@ -58,8 +54,51 @@ module Lit
       end
 
       def valid_keys
-        %w( key include_completed key_prefix )
+        %w( key include_completed key_prefix order )
       end
 
+      def grouped_localizations
+        @_grouped_localizations ||= begin
+          {}.tap do |hash|
+            @localization_keys.each do |lk|
+              hash[lk] = {}
+              lk.localizations.each do |l|
+                hash[lk][l.locale.locale.to_sym] = l
+              end
+            end
+          end
+        end
+      end
+
+      def localization_for(locale, localization_key)
+        @_localization_for ||= {}
+        key = [locale, localization_key]
+        ret = @_localization_for[key]
+        if ret == false
+          nil
+        elsif ret.nil?
+          ret = grouped_localizations[localization_key][locale]
+          unless ret
+            Lit.init.cache.refresh_key("#{locale}.#{localization_key.localization_key}")
+            ret = localization_key.localizations.where(:locale_id=>Lit.init.cache.find_locale(locale).id).first
+          end
+          @_localization_for[key] = ret ? ret : false
+        else
+          ret
+        end
+
+      end
+
+      helper_method :localization_for
+
+      def has_versions?(localization)
+        @_versions ||= begin
+          ids = grouped_localizations.values.map(&:values).flatten.map(&:id)
+          Lit::Localization.where(:id => ids).joins(:versions).group("#{Lit::Localization.quoted_table_name}.id").count
+        end
+        @_versions[localization.id].to_i > 0
+      end
+
+      helper_method :has_versions?
   end
 end

data/app/models/lit/localization_key.rb

@@ -52,8 +52,24 @@ module Lit
       mark_completed!
     end
 
+    def self.order_options
+      ["localization_key asc", "localization_key desc", "created_at asc", "created_at desc"]
+    end
+
+    # it can be overridden in parent application, for example: {:order => "created_at desc"}
+    def self.default_search_options
+      {}
+    end
+
     def self.search(options={})
-      s = scoped.ordered
+      options = options.reverse_merge(default_search_options)
+      s = self
+      if options[:order] && order_options.include?(options[:order])
+        column, order = options[:order].split(" ")
+        s = s.order("#{Lit::LocalizationKey.quoted_table_name}.#{connection.quote_column_name(column)} #{order}" )
+      else
+        s = s.ordered
+      end
       if options[:key_prefix].present?
         q = "#{options[:key_prefix]}%"
         s = s.where('lit_localization_keys.localization_key like ?', q)

data/app/views/lit/localization_keys/index.html.erb

@@ -1,4 +1,5 @@
 <h3><%= t('.header', :default=>"Localization keys") %></h3>
+<% available_locales = I18n.backend.available_locales %>
 
 <table class="table">
   <%- @localization_keys.each do |lk| %>
@@ -16,13 +17,9 @@
         </div>
         <div class="detail_wrapper">
           <table class="table table-bordered table-striped">
-            <%- I18n.backend.available_locales.each do |locale| %>
-              <%- localization = lk.localizations.where(:locale_id=>Lit.init.cache.find_locale(locale).id).first %>
+            <%- available_locales.each do |locale| %>
+              <%- localization = localization_for(locale, lk) %>
               <tr>
-                <% unless localization %>
-                  <% Lit.init.cache.refresh_key("#{locale}.#{lk.localization_key}") %>
-                  <%- localization = lk.localizations.where(:locale_id=>Lit.init.cache.find_locale(locale).id).first %>
-                <% end %>
                 <td class="localization_row" data-id="<%= localization.id%>" data-edit="<%= edit_localization_key_localization_path(lk, localization) %>" data-editing=0 data-content="">
                   <%= render :partial=>"localization_row", :locals=>{:localization=>Lit.init.cache["#{locale}.#{lk.localization_key}"]} %>
                 </td>
@@ -30,7 +27,7 @@
                   <%= image_tag "lit/famfamfam_flags/#{locale[0,2]}.png" %>
                   <%= locale %>
                   <% if localization %>
-                    <%= link_to lit.previous_versions_localization_key_localization_path(lk, localization), :class=>"show_prev_versions #{'hidden' if localization.versions.empty?}", :remote=>true do %>
+                    <%= link_to lit.previous_versions_localization_key_localization_path(lk, localization), :class=>"show_prev_versions #{'hidden' unless has_versions?(localization)}", :remote=>true do %>
                       <%= draw_icon 'random', :title=>t('lit.common.previous_versions', :default=>"Previous versions") %>
                     <% end %>
                   <% end %>
@@ -78,10 +75,18 @@
           starred
         <% end %>
       </li>
+      <li class="nav-header"><%= t(".order_by", :default => "Order by") %>:</li>
+      <% Lit::LocalizationKey.order_options.each do |order| %>
+        <li class="<%= "active" if order == @search_options[:order]  %>">
+          <%= link_to url_for(@search_options.merge(:order => order)) do %>
+            <%= t("lit.order_options.#{order.gsub(" ", "_")}", :default => order.humanize) %>
+          <% end %>
+        </li>
+      <% end %>
       <li class="nav-header">Narrow with prefix</li>
       <% if @search_options[:key_prefix].present? %>
         <li>
-          <%= link_to url_for(:key_prefix=>p, :key=>@search_options[:key], :include_completed=>@search_options[:include_completed]), :title=>(@parent_prefix.present? ? @parent_prefix : 'show all') do %>
+          <%= link_to url_for(@search_options.merge(:key_prefix=>p)), :title=>(@parent_prefix.present? ? @parent_prefix : 'show all') do %>
             <%= draw_icon('chevron-left') %>
             <%= @parent_prefix.present? ? @parent_prefix.split('.').last : 'show all' %>
           <% end %>
@@ -89,7 +94,7 @@
       <% end %>
       <% @prefixes.each do |p| %>
         <li class="key_prefix">
-        <%= link_to url_for(:key_prefix=>p, :key=>@search_options[:key], :include_completed=>@search_options[:include_completed]) do %>
+        <%= link_to url_for(@search_options.merge(:key_prefix=>p)) do %>
           <%= draw_icon('chevron-right') %>
           <%=  p.split('.').last %>
         <% end %>

data/app/views/lit/localizations/_form.html.erb

@@ -8,7 +8,12 @@
     </ul>
   <% else %>
     <%= f.text_area :translated_value, :size=>"40x2", :class=>"input-xxlarge" %>
+    <br />
+    <label>
+      <input type="checkbox" class="wysiwyg_switch" /> use wysiwyg editor
+    </label>
   <% end %>
+
   <button class="btn" type="submit"><%= t('lit.common.update', :default=>"Update") %></button>
   <button class="btn cancel"><%= t('lit.common.cancel', :default=>'Cancel') %></button>
 <% end %>

data/app/views/lit/localizations/{edit.html.erb → edit.js.erb}

@@ -1,4 +1,7 @@
 var $row = $('td.localization_row[data-id="<%= @localization.id %>"]');
 $row.data('editing', 1);
 $row.html("<%= ejs render(:partial=>'form') %>");
-$row.find('textarea').focus();
+$row.find('textarea').focus();
+<% if @localization.full_key.ends_with?('_html') -%>
+  $row.find('.wysiwyg_switch').click();
+<% end %>

data/app/views/lit/sources/_form.html.erb

@@ -30,6 +30,6 @@
   </div>
 
   <div class="actions">
-    <%= f.submit t('lit.common.save'), :class=>"btn" %>
+    <%= f.submit t('lit.common.save', :default => "Save"), :class=>"btn" %>
   </div>
 <% end %>

data/lib/lit/cache.rb

@@ -1,3 +1,21 @@
+module I18n
+  class << self
+    @@cache_store = nil
+
+    def cache_store
+      @@cache_store || I18n.backend.cache
+    end
+
+    def cache_store=(store)
+      @@cache_store = store
+    end
+
+    def perform_caching?
+      !cache_store.nil?
+    end
+  end
+end
+
 module Lit
   class Cache
 
@@ -42,6 +60,13 @@ module Lit
       @localizations[key] = localization.get_value if localization
     end
 
+    def delete_locale(key)
+      key = key.to_s
+      locale_key, key_without_locale = split_key(key)
+      locale = find_locale(locale_key)
+      delete_localization(locale, key_without_locale)
+    end
+
     def load_all_translations(oninit=false)
       doinit = false
       first = Localization.order('id ASC').first
@@ -83,6 +108,8 @@ module Lit
       load_all_translations
     end
 
+    alias_method :clear, :reset
+
     def find_locale(locale_key)
       locale_key = locale_key.to_s
       @locale_cache ||= {}
@@ -178,6 +205,15 @@ module Lit
         end
       end
 
+      def delete_localization(locale, key_without_locale)
+        localization = find_localization(locale, key_without_locale)
+        if localization.persisted?
+          @localizations.delete("#{locale.locale}.#{key_without_locale}")
+          @localization_keys.delete(key_without_locale)
+          localization.destroy # or localization.default_value = nil; localization.save!
+        end
+      end
+
       ## checks parameter type and returns value basing on it
       ## symbols are beeing looked up in db
       ## string are returned directly
@@ -196,7 +232,7 @@ module Lit
           when String then
             new_value = v
           when Proc then
-            new_value = v.call
+            new_value = nil # was v.call - requires more love
           else
             new_value = v.to_s
         end
@@ -213,10 +249,7 @@ module Lit
       end
 
       def split_key(key)
-        key_split = key.split('.')
-        locale_key = key_split.first
-        key_without_locale = key_split[1..-1].join('.')
-        [locale_key, key_without_locale]
+        key.split('.', 2)
       end
 
       def find_or_create_localization_key(key_without_locale)

data/lib/lit/i18n_backend.rb

@@ -4,6 +4,8 @@ module Lit
   class I18nBackend
     include I18n::Backend::Simple::Implementation
 
+    attr_reader :cache
+
     def initialize(cache)
       @cache = cache
     end
@@ -18,7 +20,7 @@ module Lit
     end
 
     def available_locales
-      Lit::Locale.ordered.visible.all.map{|l| l.locale.to_sym }
+      Lit::Locale.ordered.visible.map{|l| l.locale.to_sym }
     end
 
     # Stores the given translations.
@@ -39,6 +41,8 @@ module Lit
 
       ## check in cache or in simple backend
       content = @cache[key_with_locale] || super
+      return content if parts.size <= 1
+
       newly_created = false
       unless @cache.has_key?(key_with_locale)
         @cache.init_key_with_value(key_with_locale, content)
@@ -59,25 +63,29 @@ module Lit
         end
       elsif data.respond_to?(:to_str)
         key = ([locale] + scope).join('.')
-        @cache[key] = data
+        @cache[key] ||= data
+      elsif data.nil?
+        key = ([locale] + scope).join('.')
+        @cache.delete_locale(key)
       end
     end
 
     def load_translations(*filenames)
-      super
       @cache.load_all_translations
+      super
     end
 
     def default(locale, object, subject, options = {})
       content = super(locale, object, subject, options)
       if content.respond_to?(:to_str)
         parts = I18n.normalize_keys(locale, object, options[:scope], options[:separator])
-        key = parts.join('.')
-        @cache[key] = content
+        if parts.size > 1
+          key = parts.join('.')
+          @cache[key] = content
+        end
       end
       content
     end
 
-    attr_reader :cache
   end
 end

data/lib/lit/version.rb

@@ -1,3 +1,3 @@
 module Lit
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lit
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-25 00:00:00.000000000 Z
+date: 2013-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -381,13 +381,16 @@ files:
 - app/assets/images/lit/famfamfam_flags/za.png
 - app/assets/images/lit/famfamfam_flags/zm.png
 - app/assets/images/lit/famfamfam_flags/zw.png
+- app/assets/images/lit/jquery-te.png
 - app/assets/javascripts/lit/application.js
 - app/assets/javascripts/lit/bootstrap.js.coffee
 - app/assets/javascripts/lit/dashboard.js
+- app/assets/javascripts/lit/jquery-te-1.4.0.min.js
 - app/assets/javascripts/lit/localizations.js.coffee
 - app/assets/stylesheets/lit/application.css
 - app/assets/stylesheets/lit/bootstrap_and_overrides.css.scss
 - app/assets/stylesheets/lit/dashboard.css
+- app/assets/stylesheets/lit/jquery-te-1.4.0.css.scss
 - app/controllers/lit/api/v1/base_controller.rb
 - app/controllers/lit/api/v1/locales_controller.rb
 - app/controllers/lit/api/v1/localization_keys_controller.rb
@@ -430,7 +433,7 @@ files:
 - app/views/lit/localization_keys/star.js.erb
 - app/views/lit/localizations/_form.html.erb
 - app/views/lit/localizations/_previous_versions_rows.html.erb
-- app/views/lit/localizations/edit.html.erb
+- app/views/lit/localizations/edit.js.erb
 - app/views/lit/localizations/previous_versions.js.erb
 - app/views/lit/localizations/update.js.erb
 - app/views/lit/sources/_form.html.erb
@@ -464,7 +467,8 @@ files:
 - Rakefile
 - README.md
 homepage: https://github.com/prograils/lit
-licenses: []
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
 require_paths: