locale_rails 0.1.0 → 2.0.0

data/ChangeLog

@@ -1,7 +1,13 @@
-2008-12-01  Masao Mutoh  <mutoh@highway.ne.jp>
+= locale_rails-2.0.0 (2009-03-22)
 
-	* Fix a trivial bug.
+* I18n.translate fallbacks to the localized message in the locale candidates.
+* Support localized view both of gettext-1.93.0 style and rails-2.3.x style.
 
-2008-11-24  Masao Mutoh  <mutoh@highway.ne.jp>
+= locale_rails-0.1.0 (2008-12-04)
+
+* Initial released.
+* Auto-Detect the locales from the WWW browser
+* Localized Routes
+* Action/Fragment caching
+* Separated Localized View template file
 
-	* Initial import.

data/{README → README.rdoc}

@@ -10,6 +10,7 @@ auto-detection and some other features includes this library.
 * Action/Fragment caching
 * Separated Localized View template file
 * Localized Routes
+* I18n.t fallback to localized message candidates.
 
 == Website
 * http://www.yotabanana.com/hiki/ruby-locale-rails.html
@@ -25,9 +26,13 @@ auto-detection and some other features includes this library.
   ($ su)
    # gem install locale_rails
 
+== Support matrix
+* locale_rails-0.1.0 - rails-2.1.x
+* locale_rails-2.0.0 - rails-2.3.2
+
 == License
 This program is licenced under the same licence as Ruby.
 (See the file 'COPYING'.)
 
 == Maintainer
-Masao Mutoh <mutoh at highway.ne.jp>
+Masao Mutoh <mutomasa at gmail.com>

data/Rakefile

@@ -12,7 +12,7 @@ require 'locale_rails/version'
 #task :default => [ :test ]
 
 PKG_NAME = "locale_rails"
-PKG_VERSION = Locale::LOCALE_RAILS_VERSION
+PKG_VERSION = LocaleRails::VERSION
 
 # Run the unit tests
 task :test do 
@@ -35,19 +35,19 @@ Rake::RDocTask.new { |rdoc|
   rdoc.template = allison if allison.size > 0
 }
 
-desc "Create gem"
+desc "Create gem and tar.gz"
 spec = Gem::Specification.new do |s|
   s.name = PKG_NAME
   s.version = PKG_VERSION
   s.summary = 'Ruby-Locale for Ruby on Rails is the pure ruby library which provides basic functions for localization based on Ruby-Locale.'
   s.author = 'Masao Mutoh'
-  s.email = 'mutoh@highway.ne.jp'
+  s.email = 'mutomasa at gmail.com'
   s.homepage = 'http://locale.rubyforge.org/'
   s.rubyforge_project = "locale"
-  s.files = FileList['**/*'].to_a.select{|v| v !~ /pkg|CVS/}
+  s.files = FileList['**/*'].to_a.select{|v| v !~ /pkg|CVS|git/}
   s.require_path = 'lib'
   s.bindir = 'bin'
-  s.add_dependency('locale', '>= 0.9.0')
+  s.add_dependency('locale', '>= 2.0.0')
   s.has_rdoc = true
   s.description = <<-EOF
     Ruby-Locale for Ruby on Rails is the pure ruby library which provides basic functions for localization.
@@ -65,8 +65,9 @@ task :release => [ :package ] do
   require 'rubyforge'
 
   rubyforge = RubyForge.new
+  rubyforge.configure
   rubyforge.login
-  rubyforge.add_release("locale", "locale",
-                        "Ruby-Locale for Ruby on Rails #{PKG_VERSION}",
+  rubyforge.add_release("locale", "locale_rails",
+                        PKG_VERSION,
                         "pkg/#{PKG_NAME}-#{PKG_VERSION}.gem")
 end

data/lib/locale_rails.rb

@@ -2,7 +2,9 @@ require 'locale'
 
 Locale.init(:driver => :cgi)
 
-["i18n", "action_controller", "action_view", "version"].each do  |lib|
+# localized view support was canceled.
+#["i18n", "action_controller", "action_view", "version"].each do  |lib|
+["i18n", "action_controller", "version"].each do  |lib|
   require File.join(File.dirname(__FILE__), "locale_rails", lib)
 end
 

data/lib/locale_rails/action_controller.rb

@@ -1,141 +1,15 @@
 =begin
-  locale_rails/lib/action_controller.rb - Ruby/Locale for "Ruby on Rails"
+  lib/locale_rails/action_controller.rb - Ruby/Locale for "Ruby on Rails"
 
-  Copyright (C) 2008  Masao Mutoh
+  Copyright (C) 2008-2009  Masao Mutoh
 
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
 
-  $Id: action_controller.rb 25 2008-11-30 15:44:24Z mutoh $
 =end
 
 require 'action_controller'
-
-module ActionController #:nodoc:
-  class Base
-    
-    prepend_before_filter :init_locale
-
-    def self.locale_filter_chain # :nodoc:
-      if chain = read_inheritable_attribute('locale_filter_chain')
-	return chain
-      else
-        write_inheritable_attribute('locale_filter_chain', FilterChain.new)
-        return locale_filter_chain
-      end
-    end
-
-    def init_locale # :nodoc:
-      cgi = nil
-      if defined? request.cgi
-        cgi = request.cgi
-      end
-
-      fchain = self.class.locale_filter_chain
-      run_before_filters(fchain.select(&:before?), 0, 0)
-
-      cgi.params["lang"] = [params["lang"]] if params["lang"]
-      Locale.set_cgi(cgi)
-      if cgi.params["lang"]
-        I18n.locale = cgi.params["lang"][0]
-      else
-        I18n.locale = nil
-      end
-
-      run_after_filters(fchain.select(&:after?), 0)
-    end
-
-    # Append a block which is called before initializing locale on each WWW request.
-    #
-    # (e.g.)
-    #   class ApplicationController < ActionController::Base
-    #     def before_init_i18n
-    #       if (cookies["lang"].nil? or cookies["lang"].empty?)
-    #         params["lang"] = "ko_KR"
-    #       end
-    #     end
-    #     before_init_locale :before_init_i18n
-    #     # ...
-    #   end
-    def self.before_init_locale(*filters, &block)
-      locale_filter_chain.append_filter_to_chain(filters, :before, &block)
-    end
-
-    # Append a block which is called after initializing locale on each WWW request.
-    #
-    # (e.g.)
-    #   class ApplicationController < ActionController::Base
-    #     def after_init_i18n
-    #       L10nClass.new(locale_candidates)
-    #     end
-    #     after_init_locale :after_init_i18n
-    #     # ...
-    #   end
-    def self.after_init_locale(*filters, &block)
-      locale_filter_chain.append_filter_to_chain(filters, :after, &block)
-    end
-  end
-
-  class TestRequest < AbstractRequest  #:nodoc:
-    class LocaleMockCGI < CGI #:nodoc:
-      attr_accessor :stdinput, :stdoutput, :env_table
-      
-      def initialize(env, input=nil)
-        self.env_table = env
-        self.stdinput = StringIO.new(input || "")
-        self.stdoutput = StringIO.new
-        
-        super()
-      end
-    end
-
-    @cgi = nil
-    def cgi
-      unless @cgi
-        @cgi = LocaleMockCGI.new("REQUEST_METHOD" => "GET",
-                                  "QUERY_STRING"   => "",
-                                  "REQUEST_URI"    => "/",
-                                  "HTTP_HOST"      => "www.example.com",
-                                  "SERVER_PORT"    => "80",
-                                  "HTTPS"          => "off")
-      end
-      @cgi
-    end
-  end
-
-  module Caching
-    module Fragments
-      def fragment_cache_key_with_locale(name) 
-        ret = fragment_cache_key_without_locale(name)
-        if ret.is_a? String
-          ret.gsub(/:/, ".") << "_#{I18n.candidates}"
-        else
-          ret
-        end
-      end
-      alias_method_chain :fragment_cache_key, :locale
-
-      def expire_fragment_with_locale(name, options = nil)
-        return unless perform_caching
-
-        fc_store = (respond_to? :cache_store) ? cache_store : fragment_cache_store
-        key = name.is_a?(Regexp) ? name : fragment_cache_key_without_locale(name)
-        if key.is_a?(Regexp)
-          self.class.benchmark "Expired fragments matching: #{key.source}" do
-            fc_store.delete_matched(key, options)
-          end
-        else
-          key = key.gsub(/:/, ".")
-          self.class.benchmark "Expired fragment: #{key}, lang = #{I18n.supported_locales}" do
-            supported_locales.each do |lang|
-              fc_store.delete("#{key}_#{lang}", options)
-            end
-          end
-        end
-      end
-      alias_method_chain :expire_fragment, :locale
-    end
-  end
+["base", "caching", "test_process"].each do  |lib|
+  require File.join(File.dirname(__FILE__), "action_controller", lib)
 end
 
-

data/lib/locale_rails/action_controller/base.rb

@@ -0,0 +1,85 @@
+=begin
+  lib/locale_rails/action_controller/base.rb - Ruby/Locale for "Ruby on Rails"
+
+  Copyright (C) 2008  Masao Mutoh
+
+  You may redistribute it and/or modify it under the same
+  license terms as Ruby.
+
+  $Id: action_controller.rb 25 2008-11-30 15:44:24Z mutoh $
+=end
+
+require 'action_controller'
+
+module ActionController #:nodoc:
+  class Base
+    
+    prepend_before_filter :init_locale
+
+    def self.locale_filter_chain # :nodoc:
+      if chain = read_inheritable_attribute('locale_filter_chain')
+        return chain
+      else
+        write_inheritable_attribute('locale_filter_chain', FilterChain.new)
+        return locale_filter_chain
+      end
+    end
+
+    def init_locale # :nodoc:
+      cgi = nil
+      if defined? ::Rack
+        cgi = request
+      else
+        if defined? request.cgi
+          cgi = request.cgi
+        end
+      end
+
+      fchain = self.class.locale_filter_chain
+      run_before_filters(fchain.select(&:before?), 0, 0)
+
+      cgi.params["lang"] = [params["lang"]] if params["lang"]
+      Locale.set_cgi(cgi)
+      if cgi.params["lang"]
+        I18n.locale = cgi.params["lang"][0]
+      else
+        I18n.locale = nil
+      end
+
+      run_after_filters(fchain.select(&:after?), 0)
+    end
+
+    # Append a block which is called before initializing locale on each WWW request.
+    #
+    # (e.g.)
+    #   class ApplicationController < ActionController::Base
+    #     def before_init_i18n
+    #       if (cookies["lang"].nil? or cookies["lang"].empty?)
+    #         params["lang"] = "ko_KR"
+    #       end
+    #     end
+    #     before_init_locale :before_init_i18n
+    #     # ...
+    #   end
+    def self.before_init_locale(*filters, &block)
+      locale_filter_chain.append_filter_to_chain(filters, :before, &block)
+    end
+
+    # Append a block which is called after initializing locale on each WWW request.
+    #
+    # (e.g.)
+    #   class ApplicationController < ActionController::Base
+    #     def after_init_i18n
+    #       L10nClass.new(locale_candidates)
+    #     end
+    #     after_init_locale :after_init_i18n
+    #     # ...
+    #   end
+    def self.after_init_locale(*filters, &block)
+      locale_filter_chain.append_filter_to_chain(filters, :after, &block)
+    end
+  end
+
+end
+
+

data/lib/locale_rails/action_controller/caching.rb

@@ -0,0 +1,49 @@
+=begin
+  lib/locale_rails/action_controller.rb - Ruby/Locale for "Ruby on Rails"
+
+  Copyright (C) 2008  Masao Mutoh
+
+  You may redistribute it and/or modify it under the same
+  license terms as Ruby.
+
+  $Id: action_controller.rb 25 2008-11-30 15:44:24Z mutoh $
+=end
+
+require 'action_controller/caching'
+
+module ActionController #:nodoc:
+
+  module Caching
+    module Fragments
+      def fragment_cache_key_with_locale(name) 
+        ret = fragment_cache_key_without_locale(name)
+        if ret.is_a? String
+          ret.gsub(/:/, ".") << "_#{I18n.candidates}"
+        else
+          ret
+        end
+      end
+      alias_method_chain :fragment_cache_key, :locale
+
+      def expire_fragment_with_locale(name, options = nil)
+        return unless perform_caching
+
+        fc_store = (respond_to? :cache_store) ? cache_store : fragment_cache_store
+        key = name.is_a?(Regexp) ? name : fragment_cache_key_without_locale(name)
+        if key.is_a?(Regexp)
+          self.class.benchmark "Expired fragments matching: #{key.source}" do
+            fc_store.delete_matched(key, options)
+          end
+        else
+          key = key.gsub(/:/, ".")
+          self.class.benchmark "Expired fragment: #{key}, lang = #{I18n.supported_locales}" do
+            supported_locales.each do |lang|
+              fc_store.delete("#{key}_#{lang}", options)
+            end
+          end
+        end
+      end
+      alias_method_chain :expire_fragment, :locale
+    end
+  end
+end

data/lib/locale_rails/action_controller/test_process.rb

@@ -0,0 +1,44 @@
+=begin
+  lib/locale_rails/action_controller.rb - Ruby/Locale for "Ruby on Rails"
+
+  Copyright (C) 2009  Masao Mutoh
+
+  You may redistribute it and/or modify it under the same
+  license terms as Ruby.
+
+=end
+
+require 'action_controller'
+require 'action_controller/test_process'
+
+module ActionController
+  if defined? AbstractRequest  #:nodoc:
+    # for Rails-2.2.x or earlier. 
+    class TestRequest < AbstractRequest  #:nodoc:
+      class LocaleMockCGI < CGI #:nodoc:
+        attr_accessor :stdinput, :stdoutput, :env_table
+        
+        def initialize(env, input=nil)
+          self.env_table = env
+          self.stdinput = StringIO.new(input || "")
+          self.stdoutput = StringIO.new
+          
+          super()
+        end
+      end
+
+      @cgi = nil
+      def cgi
+        unless @cgi
+          @cgi = LocaleMockCGI.new("REQUEST_METHOD" => "GET",
+                                   "QUERY_STRING"   => "",
+                                   "REQUEST_URI"    => "/",
+                                   "HTTP_HOST"      => "www.example.com",
+                                   "SERVER_PORT"    => "80",
+                                   "HTTPS"          => "off")
+        end
+        @cgi
+      end
+    end
+  end
+end

data/lib/locale_rails/action_view.rb

@@ -8,36 +8,34 @@
 
   Original: Ruby-GetText-Package-1.92.0
 
-  $Id: action_view.rb 23 2008-11-24 09:22:35Z mutoh $
 =end
 
 require 'action_view'
 
 module ActionView #:nodoc:
-  class Base
-    def _pick_template_with_locale_main(template_path, tags)
-      path = template_path.sub(/^\//, '')
+   class PathSet < Array
+
+     def find_template_with_locale_rails(original_template_path, format = nil, html_fallback = true)
+      return original_template_path if original_template_path.respond_to?(:render)
+
+      path = original_template_path.sub(/^\//, '')
       if m = path.match(/(.*)\.(\w+)$/)
         template_file_name, template_file_extension = m[1], m[2]
       else
         template_file_name = path
       end
  
-      tags.each do |v|
+      I18n.candidates.each do |v|
         file_name = "#{template_file_name}_#{v}"
 	begin
-          return _pick_template_without_locale(file_name)
+          return find_template_without_locale_rails(file_name, format, false)
         rescue MissingTemplate => e
 	end
       end
-      _pick_template_without_locale(template_path)
+      find_template_without_locale_rails(original_template_path, format, html_fallback)
     end
-    memoize :_pick_template_with_locale_main
+    alias_method_chain :find_template, :locale_rails
 
-    def _pick_template_with_locale(template_path) #: shouldn't memoize.
-      _pick_template_with_locale_main(template_path, I18n.candidates)
-    end
-    alias_method_chain :_pick_template, :locale
   end
 end