gettext 1.10.0 → 1.90.0

data/test/rails/po/ja/rails_test.po

@@ -7,14 +7,26 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rails_test 1.2.0\n"
-"POT-Creation-Date: 2007-07-04 17:45+0900\n"
+"POT-Creation-Date: 2007-12-15 13:09+0900\n"
 "PO-Revision-Date: 2007-04-08 20:47+0900\n"
 "Last-Translator: Masao Mutoh <mutoh@highway.ne.jp>\n"
 "Language-Team: Japanese\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+"Plural-Forms: nplurals=2; plural=n == 1 ? 0 : 1;\n"
+
+#: app/models/user.rb:-
+msgid "user"
+msgstr "ユーザ"
+
+#: app/models/user.rb:-
+msgid "User|Name"
+msgstr "名前"
+
+#: app/models/user.rb:-
+msgid "User|Lastupdate"
+msgstr "最終更新日"
 
 #: app/models/article.rb:-
 msgid "article"
@@ -32,18 +44,6 @@ msgstr "内容"
 msgid "Article|Lastupdate"
 msgstr "最終更新日"
 
-#: app/models/user.rb:-
-msgid "user"
-msgstr "ユーザ"
-
-#: app/models/user.rb:-
-msgid "User|Name"
-msgstr "名前"
-
-#: app/models/user.rb:-
-msgid "User|Lastupdate"
-msgstr "最終更新日"
-
 #: app/models/mailer.rb:5
 msgid "multipart test mail"
 msgstr "マルチパートテストメール"
@@ -56,87 +56,94 @@ msgstr "シングルパートテストメール"
 msgid "Article was successfully created."
 msgstr "記事を生成しました。"
 
-#: app/controllers/articles_controller.rb:55
+#: app/controllers/articles_controller.rb:50
 msgid "Article was successfully updated."
 msgstr "記事を更新しました。"
 
-#: app/views/layouts/users.rhtml:9
-msgid "1:Custom Error Message Title"
-msgid_plural "2:Custom Error Message Title"
-msgstr[0] ""
+#: app/views/users/custom_error_message.html.erb:2
+msgid "Singular Custom Error message %{record}: %{num}"
+msgid_plural "Plural Custom Error message %{record}: %{num}"
+msgstr[0] "単数形カスタムエラーメッセージ (%{record}: %{num})"
+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})"
 
-#: app/views/users/error_message_title.rhtml:4
-#: app/views/articles/multi_error_messages_for.rhtml:13
+#: app/views/users/custom_error_message.html.erb:7
+#: app/views/articles/multi_error_messages_for.html.erb:13
 msgid "Name"
 msgstr "名前"
 
-#: app/views/users/error_message_title.rhtml:7
-#: app/views/articles/_form.rhtml:10
-#: app/views/articles/multi_error_messages_for.rhtml:10
-#: app/views/articles/multi_error_messages_for.rhtml:16
+#: app/views/users/custom_error_message.html.erb:10
+#: app/views/articles/multi_error_messages_for.html.erb:10
+#: app/views/articles/multi_error_messages_for.html.erb:16
+#: app/views/articles/_form.html.erb:10
 msgid "Lastupdate"
 msgstr "最終更新日"
 
-#: app/views/mailer/coverpage.rhtml:3
-msgid "I attached public/images/* for example."
-msgstr "サンプルとしてpublic/images/*を添付しました。"
-
-#: app/views/mailer/singlepart.rhtml:1
-msgid "Hi %{name},"
-msgstr "こんにちわ %{name}さん"
-
-#: app/views/mailer/singlepart.rhtml:3
-msgid "This is a singlepart mail. OK?"
-msgstr "シングルパートメールです。いいですか？"
-
-#: app/views/articles/edit.rhtml:1
+#: app/views/articles/edit.html.erb:1
 msgid "Editing article"
 msgstr "記事の編集"
 
-#: app/views/articles/edit.rhtml:5 app/views/articles/list.rhtml:16
-#: app/views/articles/show.rhtml:7
+#: app/views/articles/edit.html.erb:5 app/views/articles/show.html.erb:7
+#: app/views/articles/list.html.erb:16
 msgid "Edit"
 msgstr "編集"
 
-#: app/views/articles/edit.rhtml:8 app/views/articles/list.rhtml:15
+#: app/views/articles/edit.html.erb:8 app/views/articles/list.html.erb:15
 msgid "Show"
 msgstr "表示"
 
-#: app/views/articles/edit.rhtml:9 app/views/articles/new.rhtml:8
-#: app/views/articles/show.rhtml:8
+#: app/views/articles/edit.html.erb:9 app/views/articles/show.html.erb:8
+#: app/views/articles/new.html.erb:8
 msgid "Back"
 msgstr "戻る"
 
-#: app/views/articles/list.rhtml:1
+#: app/views/articles/multi_error_messages_for.html.erb:1
+msgid "Contents"
+msgstr "内容"
+
+#: app/views/articles/multi_error_messages_for.html.erb:4
+#: app/views/articles/_form.html.erb:4
+msgid "Title"
+msgstr "タイトル"
+
+#: app/views/articles/multi_error_messages_for.html.erb:7
+#: app/views/articles/_form.html.erb:7
+msgid "Description"
+msgstr "内容"
+
+#: app/views/articles/list.html.erb:1
 msgid "Listing articles"
 msgstr "記事一覧"
 
-#: app/views/articles/list.rhtml:17
+#: app/views/articles/list.html.erb:17
 msgid "Destroy"
 msgstr "削除"
 
-#: app/views/articles/list.rhtml:17
+#: app/views/articles/list.html.erb:17
 msgid "Are you sure?"
 msgstr "よろしいですか？"
 
-#: app/views/articles/list.rhtml:27 app/views/articles/new.rhtml:1
+#: app/views/articles/list.html.erb:24 app/views/articles/new.html.erb:1
 msgid "New article"
 msgstr "新しい記事"
 
-#: app/views/articles/_form.rhtml:4
-#: app/views/articles/multi_error_messages_for.rhtml:4
-msgid "Title"
-msgstr "タイトル"
-
-#: app/views/articles/_form.rhtml:7
-#: app/views/articles/multi_error_messages_for.rhtml:7
-msgid "Description"
-msgstr "内容"
-
-#: app/views/articles/new.rhtml:5
+#: app/views/articles/new.html.erb:5
 msgid "Create"
 msgstr "作成"
 
-#: app/views/articles/multi_error_messages_for.rhtml:1
-msgid "Contents"
-msgstr "内容"
+#: app/views/mailer/coverpage.html.erb:3
+msgid "I attached public/images/* for example."
+msgstr "サンプルとしてpublic/images/*を添付しました。"
+
+#: app/views/mailer/singlepart.html.erb:1
+msgid "Hi %{name},"
+msgstr "こんにちわ %{name}さん"
+
+#: app/views/mailer/singlepart.html.erb:3
+msgid "This is a singlepart mail. OK?"
+msgstr "シングルパートメールです。いいですか？"

data/test/rails/po/rails_test.pot

@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rails_test 1.2.0\n"
-"POT-Creation-Date: 2007-07-04 17:45+0900\n"
+"POT-Creation-Date: 2007-12-15 13:09+0900\n"
 "PO-Revision-Date: 2007-04-08 20:44+0900\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,8 +16,16 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: app/models/search.rb:4
-msgid "Search|Foo"
+#: app/models/user.rb:-
+msgid "user"
+msgstr ""
+
+#: app/models/user.rb:-
+msgid "User|Name"
+msgstr ""
+
+#: app/models/user.rb:-
+msgid "User|Lastupdate"
 msgstr ""
 
 #: app/models/article.rb:-
@@ -36,18 +44,6 @@ msgstr ""
 msgid "Article|Lastupdate"
 msgstr ""
 
-#: app/models/user.rb:-
-msgid "user"
-msgstr ""
-
-#: app/models/user.rb:-
-msgid "User|Name"
-msgstr ""
-
-#: app/models/user.rb:-
-msgid "User|Lastupdate"
-msgstr ""
-
 #: app/models/mailer.rb:5
 msgid "multipart test mail"
 msgstr ""
@@ -60,88 +56,94 @@ msgstr ""
 msgid "Article was successfully created."
 msgstr ""
 
-#: app/controllers/articles_controller.rb:55
+#: app/controllers/articles_controller.rb:50
 msgid "Article was successfully updated."
 msgstr ""
 
-#: app/views/layouts/users.rhtml:9
-msgid "1:Custom Error Message Title"
-msgid_plural "2:Custom Error Message Title"
+#: app/views/users/custom_error_message.html.erb:2
+msgid "Singular Custom Error message %{record}: %{num}"
+msgid_plural "Plural Custom Error message %{record}: %{num}"
 msgstr[0] ""
 msgstr[1] ""
 
-#: app/views/users/error_message_title.rhtml:4
-#: app/views/articles/multi_error_messages_for.rhtml:13
+#: app/views/users/custom_error_message.html.erb:3
+msgid "Singular Custom Error explanation %{num}"
+msgid_plural "Plural Custom Error explanation %{num}"
+msgstr[0] ""
+msgstr[1] ""
+
+#: app/views/users/custom_error_message.html.erb:7
+#: app/views/articles/multi_error_messages_for.html.erb:13
 msgid "Name"
 msgstr ""
 
-#: app/views/users/error_message_title.rhtml:7
-#: app/views/articles/_form.rhtml:10
-#: app/views/articles/multi_error_messages_for.rhtml:10
-#: app/views/articles/multi_error_messages_for.rhtml:16
+#: app/views/users/custom_error_message.html.erb:10
+#: app/views/articles/multi_error_messages_for.html.erb:10
+#: app/views/articles/multi_error_messages_for.html.erb:16
+#: app/views/articles/_form.html.erb:10
 msgid "Lastupdate"
 msgstr ""
 
-#: app/views/mailer/coverpage.rhtml:3
-msgid "I attached public/images/* for example."
+#: app/views/articles/edit.html.erb:1
+msgid "Editing article"
 msgstr ""
 
-#: app/views/mailer/singlepart.rhtml:1
-msgid "Hi %{name},"
+#: app/views/articles/edit.html.erb:5 app/views/articles/show.html.erb:7
+#: app/views/articles/list.html.erb:16
+msgid "Edit"
 msgstr ""
 
-#: app/views/mailer/singlepart.rhtml:3
-msgid "This is a singlepart mail. OK?"
+#: app/views/articles/edit.html.erb:8 app/views/articles/list.html.erb:15
+msgid "Show"
 msgstr ""
 
-#: app/views/articles/edit.rhtml:1
-msgid "Editing article"
+#: app/views/articles/edit.html.erb:9 app/views/articles/show.html.erb:8
+#: app/views/articles/new.html.erb:8
+msgid "Back"
 msgstr ""
 
-#: app/views/articles/edit.rhtml:5 app/views/articles/list.rhtml:16
-#: app/views/articles/show.rhtml:7
-msgid "Edit"
+#: app/views/articles/multi_error_messages_for.html.erb:1
+msgid "Contents"
 msgstr ""
 
-#: app/views/articles/edit.rhtml:8 app/views/articles/list.rhtml:15
-msgid "Show"
+#: app/views/articles/multi_error_messages_for.html.erb:4
+#: app/views/articles/_form.html.erb:4
+msgid "Title"
 msgstr ""
 
-#: app/views/articles/edit.rhtml:9 app/views/articles/new.rhtml:8
-#: app/views/articles/show.rhtml:8
-msgid "Back"
+#: app/views/articles/multi_error_messages_for.html.erb:7
+#: app/views/articles/_form.html.erb:7
+msgid "Description"
 msgstr ""
 
-#: app/views/articles/list.rhtml:1
+#: app/views/articles/list.html.erb:1
 msgid "Listing articles"
 msgstr ""
 
-#: app/views/articles/list.rhtml:17
+#: app/views/articles/list.html.erb:17
 msgid "Destroy"
 msgstr ""
 
-#: app/views/articles/list.rhtml:17
+#: app/views/articles/list.html.erb:17
 msgid "Are you sure?"
 msgstr ""
 
-#: app/views/articles/list.rhtml:27 app/views/articles/new.rhtml:1
+#: app/views/articles/list.html.erb:24 app/views/articles/new.html.erb:1
 msgid "New article"
 msgstr ""
 
-#: app/views/articles/_form.rhtml:4
-#: app/views/articles/multi_error_messages_for.rhtml:4
-msgid "Title"
+#: app/views/articles/new.html.erb:5
+msgid "Create"
 msgstr ""
 
-#: app/views/articles/_form.rhtml:7
-#: app/views/articles/multi_error_messages_for.rhtml:7
-msgid "Description"
+#: app/views/mailer/coverpage.html.erb:3
+msgid "I attached public/images/* for example."
 msgstr ""
 
-#: app/views/articles/new.rhtml:5
-msgid "Create"
+#: app/views/mailer/singlepart.html.erb:1
+msgid "Hi %{name},"
 msgstr ""
 
-#: app/views/articles/multi_error_messages_for.rhtml:1
-msgid "Contents"
+#: app/views/mailer/singlepart.html.erb:3
+msgid "This is a singlepart mail. OK?"
 msgstr ""

data/test/rails/test/fixtures/users.yml

@@ -0,0 +1,5 @@
+# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
+one:
+  id: 1
+two:
+  id: 2

data/test/rails/test/functional/articles_controller_test.rb

@@ -1,7 +1,9 @@
 require File.dirname(__FILE__) + '/../test_helper'
 require 'articles_controller'
 
-RESULT_DIR = File.dirname(__FILE__) + "/../../test/result/"
+unless defined? RESULT_DIR
+  RESULT_DIR = File.dirname(__FILE__) + "/../../test/result/"
+end
 
 # Re-raise errors caught by the controller.
 class ArticlesController; def rescue_action(e) raise e end; end
@@ -22,6 +24,9 @@ class ArticlesControllerTest < Test::Unit::TestCase
   end
 
   def assert_html(path)
+    unless File.exist?(path)
+      save_html(path)
+    end   
     ary = IO.readlines(RESULT_DIR + path)
     i = 0
     @response.body.each_line{|line|

data/test/rails/test/functional/users_controller_test.rb

@@ -0,0 +1,65 @@
+require File.dirname(__FILE__) + '/../test_helper'
+require 'users_controller'
+
+unless defined? RESULT_DIR
+  RESULT_DIR = File.dirname(__FILE__) + "/../../test/result/"
+end
+
+# Re-raise errors caught by the controller.
+class UsersController; def rescue_action(e) raise e end; end
+
+class UsersControllerTest < Test::Unit::TestCase
+  fixtures :users
+
+  def setup
+    @controller = UsersController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+  end
+
+  def save_html(path)
+    open(RESULT_DIR + path, "w"){|io| io.write @response.body}
+  end
+
+  def assert_html(path)
+    unless File.exist?(path)
+      save_html(path)
+    end
+    ary = IO.readlines(RESULT_DIR + path)
+    i = 0
+    @response.body.each_line{|line|
+      assert_equal ary[i], line
+      i += 1
+    }
+  end
+
+  def test_custom_error_message
+    get :custom_error_message, :lang => "ja"
+    assert_html("ja/custom_error_message.html")
+    assert_response :success
+
+    get :custom_error_message, :lang => "en"
+    assert_html("en/custom_error_message.html")
+
+    # not match
+    get :custom_error_message, :lang => "kr"
+    assert_html("en/custom_error_message.html")
+
+    # custom_error_message_fr.html.erb
+    get :custom_error_message, :lang => "fr"
+    assert_html("fr/custom_error_message.html")
+  end
+
+  def test_custom_error_message_with_plural
+    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")
+
+  end
+end