From 2f7d5613102e6be95c941b731259d3dcc796c1bb Mon Sep 17 00:00:00 2001
From: Christophe Vilayphiou <chris.vilayphiou@gmail.com>
Date: Thu, 17 May 2012 19:40:30 +0800
Subject: [PATCH] Put back I18n for file_upload

---
 app/helpers/admin/asset_helper.rb           | 11 +++++++++++
 app/views/admin/assets/create.js.erb        |  4 ++--
 app/views/admin/assets/file_upload.html.erb | 18 ++++++++++++++++--
 3 files changed, 29 insertions(+), 4 deletions(-)
 create mode 100644 app/helpers/admin/asset_helper.rb

diff --git a/app/helpers/admin/asset_helper.rb b/app/helpers/admin/asset_helper.rb
new file mode 100644
index 00000000..818a2340
--- /dev/null
+++ b/app/helpers/admin/asset_helper.rb
@@ -0,0 +1,11 @@
+module Admin::AssetHelper
+
+  def show_all_fields(asset, field)
+    a = []
+    @site_valid_locales.each do |locale|
+      a << asset.send(field)[locale] rescue nil
+    end 
+    a.join(' - ')
+  end
+
+end
\ No newline at end of file
diff --git a/app/views/admin/assets/create.js.erb b/app/views/admin/assets/create.js.erb
index 6c409581..4e44a870 100644
--- a/app/views/admin/assets/create.js.erb
+++ b/app/views/admin/assets/create.js.erb
@@ -5,8 +5,8 @@
 var tinymce=null,tinyMCEPopup,tinyMCE;tinyMCEPopup={init:function(){var b=this,a,c;a=b.getWin();tinymce=a.tinymce;tinyMCE=a.tinyMCE;b.editor=tinymce.EditorManager.activeEditor;b.params=b.editor.windowManager.params;b.features=b.editor.windowManager.features;b.dom=b.editor.windowManager.createInstance("tinymce.dom.DOMUtils",document);if(b.features.popup_css!==false){b.dom.loadCSS(b.features.popup_css||b.editor.settings.popup_css)}b.listeners=[];b.onInit={add:function(e,d){b.listeners.push({func:e,scope:d})}};b.isWindow=!b.getWindowArg("mce_inline");b.id=b.getWindowArg("mce_window_id");b.editor.windowManager.onOpen.dispatch(b.editor.windowManager,window)},getWin:function(){return(!window.frameElement&&window.dialogArguments)||opener||parent||top},getWindowArg:function(c,b){var a=this.params[c];return tinymce.is(a)?a:b},getParam:function(b,a){return this.editor.getParam(b,a)},getLang:function(b,a){return this.editor.getLang(b,a)},execCommand:function(d,c,e,b){b=b||{};b.skip_focus=1;this.restoreSelection();return this.editor.execCommand(d,c,e,b)},resizeToInnerSize:function(){var a=this;setTimeout(function(){var b=a.dom.getViewPort(window);a.editor.windowManager.resizeBy(a.getWindowArg("mce_width")-b.w,a.getWindowArg("mce_height")-b.h,a.id||window)},10)},executeOnLoad:function(s){this.onInit.add(function(){eval(s)})},storeSelection:function(){this.editor.windowManager.bookmark=tinyMCEPopup.editor.selection.getBookmark(1)},restoreSelection:function(){var a=tinyMCEPopup;if(!a.isWindow&&tinymce.isIE){a.editor.selection.moveToBookmark(a.editor.windowManager.bookmark)}},requireLangPack:function(){var b=this,a=b.getWindowArg("plugin_url")||b.getWindowArg("theme_url");if(a&&b.editor.settings.language&&b.features.translate_i18n!==false&&b.editor.settings.language_load!==false){a+="/langs/"+b.editor.settings.language+"_dlg.js";if(!tinymce.ScriptLoader.isDone(a)){document.write('<script type="text/javascript" src="'+tinymce._addVer(a)+'"><\/script>');tinymce.ScriptLoader.markDone(a)}}},pickColor:function(b,a){this.execCommand("mceColorPicker",true,{color:document.getElementById(a).value,func:function(e){document.getElementById(a).value=e;try{document.getElementById(a).onchange()}catch(d){}}})},openBrowser:function(a,c,b){tinyMCEPopup.restoreSelection();this.editor.execCallback("file_browser_callback",a,document.getElementById(a).value,c,window)},confirm:function(b,a,c){this.editor.windowManager.confirm(b,a,c,window)},alert:function(b,a,c){this.editor.windowManager.alert(b,a,c,window)},close:function(){var a=this;function b(){a.editor.windowManager.close(window);tinymce=tinyMCE=a.editor=a.params=a.dom=a.dom.doc=null}if(tinymce.isOpera){a.getWin().setTimeout(b,0)}else{b()}},_restoreSelection:function(){var a=window.event.srcElement;if(a.nodeName=="INPUT"&&(a.type=="submit"||a.type=="button")){tinyMCEPopup.restoreSelection()}},_onDOMLoaded:function(){var b=tinyMCEPopup,d=document.title,e,c,a;if(b.domLoaded){return}b.domLoaded=1;if(b.features.translate_i18n!==false){c=document.body.innerHTML;if(tinymce.isIE){c=c.replace(/ (value|title|alt)=([^"][^\s>]+)/gi,' $1="$2"')}document.dir=b.editor.getParam("directionality","");if((a=b.editor.translate(c))&&a!=c){document.body.innerHTML=a}if((a=b.editor.translate(d))&&a!=d){document.title=d=a}}if(!b.editor.getParam("browser_preferred_colors",false)||!b.isWindow){b.dom.addClass(document.body,"forceColors")}document.body.style.display="";if(tinymce.isIE){document.attachEvent("onmouseup",tinyMCEPopup._restoreSelection);b.dom.add(b.dom.select("head")[0],"base",{target:"_self"})}b.restoreSelection();b.resizeToInnerSize();if(!b.isWindow){b.editor.windowManager.setTitle(window,d)}else{window.focus()}if(!tinymce.isIE&&!b.isWindow){tinymce.dom.Event._add(document,"focus",function(){b.editor.windowManager.focus(b.id)})}tinymce.each(b.dom.select("select"),function(f){f.onkeydown=tinyMCEPopup._accessHandler});tinymce.each(b.listeners,function(f){f.func.call(f.scope,b.editor)});if(b.getWindowArg("mce_auto_focus",true)){window.focus();tinymce.each(document.forms,function(g){tinymce.each(g.elements,function(f){if(b.dom.hasClass(f,"mceFocus")&&!f.disabled){f.focus();return false}})})}document.onkeyup=tinyMCEPopup._closeWinKeyHandler},_accessHandler:function(a){a=a||window.event;if(a.keyCode==13||a.keyCode==32){a=a.target||a.srcElement;if(a.onchange){a.onchange()}return tinymce.dom.Event.cancel(a)}},_closeWinKeyHandler:function(a){a=a||window.event;if(a.keyCode==27){tinyMCEPopup.close()}},_wait:function(){if(document.attachEvent){document.attachEvent("onreadystatechange",function(){if(document.readyState==="complete"){document.detachEvent("onreadystatechange",arguments.callee);tinyMCEPopup._onDOMLoaded()}});if(document.documentElement.doScroll&&window==window.top){(function(){if(tinyMCEPopup.domLoaded){return}try{document.documentElement.doScroll("left")}catch(a){setTimeout(arguments.callee,0);return}tinyMCEPopup._onDOMLoaded()})()}document.attachEvent("onload",tinyMCEPopup._onDOMLoaded)}else{if(document.addEventListener){window.addEventListener("DOMContentLoaded",tinyMCEPopup._onDOMLoaded,false);window.addEventListener("load",tinyMCEPopup._onDOMLoaded,false)}}}};tinyMCEPopup.init();tinyMCEPopup._wait();
 
 var returnurl = "<%= @asset.data.url %>";
-var returntitle = "<%= @asset.title[I18n.locale] %>";
-var returndescription = "<%= @asset.description[I18n.locale] %>";
+var returntitle = "<%= show_all_fields(@asset, 'title') %>";
+var returndescription = "<%= show_all_fields(@asset, 'description') %>";
 var win = tinyMCEPopup.getWindowArg("window");
 win.document.getElementById(tinyMCEPopup.getWindowArg("input")).value = returnurl;
   if (typeof(win.ImageDialog) != "undefined") {
diff --git a/app/views/admin/assets/file_upload.html.erb b/app/views/admin/assets/file_upload.html.erb
index bc716606..ff21935c 100644
--- a/app/views/admin/assets/file_upload.html.erb
+++ b/app/views/admin/assets/file_upload.html.erb
@@ -13,7 +13,14 @@
             <div class="controls">
                 <%= f.fields_for :title, (@asset.new_record? ? @asset.build_title : @asset.title) do |f| %>
                     <div>
-                        <%= f.text_field I18n.locale, :class => "input-large" %>
+                    <% @site_valid_locales.each do |locale| %>
+                        <%= content_tag :label do -%>
+                            <div>
+                                <%= I18nVariable.from_locale(locale) %>
+                                <%= f.text_field locale, :class => "input-large" %>
+                            </div>
+                        <% end %>
+                      <% end %>
                     </div>
                 <% end %>
             </div>
@@ -23,7 +30,14 @@
             <div class="controls">
                 <%= f.fields_for :description, (@asset.new_record? ? @asset.build_description : @asset.description) do |f| %>
                     <div>
-                        <%= f.text_field I18n.locale, :class => "input-large" %>
+                    <% @site_valid_locales.each do |locale| %>
+                        <%= content_tag :label do -%>
+                            <div>
+                                <%= I18nVariable.from_locale(locale) %>
+                                <%= f.text_field locale, :class => "input-large" %>
+                            </div>
+                        <% end %>
+                      <% end %>
                     </div>
                 <% end %>
             </div>