locale_rails 2.0.1 → 2.0.2

data/ChangeLog

@@ -1,3 +1,8 @@
+= locale_rails-2.0.2 (2009-05-04)
+ * Remove I18n.candidates. Use Locale.candidates directly.
+ * Improve documentations.
+ * Override I18n.default_locale= to call Locale.default.
+
 = locale_rails-2.0.1 (2009-04-17)
  * Fixed to work localized view which was canceled.
 

data/README.rdoc

@@ -26,10 +26,26 @@ auto-detection and some other features includes this library.
   ($ su)
    # gem install locale_rails
 
+== Usage
+==== config/environment.rb
+  Rails::Initializer.run do |config|
+    :
+    :
+    config.gem 'locale'
+    config.gem 'locale_rails'
+  end
+
+==== config/initializer/locale.rb
+
+ # Tell the I18n library where to find your translations
+ I18n.supported_locales = ["ja", "en"]
+ I18n.default_locale = "ja" 
+
 == Support matrix
-* locale_rails-0.1.0 - rails-2.1.x
-* locale_rails-2.0.0 - rails-2.3.2
+* locale_rails-2.0.2 - rails-2.3.2
 * locale_rails-2.0.1 - rails-2.3.2
+* locale_rails-2.0.0 - rails-2.3.2
+* locale_rails-0.1.0 - rails-2.1.x
 
 == License
 This program is licenced under the same licence as Ruby.

data/Rakefile

@@ -47,7 +47,7 @@ spec = Gem::Specification.new do |s|
   s.files = FileList['**/*'].to_a.select{|v| v !~ /pkg|CVS|git/}
   s.require_path = 'lib'
   s.bindir = 'bin'
-  s.add_dependency('locale', '>= 2.0.1')
+  s.add_dependency('locale', '>= 2.0.2')
   s.has_rdoc = true
   s.description = <<-EOF
     Ruby-Locale for Ruby on Rails is the pure ruby library which provides basic functions for localization.

data/lib/locale_rails/action_controller/base.rb

@@ -70,7 +70,7 @@ module ActionController #:nodoc:
     # (e.g.)
     #   class ApplicationController < ActionController::Base
     #     def after_init_i18n
-    #       L10nClass.new(locale_candidates)
+    #       L10nClass.new(Locale.candidates)
     #     end
     #     after_init_locale :after_init_i18n
     #     # ...

data/lib/locale_rails/action_view.rb

@@ -25,7 +25,7 @@ module ActionView #:nodoc:
         template_file_name = path
       end
  
-      I18n.candidates.each do |v|
+      Locale.candidates.each do |v|
         file_name = "#{template_file_name}_#{v}"
 	begin
           return find_template_without_locale_rails(file_name, format, false)

data/lib/locale_rails/i18n.rb

@@ -10,18 +10,23 @@
 =end
 
 module I18n
-  @@supported_locales = nil
   module_function
 
   # Gets the supported locales.
   def supported_locales 
-    @@supported_locales
+    Locale.app_language_tags
+  end
+
+  # Sets the supported locales.
+  #  I18n.set_supported_locales("ja-JP", "ko-KR", ...)
+  def set_supported_locales(*tags)
+    Locale.set_app_language_tags(*tags)
   end
 
   # Sets the supported locales as an Array.
-  #  I18n.supported_locales = ["ja-JP", "ko-KR"]
+  #  I18n.supported_locales = ["ja-JP", "ko-KR", ...]
   def supported_locales=(tags)
-    @@supported_locales = tags
+    Locale.set_app_language_tags(*tags)
   end
 
   # Sets the locale.
@@ -30,35 +35,23 @@ module I18n
     Locale.clear
     tag = Locale::Tag::Rfc.parse(tag.to_s) if tag.kind_of? Symbol
     Locale.current = tag
-    Thread.current[:locale] = candidates(:rfc)[0]
-  end
-  
-  # Get the locale candidates as a Locale::TagList.
-  # This is the utility function which calls Locale.candidates with
-  # supported_language_tags.
-  #
-  # I18n.locale is also overrided by Ruby-Locale and it returns 
-  # the result of this method with :rfc option.
-  # 
-  # +type+ :simple, :common(default), :rfc, :cldr.
-  # 
-  # This is used by Rails application, but it may be better not to
-  # use this method in Rails plugins/libraries, because they have their
-  # own supported languages. 
-  def candidates(type = :common)
-    default = [I18n.default_locale.to_s]
-    default = ["en-US", "en"] if default[0] == "en-US"
-    Locale.candidates(:type => type, 
-                      :supported_language_tags => supported_locales,
-                      :default_language_tags => default)
+    Thread.current[:locale] = Locale.candidates(:type => :rfc)[0]
   end
 
+  # Sets the default locale.
+  #  I18n.default_locale = "ja"
+  def default_locale=(tag)
+    tag = Locale::Tag::Rfc.parse(tag.to_s) if tag.kind_of? Symbol
+    Locale.default = tag
+    @@default_locale = tag
+  end
+  
   class << self
 
     # MissingTranslationData is overrided to fallback messages in candidate locales.
     def locale_rails_exception_handler(exception, locale, key, options) #:nodoc:
       ret = nil
-      candidates(:rfc).each do |loc|
+      Locale.candidates(:type => :rfc).each do |loc|
         begin
           ret = backend.translate(loc, key, options)
           break

data/lib/locale_rails/version.rb

@@ -1,4 +1,4 @@
 module LocaleRails
   RAILS_VERSION = "2.3.2"
-  VERSION = "2.0.1"
+  VERSION = "2.0.2"
 end

data/sample/app/controllers/application.rb

@@ -16,6 +16,7 @@ class ApplicationController < ActionController::Base
   # Set the charset of Content-Type.
   # This is not Ruby-Locale method but useful.
 #  self.default_charset = "iso8859-1"
+   #I18n.supported_locales = ["en", "ja", "fr"]
 
 =begin
   def before_init_i18n

data/sample/app/views/samples/_part.html.erb

@@ -3,14 +3,14 @@
 %>
 
 <h2>Get the current locale</h2>
-<h3>I18n.candidates(with no option)</h3>
+<h3>Locale.candidates(with no option)</h3>
 <p>Requested Locales order by the priority. This method is added by Ruby-Locale for Ruby on Rails.</p>
 <div class="result">
-<%=h I18n.candidates.inspect %>
+<%=h Locale.candidates.inspect %>
 </div>
 
 <h3>I18n.locale (with inspect)</h3>
-<p>I18n.locale is set the result(Locale::TagList) of locale_candidates(:type => :rfc).<br/>
+<p>I18n.locale is set the result(Locale::TagList) of Locale.candidates(:type => :rfc).<br/>
 This method is extended by Ruby-Locale for Ruby on Rails and returns all candidates as the Locale::TagList.
 </p>
 <div class="result">

data/sample/app/views/samples/index.html.erb

@@ -13,7 +13,7 @@
 </table>
 <p>
 (*1) Fallback to "en" if the localized message is not found in the locale.
-Currently, <%= Dir.glob(File.join(RAILS_ROOT, "config/locales/*.yml")).collect {|v| File.basename(v, ".yml")}.inspect %> are supported.
+Currently, <%= Dir.glob(File.join(RAILS_ROOT, "config/locales/*.yml")).collect {|v| File.basename(v, ".yml")}.inspect %> are available.
 </p>
 
 <%= render :partial => 'part' %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: locale_rails
 version: !ruby/object:Gem::Version 
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors: 
 - Masao Mutoh
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-18 00:00:00 +09:00
+date: 2009-05-09 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.0.1
+        version: 2.0.2
     version: 
 description: Ruby-Locale for Ruby on Rails is the pure ruby library which provides basic functions for localization.
 email: mutomasa at gmail.com