rich_i18n 1.2.2 → 1.2.3

data/CHANGELOG

@@ -1,5 +1,14 @@
 = Rich-i18n CHANGELOG
 
+== Version 1.2.3 (October 19, 2010)
+
+* Using SeatHolder v0.8.8 in order to tell SeatHolder not to react on focus events (yay!)
+* Corrected Rich.I18n.afterUpdate() so certain page elements will be updated again after updating translations
+* Added some manual source file requirements
+* Changed formtastic dependency to '1.0.1' and i18n to '>= 0.3.7' which fixes the gem installation error
+* Being able to edit translations within the WYSIWYG editor Cleditor (:as => :html)
+* Telling Formtastic not to escape labels when required
+
 == Version 1.2.2 (October 9, 2010)
 
 * Fixed cached translations (adding I18n.locale as criteria just now, doh!)

data/README.textile

@@ -134,7 +134,7 @@ You can combine translations by using passed string containing translation keys
 
 h3. Translation meta data with EnrichedString
 
-When translating text, you possibly want to know the @key@, the @value@, the @locale@ and the @derivative key@ (the argument passed for translation). Rich-i18n preserves just that in an @EnrichedString@ which is a subclass of @String@. Calling @.meta_data@ returns a hash with the meta data:
+When translating text, you possibly want to know the @key@, the @value@, the @locale@ and the @derivative key@ (the argument passed for translation). Rich-i18n preserves just that in an @EnrichedString@ which is a wrapper containing meta data and the translation. Calling @.meta_data@ returns a hash with the meta data:
 
 <pre>
   >> "MORE".t.class

data/Rakefile

@@ -12,10 +12,10 @@ begin
     gemspec.homepage    = "http://codehero.es/rails_gems_plugins/rich_i18n"
     gemspec.author      = "Paul Engel"
 
-    gemspec.add_dependency "i18n"      , "0.3.7"
-    gemspec.add_dependency "jzip"      , ">= 1.0.10"
+    gemspec.add_dependency "formtastic", "1.0.1"
     gemspec.add_dependency "hpricot"
-    gemspec.add_dependency "formtastic", "0.9.7"
+    gemspec.add_dependency "i18n"      , ">= 0.3.7"
+    gemspec.add_dependency "jzip"      , ">= 1.0.10"
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-1.2.2
+1.2.3

data/lib/assets/jzip/jquery/seat_holder.js

@@ -1,7 +1,7 @@
 if (typeof(SeatHolder) == "undefined") {
 
 // *
-// * SeatHolder 0.8.7 (Uncompressed)
+// * SeatHolder 0.8.8 (Uncompressed)
 // * The modest Javascript placeholder (used in http://gettopup.com)
 // *
 // * This library requires jQuery (http://jquery.com)
@@ -10,11 +10,11 @@ if (typeof(SeatHolder) == "undefined") {
 // * Except otherwise noted, SeatHolder is licensed under
 // * http://creativecommons.org/licenses/by-sa/3.0
 // *
-// * $Date: 2010-09-01 23:14:04 +0100 (Wed, 01 September 2010) $
+// * $Date: 2010-10-19 23:23:28 +0100 (Tue, 19 October 2010) $
 // *
 
 SeatHolder = (function() {
-  var hintClass = "sh_hint", hideClass = "sh_hide", ignored_types = ["file", "submit"];
+  var hintClass = "sh_hint", hideClass = "sh_hide", ignored_types = ["file", "submit"], reacting = true;
   
   var injectCode = function() {
     var style = "<style>" + 
@@ -24,6 +24,7 @@ SeatHolder = (function() {
 
     jQuery(style).prependTo("head");
   };
+  
   var bind = function() {
     var hintedElements = [];
     
@@ -81,14 +82,27 @@ SeatHolder = (function() {
     });
   };
   
+  var react = function(bool) {
+    reacting = typeof(bool) == "undefined" ? true : bool;
+  };
+  
   var onHintFocus = function(event) {
+    if (!reacting) {
+      return;
+    }
+    
     var hintElement = jQuery(event.target).addClass(hideClass);
     
     hintElement.data("hinted_element")
                .removeClass(hideClass)
                .focus();
   };
+  
   var onFocus = function(event) {
+    if (!reacting) {
+      return;
+    }
+    
     var element = jQuery(event.target);
     var seatholder = element.attr("seatholder");
     
@@ -107,6 +121,7 @@ SeatHolder = (function() {
       input.setSelectionRange(0, element.val().length);
     }
   };
+  
   var onBlur = function(event, element) {
     if (element == null) {
       element = jQuery(event.target);
@@ -135,7 +150,7 @@ SeatHolder = (function() {
   };
   
   return {
-    version: "0.8.7",
+    version: "0.8.8",
     selector: "[seatholder]",
     hintColor: "#AAA",
     init: function() {
@@ -147,9 +162,8 @@ SeatHolder = (function() {
         bind();
       });
     },
-    rebind: function() {
-      bind();
-    }
+    rebind: bind,
+    react: react
   };
 }());
 

data/lib/assets/jzip/rich/i18n.js

@@ -12,7 +12,7 @@ Rich.I18n = (function() {
     },
     afterUpdate: function(form, response, selector, specs, identifier) {
       $.each(response.translations, function(key, value) {
-        $( "span.i18n" + identifier + "[data-derivative_key=" + key + "]")            .attr("data-value", response.value).html(              value);
+        $(     ".i18n" + identifier + "[data-derivative_key=" + key + "]")            .attr("data-value", response.value).html(              value);
         $("input.i18n" + identifier + "[data-derivative_key=" + key + "][value]")     .attr("data-value", response.value).attr("value"     , value);
         $("input.i18n" + identifier + "[data-derivative_key=" + key + "][seatholder]").attr("data-value", response.value).attr("seatholder", value);
       });

data/lib/rich/i18n/actionpack/action_view/sanitizor.rb

@@ -14,12 +14,13 @@ module Rich
             doc = Hpricot html
 
             (doc/"head i18n").each do |i18n|
-              i18n.swap i18n.inner_html
+              i18n.swap CGI.unescapeHTML(i18n.raw_attributes["data-i18n_translation"])
             end
 
             (doc/"i18n").each do |i18n|
-              elem = Hpricot::Elem.new "span", i18n.raw_attributes.merge({:class => "i18n"})
-              elem.inner_html = i18n.inner_html
+              elem = Hpricot::Elem.new i18n.raw_attributes["data-editable_input_type"] == "html" ? "div" : "span",
+                                       i18n.raw_attributes.reject{|k, v| k == "data-i18n_translation"}.merge({:class => "i18n"})
+              elem.inner_html = CGI.unescapeHTML(i18n.raw_attributes["data-i18n_translation"])
               i18n.swap elem.to_html
             end
 
@@ -44,10 +45,10 @@ module Rich
 
               i18n = Hpricot(input.attributes[input_attr]).children.first
               i18n.raw_attributes.each do |key, value|
-                input.attributes[key] = value
+                input.attributes[key] = value unless key == "data-i18n_translation"
               end
-        
-              input.attributes[input_attr] = i18n.inner_html
+              
+              input.attributes[input_attr] = CGI.unescapeHTML(i18n.raw_attributes["data-i18n_translation"])
               input.attributes["class"] = ["i18n", input.attributes["class"]].uniq.join(" ").strip
             end
         

data/lib/rich/i18n/core/enriched_string.rb

@@ -25,14 +25,19 @@ module Rich
       private
       
         def to_tag
+          tag   = :i18n
+          attrs = []
+
           keys  = [:key, :value, :locale, :derivative_key]
           data  = @meta_data.reject{|k, v| !keys.include?(k.to_sym)}
 
-          tag   = :i18n
-          attrs = data.collect{|k, v| "data-#{k}=\"#{::ERB::Util.html_escape v}\""}.join " "
-          value = @string
+          data[:editable_input_type] = @meta_data[:as] if %w(string text html).include? @meta_data[:as].to_s.downcase
+
+          attrs << @meta_data[:html].collect{|k, v|      "#{k}=\"#{::ERB::Util.html_escape v}\""}.join(" ") if @meta_data[:html]
+          attrs << data             .collect{|k, v| "data-#{k}=\"#{::ERB::Util.html_escape v}\""}.join(" ")
+          attrs << "data-i18n_translation=\"#{::ERB::Util.html_escape @string}\""
           
-          "<#{tag} #{attrs}>#{value}</#{tag}>"
+          "<#{tag} #{attrs}></#{tag}>"
         end
         
       end

data/lib/rich/i18n/core/string/internationalization.rb

@@ -56,19 +56,19 @@ module Rich
                   end
                 end
       
-                unless s.gsub!(/^=\s+/, "")
+                unless s.gsub!(/^=\s+/, "") || options[:as].to_s == "html"
                   s.cp_case! options[:capitalize] ? default.capitalize : default
                 end
               
                 array << " " unless array.empty?
-                array << EnrichedString.new(s, {:key => key, :value => value, :locale => I18n.locale, :derivative_key => string})
+                array << EnrichedString.new(s, options.reject{|k, v| !%w(html as).include? k.to_s}.merge({:key => key, :value => value, :locale => I18n.locale, :derivative_key => string}))
       
               end.join
             end
           
           private
 
-            RICH_I18N_OPTIONS = [:count, :pluralize, :capitalize, :translate_callback]
+            RICH_I18N_OPTIONS = [:count, :pluralize, :capitalize, :translate_callback, :html, :as]
             LOGGER_PROC = Proc.new{|translation, key, options| puts "== RICH-I18N: I18n.t #{key.inspect}, #{options.inspect}"}
           
             @@i18n_translations = {}

data/lib/rich/i18n/engine.rb

@@ -18,6 +18,7 @@ module Rich
         end
         
         ::Jzip::Engine.add_template_location({File.join(File.dirname(__FILE__), "..", "..", "assets", "jzip") => File.join(RAILS_ROOT, "public", "javascripts")})
+        ::Formtastic::SemanticFormBuilder.escape_html_entities_in_hints_and_labels = false if ::Formtastic::SemanticFormBuilder.respond_to?(:escape_html_entities_in_hints_and_labels)
         
         load_i18n test_class
       end

data/lib/rich_i18n.rb

@@ -1,5 +1,10 @@
+require "jzip"
+
+require "formtastic"
+ActionView::Base.send :include, Formtastic::SemanticFormHelper
 
 require "rich/i18n"
 require "rich/i18n/core"
 require "rich/i18n/actionpack"
 require "rich/i18n/engine"
+require "rich/i18n/formtastic"

data/rails_generators/rich_i18n_translation/templates/model.rb

@@ -1,7 +1,7 @@
 class <%= model_class_name %> < ActiveRecord::Base
   
   def to_rich_cms_response(params)
-    {:value => value, :translations => Hash[*params[:derivative_keys].split(";").uniq.collect{|x| [x, x.t]}.flatten]}
+    {:value => value, :translations => Hash[*params[:derivative_keys].split(";").uniq.collect{|x| [x, x.t({:as => params[:editable_input_type]})]}.flatten]}
   end
   
 end

data/rich_i18n.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rich_i18n}
-  s.version = "1.2.2"
+  s.version = "1.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Paul Engel"]
-  s.date = %q{2010-10-09}
+  s.date = %q{2010-10-20}
   s.description = %q{Rich-i18n is a module of E9s (http://github.com/archan937/e9s) which enriches I18n, Formtastic, the String and Symbol classes. This simplifies internationalization of your Rails application making a Rails developers life much easier.}
   s.email = %q{paul.engel@holder.nl}
   s.extra_rdoc_files = [
@@ -90,21 +90,21 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<i18n>, ["= 0.3.7"])
-      s.add_runtime_dependency(%q<jzip>, [">= 1.0.10"])
+      s.add_runtime_dependency(%q<formtastic>, ["= 1.0.1"])
       s.add_runtime_dependency(%q<hpricot>, [">= 0"])
-      s.add_runtime_dependency(%q<formtastic>, ["= 0.9.7"])
+      s.add_runtime_dependency(%q<i18n>, [">= 0.3.7"])
+      s.add_runtime_dependency(%q<jzip>, [">= 1.0.10"])
     else
-      s.add_dependency(%q<i18n>, ["= 0.3.7"])
-      s.add_dependency(%q<jzip>, [">= 1.0.10"])
+      s.add_dependency(%q<formtastic>, ["= 1.0.1"])
       s.add_dependency(%q<hpricot>, [">= 0"])
-      s.add_dependency(%q<formtastic>, ["= 0.9.7"])
+      s.add_dependency(%q<i18n>, [">= 0.3.7"])
+      s.add_dependency(%q<jzip>, [">= 1.0.10"])
     end
   else
-    s.add_dependency(%q<i18n>, ["= 0.3.7"])
-    s.add_dependency(%q<jzip>, [">= 1.0.10"])
+    s.add_dependency(%q<formtastic>, ["= 1.0.1"])
     s.add_dependency(%q<hpricot>, [">= 0"])
-    s.add_dependency(%q<formtastic>, ["= 0.9.7"])
+    s.add_dependency(%q<i18n>, [">= 0.3.7"])
+    s.add_dependency(%q<jzip>, [">= 1.0.10"])
   end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rich_i18n
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 1
   - 2
-  - 2
-  version: 1.2.2
+  - 3
+  version: 1.2.3
 platform: ruby
 authors: 
 - Paul Engel
@@ -15,27 +15,27 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-09 00:00:00 +02:00
+date: 2010-10-20 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: i18n
+  name: formtastic
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 29
+        hash: 21
         segments: 
+        - 1
         - 0
-        - 3
-        - 7
-        version: 0.3.7
+        - 1
+        version: 1.0.1
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: jzip
+  name: hpricot
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -44,40 +44,40 @@ dependencies:
       - !ruby/object:Gem::Version 
         hash: 3
         segments: 
-        - 1
         - 0
-        - 10
-        version: 1.0.10
+        version: "0"
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: hpricot
+  name: i18n
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 29
         segments: 
         - 0
-        version: "0"
+        - 3
+        - 7
+        version: 0.3.7
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: formtastic
+  name: jzip
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 53
+        hash: 3
         segments: 
+        - 1
         - 0
-        - 9
-        - 7
-        version: 0.9.7
+        - 10
+        version: 1.0.10
   type: :runtime
   version_requirements: *id004
 description: Rich-i18n is a module of E9s (http://github.com/archan937/e9s) which enriches I18n, Formtastic, the String and Symbol classes. This simplifies internationalization of your Rails application making a Rails developers life much easier.