rich_i18n 1.3.2 → 1.3.3

data/CHANGELOG

@@ -1,5 +1,10 @@
 = Rich-i18n CHANGELOG
 
+== Version 1.3.3 (November 10, 2010)
+
+* Fixed the disappearing translations after updating them in the front-end by delegating :as_json to @string
+* Being able to preserve the :capitalize option of translations which fixes the downcased translation after updating a Formtastic label
+
 == Version 1.3.2 (November 9, 2010)
 
 * Fixed the Rails generators once and for all

data/VERSION

@@ -1 +1 @@
-1.3.2
+1.3.3

data/lib/generators/rich/translation/templates/model.rb

@@ -1,7 +1,8 @@
 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({:as => params[:editable_input_type]})]}.flatten]}
+    options = {:as => params[:editable_input_type], :capitalize => %w(true 1).include?(params[:capitalize])}
+    {:value => value, :translations => Hash[*params[:derivative_keys].split(";").uniq.collect{|x| [x, x.t(options)]}.flatten]}
   end
 
 end

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

@@ -4,7 +4,9 @@ module Rich
     module Core
 
       class EnrichedString
+
         attr_reader :meta_data, :merged_strings
+        delegate :as_json, :to_json, :to_str, :to => :@string
 
         def initialize(string = "", meta = nil, merged = nil)
           @string         = string.dup
@@ -32,10 +34,6 @@ module Rich
           dup.concat(other)
         end
 
-        def to_str
-          @string
-        end
-
         def to_s
           (@merged_strings || [self]).collect(&:to_tag).join("").html_safe
         end
@@ -58,7 +56,7 @@ module Rich
           tag   = :i18n
           attrs = []
 
-          keys  = [:key, :value, :locale, :derivative_key]
+          keys  = [:key, :value, :locale, :derivative_key, :capitalize]
           data  = @meta_data.reject{|k, v| !keys.include?(k.to_sym)}
 
           data[:editable_input_type] = editable_input_type

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

@@ -69,7 +69,7 @@ module Rich
           private
 
             RICH_I18N_OPTIONS = %w(count pluralize capitalize translate_callback)
-            RICH_CMS_OPTIONS  = %w(tag html as)
+            RICH_CMS_OPTIONS  = %w(tag html as capitalize)
 
             LOGGER_PROC = Proc.new{|translation, key, options| Rich::I18n::Engine.logger.try :info, "== RICH-I18N: I18n.t #{key.inspect}, #{options.inspect}"}
 

data/rails_generators/rich_i18n_translation/templates/model.rb

@@ -1,7 +1,8 @@
 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({:as => params[:editable_input_type]})]}.flatten]}
+    options = {:as => params[:editable_input_type], :capitalize => %w(true 1).include?(params[:capitalize])}
+    {:value => value, :translations => Hash[*params[:derivative_keys].split(";").uniq.collect{|x| [x, x.t(options)]}.flatten]}
   end
 
 end

data/rich_i18n.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rich_i18n}
-  s.version = "1.3.2"
+  s.version = "1.3.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Paul Engel"]
-  s.date = %q{2010-11-09}
+  s.date = %q{2010-11-10}
   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 = [

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rich_i18n
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 1
   - 3
-  - 2
-  version: 1.3.2
+  - 3
+  version: 1.3.3
 platform: ruby
 authors: 
 - Paul Engel
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-09 00:00:00 +01:00
+date: 2010-11-10 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency