rich_i18n 1.2.3 → 1.3.0

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

@@ -0,0 +1,18 @@
+
+module Rich
+  module I18n
+    module Core
+      module String
+        module HtmlSafe
+
+          unless ::String.new.respond_to? :html_safe
+            def html_safe
+              self
+            end
+          end
+
+        end
+      end
+    end
+  end
+end

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

@@ -4,37 +4,37 @@ module Rich
     module Core
       module String
         module Inflections
-          
+
           # -- start FIXME: these methods are also defined in rich_pluralization
-        
+
           def upcase_first
             empty? ?
               self :
               self[0].chr.capitalize + self[1, size]
           end
-  
+
           def cp_case(s)
             send((:downcase unless s.dup.downcase!) || (:upcase unless s.dup.upcase!) || (:upcase_first unless s.dup.upcase_first!) || :to_s)
           end
-  
+
           def upcase_first!
             self == (result = upcase_first) ? nil : replace(result)
           end
-  
+
           def cp_case!(s)
             self == (result = cp_case(s))   ? nil : replace(result)
           end
-          
+
           # -- end
-  
+
           def singularize!
             downcase == (result = singularize).downcase ? nil : replace(result)
           end
-  
+
           def pluralize!
             downcase == (result = pluralize).downcase   ? nil : replace(result)
           end
-                
+
         end
       end
     end

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

@@ -12,24 +12,24 @@ module Rich
               cattr_accessor :i18n_translations
             end
           end
-          
+
           module ClassMethods
             def clear_translations
               i18n_translations.clear
             end
           end
-          
+
           module InstanceMethods
             def t(options = {})
               self.split(" ").inject([]) do |array, string|
                 key              = string.include?(".") ? string.dup : "word.#{string}"
                 default          = key.split(".").last
                 translating_word = key.starts_with?("word.")
-    
+
                 key.downcase! unless string.match(/^(label|seatholder)\./)
 
                 options[:pluralize]            = "".respond_to?(:pl) && (options[:pluralize].nil? || options[:pluralize])
-                options[:translate_callback] ||= LOGGER_PROC if RAILS_ENV == "development"
+                options[:translate_callback] ||= LOGGER_PROC if Rails.env.development?
 
                 if options.include? :default
                   options[:default] = [options[:default]].flatten << default.humanize
@@ -39,14 +39,14 @@ module Rich
                 else
                   s = i18n_t key, options.merge({:default => translating_word ? "" : default.humanize})
                   value = s.dup
-    
+
                   if translating_word
                     unless (translated = !s.empty?) or !"".respond_to?(:pl)
                       key.singularize!
                       s = i18n_t key, options.merge({:default => ""})
                       value = s.dup
                     end
-      
+
                     if s.empty?
                       s = default.humanize
                       value = s.dup
@@ -55,31 +55,33 @@ module Rich
                     end
                   end
                 end
-      
+
                 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, options.reject{|k, v| !%w(html as).include? k.to_s}.merge({:key => key, :value => value, :locale => I18n.locale, :derivative_key => string}))
-      
+                array << EnrichedString.new(s, options.reject{|k, v| !RICH_CMS_OPTIONS.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, :html, :as]
-            LOGGER_PROC = Proc.new{|translation, key, options| puts "== RICH-I18N: I18n.t #{key.inspect}, #{options.inspect}"}
-          
+            RICH_I18N_OPTIONS = %w(count pluralize capitalize translate_callback)
+            RICH_CMS_OPTIONS  = %w(tag html as)
+
+            LOGGER_PROC = Proc.new{|translation, key, options| Rich::I18n::Engine.logger.try :info, "== RICH-I18N: I18n.t #{key.inspect}, #{options.inspect}"}
+
             @@i18n_translations = {}
 
             def i18n_t(key, opts = {})
               options = opts.inject({}) do |hash, (k, v)|
                           # FIXME: this code is to handle interpolated translations... however, this needs to be refactored
-                          hash[k] = v.is_a?(String) && v.include?("<i18n") ? v.gsub(/(\<i18n[^\>]+\>)|(\<\/i18n\>)/, "") : v unless RICH_I18N_OPTIONS.include?(k)
+                          hash[k] = v.is_a?(String) && v.include?("<i18n") ? v.gsub(/(\<i18n[^\>]+\>)|(\<\/i18n\>)/, "") : v unless (RICH_I18N_OPTIONS + RICH_CMS_OPTIONS).include?(k.to_s)
                           hash
                         end
-            
+
               k = "#{I18n.locale} #{key.inspect}, #{options.inspect}"
               translation = if Engine.cache_translations
                               ((@@i18n_translations[I18n.locale.to_s.downcase] ||= {})[k] ||= I18n.t(key, options)).try :dup
@@ -87,11 +89,11 @@ module Rich
                               I18n.t key, options
                             end
               opts[:translate_callback].try :call, translation, key, options
-    
+
               translation
             end
           end
-                
+
         end
       end
     end

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

@@ -4,11 +4,11 @@ module Rich
     module Core
       module Symbol
         module Internationalization
-        
+
           def t(options = {})
             to_s.t options
           end
-        
+
         end
       end
     end

data/lib/rich/i18n/engine.rb

@@ -1,74 +1,84 @@
 
 module Rich
   module I18n
-    module Engine
-      extend self
-    
-      attr_accessor :enable_enriched_output, :cache_translations
-      
-      def init(test_class = nil)
-        @enable_enriched_output = true if @enable_enriched_output.nil?
-        @cache_translations     = true if @cache_translations    .nil?
-        
-        %w(controllers).each do |dir|
-          path = File.join File.dirname(__FILE__), "..", "..", "app", dir
-          $LOAD_PATH << path
-          ActiveSupport::Dependencies.load_paths << path
-          ActiveSupport::Dependencies.load_once_paths.delete path
+    class Engine < Rails::Engine
+
+      class << self
+
+        attr_accessor :logger, :enable_enriched_output, :cache_translations
+
+        def init(test_locale = nil)
+          @enable_enriched_output = true if @enable_enriched_output.nil?
+          @cache_translations     = true if @cache_translations    .nil?
+
+          %w(controllers).each do |dir|
+            path = File.join File.dirname(__FILE__), "..", "..", "app", dir
+            $LOAD_PATH << path
+            ActiveSupport::Dependencies.autoload_paths << path
+            ActiveSupport::Dependencies.autoload_once_paths.delete path
+          end
+
+          procedure = proc {
+            ::Jzip::Engine.add_template_location({File.expand_path("../../../../assets/jzip", __FILE__) => 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_locale
+            Rich::I18n::Engine.logger = Rails.logger
+          }
+
+          if Rails::VERSION::MAJOR >= 3
+            config.after_initialize do
+              procedure.call
+            end
+          else
+            procedure.call
+          end
+
+          test_locale
         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
-      
-      def current_controller=(current_controller)
-        @current_controller = current_controller
-        @can_enrich_output  = nil
-      end
-      
-      def load_i18n(test_class)
-        if test_class
-          test_locale = test_class.name.match(/(Rich\:\:I18n\:\:Test\:\:Locales\:\:)(\w+)/).captures[1].downcase.to_sym
-          
-          I18n.load_path  =    [File.join(File.dirname(__FILE__), "..", "..", "..", "locales", "#{test_locale}.yml")]
-        else
-          I18n.load_path += Dir[File.join(File.dirname(__FILE__), "..", "..", "..", "locales", "*.yml")]
+
+        def current_controller=(current_controller)
+          @current_controller = current_controller
+          @can_enrich_output  = nil
         end
 
-        I18n.backend.reload!
-        
-        test_locale
-      end
-    
-      def enable_i18n_cms(enriched_output_criteria = :current_rich_cms_admin, assign_i18n_backend = true)
-        raise "Missing E9s module Rich-CMS, please install first" unless defined?(Cms::Engine)
-        
-        self.enable_enriched_output = enriched_output_criteria
-        Cms::Engine.register ".i18n", {:class_name => "Translation", :key => [:key, :locale], :before_edit => "Rich.I18n.beforeEdit", :after_update => "Rich.I18n.afterUpdate"}
-        
-        # FIXME: the check is a dirty fix to be able to test all the E9s modules at once (find a better implementation)
-        if RAILS_ENV != "test" && assign_i18n_backend
-          ::I18n.backend = ::I18n::Backend::Chain.new ::I18n::Backend::ActiveRecord.new, ::I18n.backend
-          ::I18n.backend.extend ::I18n::Backend::Fallbacks
+        def load_i18n(test_locale)
+          if test_locale
+            I18n.load_path  =    [File.join(File.dirname(__FILE__), "..", "..", "..", "locales", "#{test_locale}.yml")]
+          else
+            I18n.load_path += Dir[File.join(File.dirname(__FILE__), "..", "..", "..", "locales", "*.yml")]
+          end
+          I18n.backend.reload!
+        end
+
+        def enable_i18n_cms(enriched_output_criteria = :current_rich_cms_admin, assign_i18n_backend = true)
+          raise "Missing E9s module Rich-CMS, please install first" unless defined?(Cms::Engine)
+
+          self.enable_enriched_output = enriched_output_criteria
+          Cms::Engine.register ".i18n", {:class_name => "Translation", :key => [:key, :locale], :before_edit => "Rich.I18n.beforeEdit", :after_update => "Rich.I18n.afterUpdate"}
+
+          # FIXME: the check is a dirty fix to be able to test all the E9s modules at once (find a better implementation)
+          if RAILS_ENV != "test" && assign_i18n_backend
+            ::I18n.backend = ::I18n::Backend::Chain.new ::I18n::Backend::ActiveRecord.new, ::I18n.backend
+            ::I18n.backend.extend ::I18n::Backend::Fallbacks
+          end
+        end
+
+        def enable_enriched_output=(value)
+          @enable_enriched_output = value
+          @can_enrich_output      = nil
         end
-      end
-      
-      def enable_enriched_output=(value)
-        @enable_enriched_output = value
-        @can_enrich_output      = nil
-      end
 
-      def can_enrich_output?
-        if @can_enrich_output.nil?
-          @can_enrich_output = !!@enable_enriched_output &&
-                                (@enable_enriched_output.is_a?(Symbol) ? (@current_controller.send(@enable_enriched_output) rescue false) : @enable_enriched_output)
-        else
-          @can_enrich_output
+        def can_enrich_output?
+          if @can_enrich_output.nil?
+            @can_enrich_output = !!@enable_enriched_output &&
+                                  (@enable_enriched_output.is_a?(Symbol) ? (@current_controller.send(@enable_enriched_output) rescue false) : @enable_enriched_output)
+          else
+            @can_enrich_output
+          end
         end
+
       end
-      
+
     end
   end
 end

data/lib/rich/i18n/formtastic.rb

@@ -2,7 +2,7 @@
 module Rich
   module I18n
     module Formtastic
-    
+
       def self.included(base)
         base.alias_method_chain :input, :enrichments
       end
@@ -13,39 +13,41 @@ module Rich
         method      = method_arg.to_s
         options     = args.extract_options!
         wrapper_tag = options.delete(:wrapper_tag)
-        
+
         unless options.include?(:label)
           keys = [:"label.#{object}.#{method}", :"label.#{method}", :"word.#{method}"]
-        
+
           if @options.include?(:name)
             keys.unshift :"label.forms.(#{@options[:name]}).#{method}"
             keys.unshift :"label.forms.(#{@options[:name]}).#{object}.#{method}"
           end
-        
-          options[:label] = keys.shift.t(:default => keys, :capitalize => true).to_output
+
+          options[:label] = keys.shift.t(:default => keys, :capitalize => true).to_s
         end
-      
+
         unless options.include?(:seatholder)
           keys = [:"seatholder.#{object}.#{method}", :"seatholder.#{method}", ""]
-        
+
           if @options.include?(:name)
             keys.unshift :"seatholder.forms.(#{@options[:name]}).#{method}"
             keys.unshift :"seatholder.forms.(#{@options[:name]}).#{object}.#{method}"
           end
-        
+
           seatholder = keys.shift.t :default => keys, :capitalize => true
-          options[:seatholder] = seatholder.to_output unless seatholder.empty? 
+          options[:seatholder] = seatholder.to_s unless seatholder.empty?
         end
-      
+
         (options[:input_html] ||= {}).store :seatholder, options.delete(:seatholder) unless @object && @object.respond_to?(:errors) && !@object.errors[method.to_sym].blank?
-      
+
         if (output = input_without_enrichments method_arg, options) and wrapper_tag
           output.gsub(/^\<li/, "<#{wrapper_tag}").gsub(/\<\/li\>$/, "</#{wrapper_tag}>")
         else
           output
         end
       end
-      
+
     end
-  end  
+  end
 end
+
+Formtastic::SemanticFormBuilder.send :include, Rich::I18n::Formtastic

data/lib/rich/i18n/rails.rb

@@ -0,0 +1 @@
+require File.join(File.dirname(__FILE__), "rails", "engine.rb")

data/lib/rich/i18n/rails/engine.rb

@@ -0,0 +1,5 @@
+
+unless defined?(Rails::Engine)
+  class Rails::Engine
+  end
+end

data/lib/rich_i18n.rb

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

data/locales/nl.yml

@@ -1,6 +1,6 @@
---- 
-nl: 
-  
+---
+nl:
+
   word:
     "yes":    ja
     "no":     nee

data/rails_generators/rich_i18n_translation/rich_i18n_translation_generator.rb

@@ -12,12 +12,12 @@ class RichI18nTranslationGenerator < Rails::Generator::Base
       m.migration_template "migration.rb", "db/migrate", :migration_file_name => migration_file_name
     end
   end
-  
+
   def after_generate
     File.open(destination_path("config/initializers/enrichments.rb"), "a+") do |file|
       file << "\nRich::I18n::Engine.enable_i18n_cms"
     end
-    
+
     system "rake db:migrate" if options[:migrate]
   end
 
@@ -28,7 +28,7 @@ class RichI18nTranslationGenerator < Rails::Generator::Base
   def model_class_name
     @name.classify
   end
-  
+
   def table_name
     model_file_name.gsub("/", "_").pluralize
   end