gettext 1.90.0 → 1.91.0

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

@@ -7,7 +7,7 @@ end
 
 # Re-raise errors caught by the controller.
 class ArticlesController; def rescue_action(e) raise e end; end
-
+GetText
 class ArticlesControllerTest < Test::Unit::TestCase
   fixtures :articles
 
@@ -24,7 +24,7 @@ class ArticlesControllerTest < Test::Unit::TestCase
   end
 
   def assert_html(path)
-    unless File.exist?(path)
+    unless File.exist?(RESULT_DIR + path)
       save_html(path)
     end   
     ary = IO.readlines(RESULT_DIR + path)

data/test/rails/test/functional/mailer_controller_test.rb

@@ -1,7 +1,9 @@
 require File.dirname(__FILE__) + '/../test_helper'
 require 'mailer_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 MailerController; def rescue_action(e) raise e end; end

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

@@ -22,7 +22,7 @@ class UsersControllerTest < Test::Unit::TestCase
   end
 
   def assert_html(path)
-    unless File.exist?(path)
+    unless File.exist?(RESULT_DIR + path)
       save_html(path)
     end
     ary = IO.readlines(RESULT_DIR + path)

data/test/rails/test/result/en/custom_error_message_with_plural.html

@@ -29,10 +29,10 @@
 </select>
 <select id="user_lastupdate_2i" name="user[lastupdate(2i)]">
 <option value="1">January</option>
-<option value="2" selected="selected">February</option>
+<option value="2">February</option>
 <option value="3">March</option>
 <option value="4">April</option>
-<option value="5">May</option>
+<option value="5" selected="selected">May</option>
 <option value="6">June</option>
 <option value="7">July</option>
 <option value="8">August</option>
@@ -44,10 +44,10 @@
 <select id="user_lastupdate_3i" name="user[lastupdate(3i)]">
 <option value="1">1</option>
 <option value="2">2</option>
-<option value="3" selected="selected">3</option>
+<option value="3">3</option>
 <option value="4">4</option>
 <option value="5">5</option>
-<option value="6">6</option>
+<option value="6" selected="selected">6</option>
 <option value="7">7</option>
 <option value="8">8</option>
 <option value="9">9</option>

data/test/rails/test/result/en/show.html

@@ -42,6 +42,7 @@
  2 months<br/>
  about 1 year<br/>
  over 2 years<br/>
+ over 4 years<br/>
 
 
 

data/test/rails/test/result/fr/custom_error_message_with_plural.html

@@ -29,10 +29,10 @@
 </select>
 <select id="user_lastupdate_2i" name="user[lastupdate(2i)]">
 <option value="1">January</option>
-<option value="2" selected="selected">February</option>
+<option value="2">February</option>
 <option value="3">March</option>
 <option value="4">April</option>
-<option value="5">May</option>
+<option value="5" selected="selected">May</option>
 <option value="6">June</option>
 <option value="7">July</option>
 <option value="8">August</option>
@@ -44,10 +44,10 @@
 <select id="user_lastupdate_3i" name="user[lastupdate(3i)]">
 <option value="1">1</option>
 <option value="2">2</option>
-<option value="3" selected="selected">3</option>
+<option value="3">3</option>
 <option value="4">4</option>
 <option value="5">5</option>
-<option value="6">6</option>
+<option value="6" selected="selected">6</option>
 <option value="7">7</option>
 <option value="8">8</option>
 <option value="9">9</option>

data/test/rails/test/result/ja/custom_error_message_with_plural.html

@@ -29,10 +29,10 @@
 </select>
 <select id="user_lastupdate_2i" name="user[lastupdate(2i)]">
 <option value="1">January</option>
-<option value="2" selected="selected">February</option>
+<option value="2">February</option>
 <option value="3">March</option>
 <option value="4">April</option>
-<option value="5">May</option>
+<option value="5" selected="selected">May</option>
 <option value="6">June</option>
 <option value="7">July</option>
 <option value="8">August</option>
@@ -44,10 +44,10 @@
 <select id="user_lastupdate_3i" name="user[lastupdate(3i)]">
 <option value="1">1</option>
 <option value="2">2</option>
-<option value="3" selected="selected">3</option>
+<option value="3">3</option>
 <option value="4">4</option>
 <option value="5">5</option>
-<option value="6">6</option>
+<option value="6" selected="selected">6</option>
 <option value="7">7</option>
 <option value="8">8</option>
 <option value="9">9</option>

data/test/rails/test/result/ja/show.html

@@ -39,9 +39,10 @@
  1日<br/>
  2日<br/>
  約1ヵ月<br/>
- 2月<br/>
+ 2ヶ月<br/>
  約1年<br/>
  2年以上<br/>
+ 4年以上<br/>
 
 
 

data/test/test.sh

@@ -7,6 +7,7 @@ for target in test_*.rb
 do
 ruby  -I../lib $target
 done
+exit
 cd rails
 rake -I../../lib test
 cd ..

data/test/test_active_record.rb

@@ -746,7 +746,7 @@ class ValidationsTest < Test::Unit::TestCase
   end
 
   def test_optionally_validates_length_of_using_within_on_create_fn
-    Topic.validates_length_of :title, :content, :within => 5..10, :on => :create, :too_long => N_("my string(%{fn}) is too long: %d")
+    Topic.validates_length_of :title, :content, :within => 5..10, :on => :create, :too_short => N_("my string(%{fn}) is too short: %d"), :too_long => N_("my string(%{fn}) is too long: %d")
 
     GetText.set_locale_all "ja_JP.UTF-8"  
     t = Topic.create("title" => "thisisnotvalid", "content" => "whatever")
@@ -764,7 +764,7 @@ class ValidationsTest < Test::Unit::TestCase
   end
 
   def test_optionally_validates_length_of_using_within_on_create
-    Topic.validates_length_of :title, :content, :within => 5..10, :on => :create, :too_long => N_("my string is too long: %d")
+    Topic.validates_length_of :title, :content, :within => 5..10, :on => :create, :too_short => N_("my string is too short: %d"), :too_long => N_("my string is too long: %d")
 
     GetText.set_locale_all "ja_JP.UTF-8"  
     t = Topic.create("title" => "thisisnotvalid", "content" => "whatever")
@@ -782,7 +782,7 @@ class ValidationsTest < Test::Unit::TestCase
   end
 
   def test_optionally_validates_length_of_using_within_on_update_fn
-    Topic.validates_length_of :title, :content, :within => 5..10, :on => :update, :too_short => N_("my string(%{fn}) is too short: %d")
+    Topic.validates_length_of :title, :content, :within => 5..10, :on => :update, :too_short => N_("my string(%{fn}) is too short: %d"), :too_long => N_("my string(%{fn}) is too long: %d")
     GetText.set_locale_all "ja_JP.UTF-8"  
     t = Topic.create("title" => "vali", "content" => "whatever")
     assert !t.save
@@ -808,7 +808,7 @@ class ValidationsTest < Test::Unit::TestCase
   end
 
   def test_optionally_validates_length_of_using_within_on_update
-    Topic.validates_length_of :title, :content, :within => 5..10, :on => :update, :too_short => N_("my string is too short: %d")
+    Topic.validates_length_of :title, :content, :within => 5..10, :on => :update, :too_short => N_("my string is too short: %d"), :too_long => N_("my string is too long: %d")
     GetText.set_locale_all "ja_JP.UTF-8"  
     t = Topic.create("title" => "vali", "content" => "whatever")
     assert !t.save

data/test/test_gettext.rb

@@ -353,24 +353,24 @@ DDD
     assert_equal(F::G::H, GetText.bound_target(F::G::H.new))
 
     # Anonymous classes are bound to GetText
-    assert_equal(GetText, GetText.bound_target(@@anon::I))
-    assert_equal(GetText, GetText.bound_target(@@anon::I.new))
+    assert_equal(Object, GetText.bound_target(@@anon::I))
+    assert_equal(Object, GetText.bound_target(@@anon::I.new))
   end
 
   def test_bound_targets
     GetText.bindtextdomain("test1", "locale")
     bindtextdomain("test1", "locale")
-    assert_equal([TestGetText::A2, TestGetText, GetText], GetText.bound_targets(::TestGetText::A2))
-    assert_equal([TestGetText::A2, TestGetText, GetText], GetText.bound_targets(A2))
+    assert_equal([TestGetText::A2, TestGetText, Object], GetText.bound_targets(::TestGetText::A2))
+    assert_equal([TestGetText::A2, TestGetText, Object], GetText.bound_targets(A2))
 
-    assert_equal([A::B, A, GetText], GetText.bound_targets(A::B))
-    assert_equal([A::B::C, A::B, A, GetText], GetText.bound_targets(A::B::C))
-    assert_equal([A::D::E, A::D, A, GetText], GetText.bound_targets(A::D::E))
-    assert_equal([F::G::H, F::G, F, GetText], GetText.bound_targets(F::G::H))
+    assert_equal([A::B, A, Object], GetText.bound_targets(A::B))
+    assert_equal([A::B::C, A::B, A, Object], GetText.bound_targets(A::B::C))
+    assert_equal([A::D::E, A::D, A, Object], GetText.bound_targets(A::D::E))
+    assert_equal([F::G::H, F::G, F, Object], GetText.bound_targets(F::G::H))
 
     # Anonymous classes/modules are bound to GetText
-    assert_equal([GetText], GetText.bound_targets(@@anon::I))
-    assert_equal([GetText], GetText.bound_targets(@@anon::J))
+    assert_equal([Object], GetText.bound_targets(@@anon::I))
+    assert_equal([Object], GetText.bound_targets(@@anon::J))
   end
 
   def test_anonymous_module

data/test/test_gettext_toplevel.rb

@@ -0,0 +1,44 @@
+require 'test/unit'
+
+require 'gettext.rb'
+include GetText
+
+bindtextdomain("test1", "locale")
+module Mod
+  module_function
+  def module_function
+    _("language")
+  end
+end
+
+class Cls
+  def instance_method
+    _("language")
+  end
+  def self.class_method
+    _("language")
+  end
+end
+
+def toplevel_method
+  _("language")
+end
+
+class TestGetText < Test::Unit::TestCase
+  include GetText
+
+  def test_toplevel
+    GetText.locale = "ja"
+    assert_equal("japanese", toplevel_method)
+    assert_equal("japanese", Mod.module_function)
+    assert_equal("japanese", Cls.class_method)
+    assert_equal("japanese", Cls.new.instance_method)
+
+    GetText.remove_all_textdomains
+    GetText.bindtextdomain("test1", "locale")
+    assert_equal("japanese", toplevel_method)
+    assert_equal("japanese", Mod.module_function)
+    assert_equal("japanese", Cls.class_method)
+    assert_equal("japanese", Cls.new.instance_method)
+  end
+end

data/test/test_locale.rb

@@ -234,30 +234,12 @@ class TestLocale < Test::Unit::TestCase
       loc = Locale.set("ja_JP")
       assert_equal("ja_JP", loc.to_str)
       assert_equal("ja_JP", Locale.get.to_str)
-      if /openbsd/ =~ RUBY_PLATFORM
-        assert_equal(nil, Locale.codeset)
-      else
-        assert_equal("eucJP", Locale.codeset)
-      end
+      assert_equal("eucJP", Locale.codeset)
 
       # Confirm to set Locale::Object
       assert_equal(loc, Locale.set(loc))
     end
 
-=begin
-    # Deprecated
-    loc = Locale.set(Locale::CTYPE, "ja_JP.eucJP")
-    assert_equal("ja_JP", loc.to_str)
-    assert_equal("ja_JP", Locale.get.to_str)
-    assert_equal("eucJP", Locale.codeset)
-
-    # Deprecated
-    loc = Locale.set(Locale::CTYPE, "ja_JP.UTF-8")
-    assert_equal("ja_JP", loc.to_str)
-    assert_equal("ja_JP", Locale.get.to_str)
-    assert_equal("UTF-8", Locale.codeset)
-=end
-
   end
 end
 

metadata

@@ -1,33 +1,28 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.4
-specification_version: 1
 name: gettext
 version: !ruby/object:Gem::Version 
-  version: 1.90.0
-date: 2008-02-03 00:00:00 +09:00
-summary: Ruby-GetText-Package is a libary and tools to localize messages.
-require_paths: 
-- lib
-email: mutoh@highway.ne.jp
-homepage: http://gettext.rubyforge.org/
-rubyforge_project: gettext
-description: Ruby-GetText-Package is a GNU GetText-like program for Ruby. The catalog file(po-file) is same format with GNU GetText. So you can use GNU GetText tools for maintaining.
-autorequire: 
-default_executable: 
-bindir: bin
-has_rdoc: false
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
+  version: 1.91.0
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - Masao Mutoh
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2008-05-11 00:00:00 +09:00
+default_executable: 
+dependencies: []
+
+description: Ruby-GetText-Package is a GNU GetText-like program for Ruby. The catalog file(po-file) is same format with GNU GetText. So you can use GNU GetText tools for maintaining.
+email: mutoh@highway.ne.jp
+executables: 
+- rgettext
+- rmsgfmt
+- rmsgmerge
+extensions: []
+
+extra_rdoc_files: []
+
 files: 
 - po
 - po/es
@@ -45,6 +40,9 @@ files:
 - po/ko/rgettext.po
 - po/ko/rails.po
 - po/rgettext.pot
+- po/sr
+- po/sr/rgettext.po
+- po/sr/rails.po
 - po/nb
 - po/nb/rgettext.po
 - po/nb/rails.po
@@ -136,12 +134,16 @@ files:
 - doc/classes/Iconv.html
 - doc/classes/Locale
 - doc/classes/Locale/Object.html
+- doc/classes/Locale/SystemWin32Table.html
 - doc/classes/Locale/SystemWin32.html
 - doc/classes/Locale/SystemPosix.html
 - doc/classes/Locale/SystemBase.html
 - doc/classes/Locale/SystemCGI.html
 - doc/classes/Locale/SystemJRuby.html
 - doc/classes/Locale.html
+- doc/classes/ActionView
+- doc/classes/ActionView/Helpers
+- doc/classes/ActionView/Helpers/FormBuilder.html
 - doc/classes/MOFile.html
 - doc/classes/Module.html
 - doc/classes/String.html
@@ -231,6 +233,14 @@ files:
 - samples/po/ko/hellotk.po
 - samples/po/ko/hellogtk.po
 - samples/po/ko/hello.po
+- samples/po/sr
+- samples/po/sr/hello_plural.po
+- samples/po/sr/hello_noop.po
+- samples/po/sr/hello2.po
+- samples/po/sr/helloglade2.po
+- samples/po/sr/hellotk.po
+- samples/po/sr/hellogtk.po
+- samples/po/sr/hello.po
 - samples/po/hellotk.pot
 - samples/po/nb
 - samples/po/nb/hello_plural.po
@@ -422,6 +432,15 @@ files:
 - samples/locale/ko/LC_MESSAGES/hello_plural.mo
 - samples/locale/ko/LC_MESSAGES/hellotk.mo
 - samples/locale/ko/LC_MESSAGES/helloglade2.mo
+- samples/locale/sr
+- samples/locale/sr/LC_MESSAGES
+- samples/locale/sr/LC_MESSAGES/hello_noop.mo
+- samples/locale/sr/LC_MESSAGES/hello.mo
+- samples/locale/sr/LC_MESSAGES/hello2.mo
+- samples/locale/sr/LC_MESSAGES/hellogtk.mo
+- samples/locale/sr/LC_MESSAGES/hello_plural.mo
+- samples/locale/sr/LC_MESSAGES/hellotk.mo
+- samples/locale/sr/LC_MESSAGES/helloglade2.mo
 - samples/locale/nb
 - samples/locale/nb/LC_MESSAGES
 - samples/locale/nb/LC_MESSAGES/hello_noop.mo
@@ -591,6 +610,8 @@ files:
 - samples/rails/po/cs/blog.po
 - samples/rails/po/ko
 - samples/rails/po/ko/blog.po
+- samples/rails/po/sr
+- samples/rails/po/sr/blog.po
 - samples/rails/po/nb
 - samples/rails/po/nb/blog.po
 - samples/rails/po/zh
@@ -680,6 +701,9 @@ files:
 - samples/rails/locale/ko
 - samples/rails/locale/ko/LC_MESSAGES
 - samples/rails/locale/ko/LC_MESSAGES/blog.mo
+- samples/rails/locale/sr
+- samples/rails/locale/sr/LC_MESSAGES
+- samples/rails/locale/sr/LC_MESSAGES/blog.mo
 - samples/rails/locale/nb
 - samples/rails/locale/nb/LC_MESSAGES
 - samples/rails/locale/nb/LC_MESSAGES/blog.mo
@@ -747,6 +771,7 @@ files:
 - samples/rails/test/test_helper.rb
 - samples/rails/test/unit
 - samples/rails/test/unit/article_test.rb
+- samples/rails/log
 - samples/rails/config
 - samples/rails/config/initializers
 - samples/rails/config/initializers/mime_types.rb
@@ -788,6 +813,8 @@ files:
 - samples/rails/vendor/plugins/gettext/po/cs/gettext_plugin.po
 - samples/rails/vendor/plugins/gettext/po/ko
 - samples/rails/vendor/plugins/gettext/po/ko/gettext_plugin.po
+- samples/rails/vendor/plugins/gettext/po/sr
+- samples/rails/vendor/plugins/gettext/po/sr/gettext_plugin.po
 - samples/rails/vendor/plugins/gettext/po/nb
 - samples/rails/vendor/plugins/gettext/po/nb/gettext_plugin.po
 - samples/rails/vendor/plugins/gettext/po/zh
@@ -839,6 +866,9 @@ files:
 - samples/rails/vendor/plugins/gettext/locale/ko
 - samples/rails/vendor/plugins/gettext/locale/ko/LC_MESSAGES
 - samples/rails/vendor/plugins/gettext/locale/ko/LC_MESSAGES/gettext_plugin.mo
+- samples/rails/vendor/plugins/gettext/locale/sr
+- samples/rails/vendor/plugins/gettext/locale/sr/LC_MESSAGES
+- samples/rails/vendor/plugins/gettext/locale/sr/LC_MESSAGES/gettext_plugin.mo
 - samples/rails/vendor/plugins/gettext/locale/nb
 - samples/rails/vendor/plugins/gettext/locale/nb/LC_MESSAGES
 - samples/rails/vendor/plugins/gettext/locale/nb/LC_MESSAGES/gettext_plugin.mo
@@ -918,6 +948,11 @@ files:
 - samples/cgi/po/ko/helloerb2.po
 - samples/cgi/po/ko/main.po
 - samples/cgi/po/ko/helloerb1.po
+- samples/cgi/po/sr
+- samples/cgi/po/sr/hellolib.po
+- samples/cgi/po/sr/helloerb2.po
+- samples/cgi/po/sr/main.po
+- samples/cgi/po/sr/helloerb1.po
 - samples/cgi/po/nb
 - samples/cgi/po/nb/hellolib.po
 - samples/cgi/po/nb/helloerb2.po
@@ -1036,6 +1071,12 @@ files:
 - samples/cgi/locale/ko/LC_MESSAGES/main.mo
 - samples/cgi/locale/ko/LC_MESSAGES/hellolib.mo
 - samples/cgi/locale/ko/LC_MESSAGES/helloerb1.mo
+- samples/cgi/locale/sr
+- samples/cgi/locale/sr/LC_MESSAGES
+- samples/cgi/locale/sr/LC_MESSAGES/helloerb2.mo
+- samples/cgi/locale/sr/LC_MESSAGES/main.mo
+- samples/cgi/locale/sr/LC_MESSAGES/hellolib.mo
+- samples/cgi/locale/sr/LC_MESSAGES/helloerb1.mo
 - samples/cgi/locale/nb
 - samples/cgi/locale/nb/LC_MESSAGES
 - samples/cgi/locale/nb/LC_MESSAGES/helloerb2.mo
@@ -1221,6 +1262,7 @@ files:
 - test/po/active_record.pot
 - test/test_erb.rxml
 - test/test_rails_caching.rb
+- test/test_gettext_toplevel.rb
 - test/test.bat
 - test/fixtures
 - test/fixtures/developers.yml
@@ -1339,10 +1381,6 @@ files:
 - test/rails/public/stylesheets
 - test/rails/public/stylesheets/scaffold.css
 - test/rails/public/dispatch.cgi
-- test/rails/locale
-- test/rails/locale/ja
-- test/rails/locale/ja/LC_MESSAGES
-- test/rails/locale/ja/LC_MESSAGES/rails_test.mo
 - test/rails/db
 - test/rails/db/schema.rb
 - test/rails/README
@@ -1386,9 +1424,6 @@ files:
 - test/rails/test/unit/article_test.rb
 - test/rails/test/integration
 - test/rails/test/integration/general_stories_test.rb
-- test/rails/log
-- test/rails/log/development.log
-- test/rails/log/test.log
 - test/rails/config
 - test/rails/config/boot.rb
 - test/rails/config/routes.rb
@@ -1465,6 +1500,10 @@ files:
 - data/locale/ko/LC_MESSAGES
 - data/locale/ko/LC_MESSAGES/rgettext.mo
 - data/locale/ko/LC_MESSAGES/rails.mo
+- data/locale/sr
+- data/locale/sr/LC_MESSAGES
+- data/locale/sr/LC_MESSAGES/rgettext.mo
+- data/locale/sr/LC_MESSAGES/rails.mo
 - data/locale/nb
 - data/locale/nb/LC_MESSAGES
 - data/locale/nb/LC_MESSAGES/rgettext.mo
@@ -1537,19 +1576,31 @@ files:
 - data/locale/ca/LC_MESSAGES/rgettext.mo
 - data/locale/ca/LC_MESSAGES/rails.mo
 - Rakefile
-test_files: []
-
+has_rdoc: true
+homepage: http://gettext.rubyforge.org/
+post_install_message: 
 rdoc_options: []
 
-extra_rdoc_files: []
-
-executables: 
-- rgettext
-- rmsgfmt
-- rmsgmerge
-extensions: []
-
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
 requirements: []
 
-dependencies: []
+rubyforge_project: gettext
+rubygems_version: 1.0.1
+signing_key: 
+specification_version: 2
+summary: Ruby-GetText-Package is a libary and tools to localize messages.
+test_files: []