interpret 0.1.4 → 0.1.5

data/app/views/interpret/tools/index.html.erb

@@ -1,28 +1,34 @@
 <% interpret_title "Interpret - Tools" %>
 
 <div class="header">
-  <h1>Your master language</h1>
+  <h1>Tools for import/export locale data</h1>
 </div>
+
+<p><%= link_to "Download", export_interpret_tools_path %> the current translations for '<%= I18n.locale %>' language as .yml file</p>
+<p>Upload your .yml file for '<%= I18n.locale %>' language</p>
 <p>
-Currently your primary language is <b><%= I18n.default_locale %></b>. This
-language will be used as a reference for all your translation work, you
-can change it below:
-</p>
-<p><em>TODO</em></p>
+<%= form_tag import_interpret_tools_path, :multipart => true do %>
+  <%= label_tag "File:" %>
+  <%= file_field_tag :file %>
+  <%= submit_tag "Upload" %>
+<% end %>
+
 
 <div class="header">
   <h1>Update contents from yml locale files</h1>
 </div>
 
-<p>update all your application translatinos from the yml files.<br/>
+<p>Update all your application translations from the yml files.<br/>
 </p>
-<%= button_to "Update contents", run_update_interpret_tools_path %>
+<%= button_to "Update", run_update_interpret_tools_path %>
+
+
 <div class="header">
   <h1>Dump .yml contents into database</h1>
 </div>
 
 <p>With this option you can export all of your *.yml contents into the database backend<br/>
-<b>Be aware!!</b> All of your current database translations will be erased
+<b>Be aware!!</b> All of your current database translations will be updated to match with your current *.yml files.
 </p>
 
 <% if Rails.env == "production" %>
@@ -30,18 +36,5 @@ can change it below:
 <% end %>
 
 <p>
-<%= button_to "Run the migration", dump_interpret_tools_path %>
+<%= button_to "Dump", dump_interpret_tools_path %>
 </p>
-
-<div class="header">
-  <h1>Tools for import/export locale data</h1>
-</div>
-
-<p><%= link_to "Download", export_interpret_tools_path %> the current translations for '<%= I18n.locale %>' language as .yml file</p>
-<p>Upload your .yml file for '<%= I18n.locale %>' language</p>
-<p>
-<%= form_tag import_interpret_tools_path, :multipart => true do %>
-  <%= label_tag "File:" %>
-  <%= file_field_tag :file %>
-  <%= submit_tag "Upload" %>
-<% end %>

data/app/views/interpret/translations/_listing.html.erb

@@ -24,7 +24,7 @@
                 :activator => "#translation_#{x.id}",
                 :sanitize => false %>
           </td>
-          <% if @interpret_admin%>
+          <% if @interpret_admin %>
             <td style="width:5%" class='protection_input' id="protection_<%= x.id %>">
               <%= best_in_place x, :protected,
                   :type => :checkbox,

data/app/views/interpret/translations/live_edit.html.erb

@@ -0,0 +1,11 @@
+<div id="interpret_live_edit">
+  <% if @translation %>
+    <%= form_for @translation, :url => interpret_translation_path(@translation) do |f| %>
+      <%= f.text_area :value, :value => @translation.value  %>
+      <br/>
+      <%= f.submit %>
+    <% end %>
+  <% else %>
+    This translation does not exists yet. You should go to the interpret backoffice interaface and create it from there, this functionality is not yet supported by this live edition feature
+  <% end %>
+</div>

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

@@ -1,8 +1,13 @@
 
 <div id="interpret_container">
+  <% if flash.any? %>
+    <div class="interpret_flash grid_16 <%= flash.keys.first %>">
+      <%= flash[:notice] || flash[:alert] %>
+    </div>
+  <% end %>
   <div class="menu grid_12">
     <%= interpret_section_link_to "Overview", interpret_root_path %> |
-    <% if @interpret_admin %>
+    <% unless @interpret_user && !@interpret_admin %>
       <%= interpret_section_link_to "Tools", interpret_tools_path %> |
     <% end %>
     <%= interpret_section_link_to "Search", interpret_search_path %>

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

@@ -4,7 +4,7 @@
   <title><%= yield :title %></title>
   <%= stylesheet_link_tag "interpret_style" %>
   <%= javascript_include_tag "https://ajax.googleapis.com/ajax/libs/jquery/1.4.4/jquery.min.js" %>
-  <%= javascript_include_tag "jquery.purr", "best_in_place", "interpret" %>
+  <%= javascript_include_tag "best_in_place", "interpret" %>
   <%= csrf_meta_tag %>
 </head>
 <body>

data/config/routes.rb

@@ -3,6 +3,10 @@ Rails.application.routes.draw do
     namespace :interpret do
       resources :translations, :only => [:edit, :update] do
         resources :translations, :only => [:new, :create]
+
+        collection do
+          get :live_edit
+        end
       end
 
       resources :tools, :only => :index do

data/interpret.gemspec

@@ -23,7 +23,6 @@ Gem::Specification.new do |s|
   s.add_dependency "i18n", "~> 0.5.0"
   s.add_dependency "i18n-active_record"
   s.add_dependency "ya2yaml", ">= 0.30.0"
-  s.add_dependency "will_paginate", ">= 3.0.pre2"
   s.add_dependency "best_in_place", ">= 0.1.7"
   s.add_dependency "lazyhash", ">= 0.1.1"
 

data/lib/generators/interpret/setup_generator.rb

@@ -6,11 +6,12 @@ module Interpret
 
     def copy_css
       copy_file "stylesheets/interpret_style.css", "public/stylesheets/interpret_style.css"
+      copy_file "stylesheets/interpret_live_edit_style.css", "public/stylesheets/interpret_live_edit_style.css"
     end
 
     def copy_js
       copy_file "javascripts/interpret.js", "public/javascripts/interpret.js"
-      copy_file "javascripts/jquery.purr.js", "public/javascripts/jquery.purr.js"
+      directory "javascripts/facebox-1.3", "public/javascripts/facebox-1.3"
     end
 
     def copy_images

data/lib/interpret/controller_filter.rb

@@ -0,0 +1,22 @@
+class ActionController::Base
+  before_filter :set_interpret_user
+
+  private
+    def set_interpret_user
+      return unless Interpret.live_edit
+
+      if Interpret.current_user && defined?(Interpret.current_user.to_sym)
+        @interpret_user = eval(Interpret.current_user)
+
+        if @interpret_user.nil?
+          @interpret_admin = false
+          return
+        end
+
+        @interpret_admin = true
+        if Interpret.admin && @interpret_user.respond_to?(Interpret.admin)
+          @interpret_admin = @interpret_user.send(Interpret.admin)
+        end
+      end
+    end
+end

data/lib/interpret/engine.rb

@@ -1,16 +1,19 @@
 require 'i18n/backend/active_record'
 require 'interpret/logger'
 require 'interpret/helpers'
+require 'interpret/controller_filter'
 
 module Interpret
   class Engine < Rails::Engine
-    if Interpret.registered_envs.include?(Rails.env.to_sym)
-      initializer "interpret.register_i18n_active_record_backend" do |app|
-        I18n::Backend::ActiveRecord.send(:include, I18n::Backend::Memoize)
-        I18n::Backend::ActiveRecord.send(:include, I18n::Backend::Flatten)
+    initializer "interpret.register_i18n_active_record_backend" do |app|
+      app.config.after_initialize do
+        if Interpret.registered_envs.include?(Rails.env.to_sym)
+          I18n::Backend::ActiveRecord.send(:include, I18n::Backend::Memoize)
+          I18n::Backend::ActiveRecord.send(:include, I18n::Backend::Flatten)
 
-        Interpret.backend = I18n::Backend::ActiveRecord.new
-        app.config.i18n.backend = Interpret.backend
+          Interpret.backend = I18n::Backend::Chain.new(I18n::Backend::ActiveRecord.new, I18n.backend)
+          I18n.backend = Interpret.backend
+        end
       end
     end
 
@@ -19,5 +22,13 @@ module Interpret
       logfile.sync = true
       Interpret.logger = InterpretLogger.new(logfile)
     end
+
+
+    initializer "interpret.register_observer" do |app|
+      app.config.before_initialize do |app|
+        ActiveRecord::Base.observers << Interpret.sweeper.to_sym if Interpret.sweeper && I18n::Backend::ActiveRecord::Translation.table_exists?
+        ActiveRecord::Base.observers << :"interpret/expiration_observer" if !Interpret.sweeper && I18n::Backend::ActiveRecord::Translation.table_exists?
+      end
+    end
   end
 end

data/lib/interpret/helpers.rb

@@ -28,7 +28,46 @@ module Interpret
       self.output_buffer = render(:file => "layouts/#{layout}")
     end
 
+    def t(key, options = {})
+      if Interpret.live_edit && @interpret_admin
+        keys = build_keys(key, options)
+        "<span class='interpret_editable' data-key='#{keys}'>#{translate(key, options)}</span>".html_safe
+      else
+        translate(key, options) #.html_safe
+      end
+    end
+
+    def interpret_live_edition
+      return unless Interpret.live_edit && @interpret_admin
+      content_tag(:div) do
+        concat(javascript_include_tag "facebox-1.3/facebox")
+        concat javascript_tag <<-JS
+          $(document).ready(function(){
+            $(".interpret_editable").click(function() {
+              var key = $(this).attr("data-key");
+              jQuery.facebox({ ajax: '#{live_edit_interpret_translations_path}?key=' + key});
+              return false;
+            });
+          });
+        JS
+        concat(stylesheet_link_tag "interpret_live_edit_style")
+        concat(stylesheet_link_tag "/javascripts/facebox-1.3/facebox.css")
+      end
+    end
+
   private
+    def build_keys(key, options)
+      I18n.normalize_keys(I18n.locale, scope_key_by_partial(key), options[:scope]).join(".")
+    end
+
+    def scope_key_by_partial(key)
+      if key.to_s.first == "."
+        "#{@_virtual_path.gsub(%r{/_?}, ".")}#{key.to_s}"
+      else
+        key
+      end
+    end
+
     def build_tree(hash, origin_keys = "", prev_key = "")
       out = "<ul>"
       if origin_keys.present? && prev_key.blank?

data/lib/interpret/version.rb

@@ -1,3 +1,3 @@
 module Interpret
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

data/lib/interpret.rb

@@ -1,5 +1,4 @@
 require 'best_in_place'
-require 'will_paginate'
 require 'lazyhash'
 
 module Interpret
@@ -12,11 +11,15 @@ module Interpret
   mattr_accessor :current_user
   mattr_accessor :admin
   mattr_accessor :layout
+  mattr_accessor :soft
+  mattr_accessor :live_edit
 
   @@controller = "action_controller/base"
   @@registered_envs = [:production, :staging]
   @@scope = ""
   @@layout = "interpret_base"
+  @@soft = false
+  @@live_edit = false
 
   def self.configure
     yield self

data/lib/tasks/interpret.rake

@@ -1,11 +1,13 @@
 namespace :interpret do
   desc 'Copy all the translations from config/locales/*.yml into DB backend'
-  task :migrate => [:environment, "tmp:cache:clear"] do
+  task :dump => :environment do
     Interpret::Translation.dump
+    eval(Interpret.sweeper.classify).instance.send(:run_expiration) if Interpret.sweeper
   end
 
   desc 'Synchronize the keys used in db backend with the ones on *.yml files'
-  task :update => [:environment, "tmp:cache:clear"] do
+  task :update => :environment do
     Interpret::Translation.update
+    eval(Interpret.sweeper.classify).instance.send(:run_expiration) if Interpret.sweeper
   end
 end

data/public/javascripts/facebox-1.3/facebox.css

@@ -0,0 +1,80 @@
+#facebox {
+  position: absolute;
+  top: 0;
+  left: 0;
+  z-index: 100;
+  text-align: left;
+}
+
+
+#facebox .popup{
+  position:relative;
+  border:3px solid rgba(0,0,0,0);
+  -webkit-border-radius:5px;
+  -moz-border-radius:5px;
+  border-radius:5px;
+  -webkit-box-shadow:0 0 18px rgba(0,0,0,0.4);
+  -moz-box-shadow:0 0 18px rgba(0,0,0,0.4);
+  box-shadow:0 0 18px rgba(0,0,0,0.4);
+}
+
+#facebox .content {
+  display:table;
+  width: 370px;
+  padding: 10px;
+  background: #fff;
+  -webkit-border-radius:4px;
+  -moz-border-radius:4px;
+  border-radius:4px;
+}
+
+#facebox .content > p:first-child{
+  margin-top:0;
+}
+#facebox .content > p:last-child{
+  margin-bottom:0;
+}
+
+#facebox .close{
+  position:absolute;
+  top:5px;
+  right:5px;
+  padding:2px;
+  background:#fff;
+}
+#facebox .close img{
+  opacity:0.3;
+}
+#facebox .close:hover img{
+  opacity:1.0;
+}
+
+#facebox .loading {
+  text-align: center;
+}
+
+#facebox .image {
+  text-align: center;
+}
+
+#facebox img {
+  border: 0;
+  margin: 0;
+}
+
+#facebox_overlay {
+  position: fixed;
+  top: 0px;
+  left: 0px;
+  height:100%;
+  width:100%;
+}
+
+.facebox_hide {
+  z-index:-100;
+}
+
+.facebox_overlayBG {
+  background-color: #000;
+  z-index: 99;
+}