gettext_rails 2.0.0 → 2.0.1

data/ChangeLog

@@ -1,3 +1,12 @@
+= gettext_rails-2.0.1 (2009-04-18)
+ * Fix bugs
+    * ActionMailer didn't work.  [Reported by Simone Carletti]
+    * error_messages_for doesn't have compatibility with original method. [by
+    Adam Ilan]
+
+Thanks to:
+  Simone Carletti, Adam Ilan
+
 = gettext_rails-2.0.0 (2009-03-22)
 
 * Support Rails-2.3.2.

data/README.rdoc

@@ -30,17 +30,12 @@ using Ruby-GetText-Package.
     (sudo/su on POSIX system)
     gem uninstall gettext
 
-    #from github (edge/unstable)
+    #from github (edge/unstable)  (not supported yet)
     (sudo/su on POSIX system)
-    gem install gettext
-    gem install gettext_activerecord
-    gem install gettext_rails
-    gem install mutoh-gettext_rails -s http://gems.github.com/
+    #gem install mutoh-gettext_rails -s http://gems.github.com/
 
     #from rubyforge (stable)
     (sudo/su on POSIX system)
-    gem install gettext
-    gem install gettext_activerecord
     gem install gettext_rails
 
 == Usage
@@ -89,6 +84,7 @@ end
 See {Ruby-GetText-Package HOWTO for Ruby on Rails}[http://www.yotabanana.com/hiki/ruby-gettext-howto-rails.html] for more details.
 
 == Support matrix
+* gettext_rails-2.0.1 - rails-2.3.2
 * gettext_rails-2.0.0 - rails-2.3.2
 
 == License

data/Rakefile

@@ -71,8 +71,8 @@ spec = Gem::Specification.new do |s|
   s.homepage = 'http://gettext.rubyforge.org/'
   s.rubyforge_project = "gettext"
   s.files = FileList['**/*'].to_a.select{|v| v !~ /pkg|git/}
-  s.add_dependency('gettext_activerecord', '>= 2.0.0')
-  s.add_dependency('locale_rails', '>= 2.0.0')
+  s.add_dependency('gettext_activerecord', '>= 2.0.1')
+  s.add_dependency('locale_rails', '>= 2.0.1')
   s.add_dependency('rails', '>= 2.3.2')
   s.require_path = 'lib'
   s.has_rdoc = true
@@ -94,13 +94,13 @@ Rake::RDocTask.new { |rdoc|
   rdoc.rdoc_dir = 'doc'
   rdoc.title    = "gettext_rails API Reference"
   rdoc.options << '--line-numbers' << '--inline-source'
-  rdoc.rdoc_files.include('README', 'ChangeLog')
+  rdoc.rdoc_files.include('README.rdoc', 'ChangeLog')
   rdoc.rdoc_files.include('lib/**/*.rb')
   rdoc.template = allison if allison.size > 0
 }
 
 desc "Publish the release files to RubyForge."
-task :release => [ :package ] do
+task :release => [:makemo, :package ] do
   require 'rubyforge'
 
   rubyforge = RubyForge.new

data/lib/gettext_rails/action_mailer.rb

@@ -27,7 +27,7 @@ if defined? ActionMailer
       end
       
       def create_with_gettext!(*arg) #:nodoc:
-	create_bang_without_gettext(*arg)
+	create_without_gettext!(*arg)
 	if Locale.get.language == "ja"
 	  require 'nkf'
 	  @mail.subject = base64(@mail.subject)

data/lib/gettext_rails/action_view/active_record_helper.rb

@@ -66,6 +66,9 @@ module ActionView #:nodoc:
           if key.kind_of? Symbol
             msgids = @@error_message_headers[key]
           else
+            key << key[0] if (key.is_a?(Array) && key.length==1) 
+            key = [key, key] if key.is_a? String
+
             msgids = key
           end
 
@@ -79,14 +82,15 @@ module ActionView #:nodoc:
         end
 
       end
+
       def error_messages_for_with_gettext_rails(*params) #:nodoc:
         models = params.select{|param| ! param.kind_of? Hash}
         options = params.extract_options!.symbolize_keys
 
-        header_message = options[:header_message] || options[:message_title] || :header
-        message = options[:message] || options[:message_explanation] || :body
+        header_message = (options.has_key?(:header_message) || options.has_key?(:message_title)) ? (options[:header_message] || options[:message_title]) : (:header)
+        message = (options.has_key?(:message) || options.has_key?(:message_explanation)) ? (options[:message] || options[:message_explanation]) :  (:body)
 
-        object = options.delete(:object)
+        object = options[:object]
         if object
           objects = [object].flatten
         else
@@ -97,6 +101,7 @@ module ActionView #:nodoc:
         options[:object_name] ||= params.first
         normalized_model = options[:object_name].to_s.gsub('_', ' ')
         
+        #accept nil's as messages to hide message
         options[:header_message] = L10n.error_message(header_message, normalized_model, count)
         options[:message] = L10n.error_message(message, normalized_model, count)
 

data/lib/gettext_rails/version.rb

@@ -1,4 +1,3 @@
-#! /usr/bin/ruby
 =begin
   version - version information of Ruby-GetText-Package
 
@@ -10,5 +9,5 @@
 
 module GetTextRails
   RAILS_VERSION = "2.3.2"
-  VERSION = "2.0.0"
+  VERSION = "2.0.1"
 end

data/sample/app/controllers/application_controller.rb

@@ -18,16 +18,18 @@ class ApplicationController < ActionController::Base
 
   I18n.supported_locales = Dir[ File.join(RAILS_ROOT, 'locale/*') ].collect{|v| File.basename(v)}
 
-=begin
   # You can set callback methods. These methods are called on the each WWW request.
-  def before_init_gettext(cgi)
+=begin
+  def sample_before_init_gettext
     p "before_init_gettext"
+    set_locale "zh"  # Set locale forcely.
   end
-  def after_init_gettext(cgi)
+  before_init_gettext :sample_before_init_gettext
+  def sample_after_init_gettext
     p "after_init_gettext"
   end
+  after_init_gettext :sample_after_init_gettext
 =end
-
 =begin
    # you can redefined the title/explanation of the top of the error message.
   ActionView::Helpers::ActiveRecordHelper::L10n.set_error_message_title(N_("An error is occured on %{record}"), N_("%{num} errors are occured on %{record}"))

data/test/Rakefile

@@ -1,6 +1,7 @@
 # Add your own tasks in files placed in lib/tasks ending in .rake,
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 
+$LOAD_PATH.unshift "../lib"
 $LOAD_PATH.unshift "../../lib"
 require(File.join(File.dirname(__FILE__), 'config', 'boot'))
 

data/test/app/controllers/articles_controller.rb

@@ -95,20 +95,4 @@ class ArticlesController < ApplicationController
       format.xml  { head :ok }
     end
   end
-
-  def multi_error_messages_for
-    @user = User.new
-    @user.lastupdate = Date.new(2007, 4, 1)
-    @article = Article.new
-    @article.lastupdate = Date.new(2007, 4, 1)
-    @user.valid?
-    @article.valid?
-  end
-
-  def change_title_error_messages_for
-    @article = Article.new
-    @article.lastupdate = Date.new(2007, 4, 1)
-    @article.valid?
-  end
-
 end

data/test/app/controllers/users_controller.rb

@@ -1,14 +1,14 @@
 class UsersController < ApplicationController
-  def custom_error_message
+  def error_message
     @user = User.new
     @user.name = "foo"
-    unless params[:plural]
-      @user.lastupdate = "2007-01-01"
-    end
-    @user.valid?
     @user.lastupdate = "2007-01-01"
-  end
+    @user.valid?
 
+    @article = Article.new
+    @article.valid?
+  end
+  
   def distance_of_time_in_words
   end
 

data/test/app/views/users/error_message.html.erb

@@ -0,0 +1,50 @@
+<h2>Singular message</h2>
+<%= error_messages_for 'user' %>
+
+<h2>Plural messages</h2>
+<%= error_messages_for 'article' %>
+
+<h2>Multi object</h2>
+<%= error_messages_for 'article', 'user' %>
+
+<h2>Multi object with :object_name</h2>
+<%= error_messages_for 'article', 'user', :object_name => _("Contents")  %>
+
+<h2>Multi object with :object</h2>
+<%= error_messages_for :object => [@article, @user] %>
+
+<h2>Change header with gettext options</h2>
+<%= error_messages_for 'user', {
+    :message_title => Nn_("Singular Custom Error message %{record}: %{num}", "Plural Custom Error message %{record}: %{num}"), 
+    :message_explanation => Nn_("Singular Custom Error explanation %{num}", "Plural Custom Error explanation %{num}")
+} %>
+
+<h2>Same result with Rails options</h2>
+<%= error_messages_for 'user', {
+    :header_message => Nn_("Singular Custom Error message %{record}: %{num}", "Plural Custom Error message %{record}: %{num}"), 
+    :message => Nn_("Singular Custom Error explanation %{num}", "Plural Custom Error explanation %{num}")
+} %>
+
+<h2>nil header</h2>
+<%= error_messages_for 'user', {
+    :header_message => nil,
+    :message => Nn_("Singular Custom Error explanation %{num}", "Plural Custom Error explanation %{num}")
+} %>
+
+<h2>nil message</h2>
+<%= error_messages_for 'user', {
+    :header_message => Nn_("Singular Custom Error message %{record}: %{num}", "Plural Custom Error message %{record}: %{num}"), 
+    :message => nil
+} %>
+
+<h2>nil header message and nil message</h2>
+<%= error_messages_for 'user', {
+    :header_message => nil,
+    :message => nil
+} %>
+
+<h2>String header message</h2>
+<%= error_messages_for 'user', {
+    :header_message => "String Header Message",
+    :message => "String Message"
+} %>

data/test/app/views/users/{custom_error_message_fr.html.erb → error_message_fr.html.erb}

@@ -3,11 +3,3 @@
     :message_explanation => Nn_("French: Singular Custom Error explanation %{num}", "French: Plural Custom Error explanation %{num}")
 } %>
 
-<!--[form:article]-->
-<p><label for="user_name"><%= _("Name") %></label><br/>
-<%= text_field 'user', 'name' %></p>
-
-<p><label for="user_lastupdate"><%= _("Lastupdate") %></label><br/>
-<%= date_select 'user', 'lastupdate' %></p>
-<!--[eoform:article]-->
-

data/test/config/environment.rb

@@ -42,4 +42,3 @@ Rails::Initializer.run do |config|
   config.gem "gettext_activerecord"
   config.gem "gettext_rails"
 end
-

data/test/config/routes.rb

@@ -1,10 +1,5 @@
 ActionController::Routing::Routes.draw do |map|
-#  map.resources :articles
-
-  map.resources :articles, :collection => {:multi_error_messages_for => :get,
-                                           :change_title_error_messages_for => :get,
-                                           :distance_of_time_in_words => :get,
-	}
+  map.resources :articles
 
   map.connect ':controller/:action/:id'
   map.connect ':controller/:action/:id.:format'

data/test/po/ja/rails_test.po

@@ -97,8 +97,8 @@ msgstr[1] "複数形カスタムエラーメッセージ (%{record}: %{num})"
 #: app/views/users/custom_error_message_fr.html.erb:3
 msgid "French: Singular Custom Error explanation %{num}"
 msgid_plural "French: Plural Custom Error explanation %{num}"
-msgstr[0] "単数形カスタムエラーメッセージ (%{num})"
-msgstr[1] "複数形カスタムエラーメッセージ (%{num})"
+msgstr[0] "単数形カスタムエラー説明 (%{num})"
+msgstr[1] "複数形カスタムエラー説明 (%{num})"
 
 #: app/views/users/custom_error_message_fr.html.erb:7
 #: app/views/users/custom_error_message.html.erb:7
@@ -124,8 +124,8 @@ msgstr[1] "複数形カスタムエラーメッセージ (%{record}: %{num})"
 #: app/views/users/custom_error_message.html.erb:3
 msgid "Singular Custom Error explanation %{num}"
 msgid_plural "Plural Custom Error explanation %{num}"
-msgstr[0] "単数形カスタムエラーメッセージ (%{num})"
-msgstr[1] "複数形カスタムエラーメッセージ (%{num})"
+msgstr[0] "単数形カスタムエラー説明 (%{num})"
+msgstr[1] "複数形カスタムエラー説明 (%{num})"
 
 #: app/views/articles/edit.html.erb:1
 msgid "Editing article"

data/test/public/index.html

@@ -10,9 +10,7 @@
 <h2>General tests</h1>
 <dl>
   <li><a href="/articles">Articles CRUD Test</a></li>
-  <li><a href="/articles/multi_error_messages_for">Multi Error messages</a></li>
-  <li><a href="/articles/change_title_error_messages_for">Custom Title messages</a></li>
-  <li><a href="/users/custom_error_message">Custom error message</a></li>
+  <li><a href="/users/error_message">error_message_for tests</a></li>
   <li><a href="/users/distance_of_time_in_words">Distance of time in words</a></li>
 </dl>
 <h2>ActionMailer tests</h1>

data/test/test/functional/articles_controller_test.rb

@@ -50,22 +50,6 @@ class ArticlesControllerTest < ActionController::TestCase
     assert_html("en/create_error.html")
   end
 
-  test "should be shown multi error messages" do
-    post :multi_error_messages_for, :article => {:article_title => "", :article_description => "", :user_name => ""}, :lang => "ja"
-    assert_html("ja/multi_error_messages_for.html")
-
-    post :multi_error_messages_for, :article => {:article_title => "", :article_description => "", :user_name => ""}, :lang => "en"
-    assert_html("en/multi_error_messages_for.html")
-  end
-
-  test "should be shown with custom error message title" do
-    get :change_title_error_messages_for, :lang => "ja"
-    assert_html("ja/change_title_error_messages_for.html")
-
-    get :change_title_error_messages_for, :lang => "en"
-    assert_html("en/change_title_error_messages_for.html")
-  end
-
   test "should show article" do
     get :show, :id => 1, :lang => "ja"
 

data/test/test/functional/users_controller_test.rb

@@ -1,33 +1,21 @@
 require 'test_helper'
 
 class UsersControllerTest < ActionController::TestCase
-  test "should get custom_error_message" do
-    get :custom_error_message, :lang => "ja"
-    assert_html("ja/custom_error_message.html")
+  test "should get error_message" do
+    get :error_message, :lang => "ja"
+    assert_html("ja/error_message.html")
     assert_response :success
 
-    get :custom_error_message, :lang => "en"
-    assert_html("en/custom_error_message.html")
+    get :error_message, :lang => "en"
+    assert_html("en/error_message.html")
 
     # not match
-    get :custom_error_message, :lang => "kr"
-    assert_html("en/custom_error_message.html")
+    get :error_message, :lang => "kr"
+    assert_html("en/error_message.html")
 
-    # custom_error_message_fr.html.erb
-    get :custom_error_message, :lang => "fr"
-    assert_html("fr/custom_error_message.html")
-  end
-
-  test "should get custom plural error_messages" do
-    get :custom_error_message, :lang => "ja", :plural => "true"
-    assert_html("ja/custom_error_message_with_plural.html")
-    assert_response :success
-
-    get :custom_error_message, :lang => "en", :plural => "true"
-    assert_html("en/custom_error_message_with_plural.html")
-
-    get :custom_error_message, :lang => "fr", :plural => "true"
-    assert_html("fr/custom_error_message_with_plural.html")
+    # error_message_fr.html.erb
+    get :error_message, :lang => "fr"
+    assert_html("fr/error_message.html")
   end
 
   test "should get localized distance_of_time_in_words" do

data/test/test/result/en/error_message.html

@@ -0,0 +1,46 @@
+<html>
+<head>
+  <meta http-equiv="content-type" content="text/html;charset=UTF-8" />
+  <title>Ruby-GetText-Package Test Application</title>
+  <link href="/stylesheets/scaffold.css" media="screen" rel="Stylesheet" type="text/css" />
+</head>
+<body>
+<p style="color: green"></p>
+
+<h2>Singular message</h2>
+<div class="errorExplanation" id="errorExplanation"><h2>1 error prohibited this user from being saved</h2><p>There was a problem with the following field:</p><ul><li>Name is too short (minimum is 10 characters)</li></ul></div>
+
+<h2>Plural messages</h2>
+<div class="errorExplanation" id="errorExplanation"><h2>2 errors prohibited this article from being saved</h2><p>There were problems with the following fields:</p><ul><li>Title can't be blank</li><li>Description is too short (minimum is 3 characters)</li></ul></div>
+
+<h2>Multi object</h2>
+<div class="errorExplanation" id="errorExplanation"><h2>3 errors prohibited this article from being saved</h2><p>There were problems with the following fields:</p><ul><li>Title can't be blank</li><li>Description is too short (minimum is 3 characters)</li><li>Name is too short (minimum is 10 characters)</li></ul></div>
+
+<h2>Multi object with :object_name</h2>
+<div class="errorExplanation" id="errorExplanation"><h2>3 errors prohibited this Contents from being saved</h2><p>There were problems with the following fields:</p><ul><li>Title can't be blank</li><li>Description is too short (minimum is 3 characters)</li><li>Name is too short (minimum is 10 characters)</li></ul></div>
+
+<h2>Multi object with :object</h2>
+<div class="errorExplanation" id="errorExplanation"><h2>3 errors prohibited this  from being saved</h2><p>There were problems with the following fields:</p><ul><li>Title can't be blank</li><li>Description is too short (minimum is 3 characters)</li><li>Name is too short (minimum is 10 characters)</li></ul></div>
+
+<h2>Change header with gettext options</h2>
+<div class="errorExplanation" id="errorExplanation"><h2>Singular Custom Error message user: 1</h2><p>Singular Custom Error explanation 1</p><ul><li>Name is too short (minimum is 10 characters)</li></ul></div>
+
+<h2>Same result with Rails options</h2>
+<div class="errorExplanation" id="errorExplanation"><h2>Singular Custom Error message user: 1</h2><p>Singular Custom Error explanation 1</p><ul><li>Name is too short (minimum is 10 characters)</li></ul></div>
+
+<h2>nil header</h2>
+<div class="errorExplanation" id="errorExplanation"><p>Singular Custom Error explanation 1</p><ul><li>Name is too short (minimum is 10 characters)</li></ul></div>
+
+<h2>nil message</h2>
+<div class="errorExplanation" id="errorExplanation"><h2>Singular Custom Error message user: 1</h2><ul><li>Name is too short (minimum is 10 characters)</li></ul></div>
+
+<h2>nil header message and nil message</h2>
+<div class="errorExplanation" id="errorExplanation"><ul><li>Name is too short (minimum is 10 characters)</li></ul></div>
+
+<h2>String header message</h2>
+<div class="errorExplanation" id="errorExplanation"><h2>String Header Message</h2><p>String Message</p><ul><li>Name is too short (minimum is 10 characters)</li></ul></div>
+
+
+<a href="/">Back to Top</a>
+</body>
+</html>

data/test/test/result/fr/error_message.html

@@ -0,0 +1,16 @@
+<html>
+<head>
+  <meta http-equiv="content-type" content="text/html;charset=UTF-8" />
+  <title>Ruby-GetText-Package Test Application</title>
+  <link href="/stylesheets/scaffold.css" media="screen" rel="Stylesheet" type="text/css" />
+</head>
+<body>
+<p style="color: green"></p>
+
+<div class="errorExplanation" id="errorExplanation"><h2>French: Singular Custom Error message user: 1</h2><p>French: Singular Custom Error explanation 1</p><ul><li>Name est trop court (min. 10 caractères)</li></ul></div>
+
+
+
+<a href="/">Back to Top</a>
+</body>
+</html>