gettext 1.91.0 → 1.92.0

data/test/test_gettext.rb

@@ -10,6 +10,7 @@ require 'testlib/testlib6.rb'
 require 'testlib/gettext.rb'
 require 'testlib/sgettext.rb'
 require 'testlib/nsgettext.rb'
+require 'testlib/pgettext.rb'
 
 class TestGetText < Test::Unit::TestCase
   include GetText
@@ -19,20 +20,20 @@ class TestGetText < Test::Unit::TestCase
     return if /linux/ !~ RUBY_PLATFORM
 
     GetText.bindtextdomain("libc")
-    assert_equal("��λ���ޤ���", GetText._("Terminated"))
+    assert_equal("終了しました", GetText._("Terminated"))
 
     GetText.locale = nil
     GetText.bindtextdomain("test1", "locale")
 
     assert_equal("japanese", GetText._("language"))
     GetText.bindtextdomain("libc", "/usr/share/locale")
-    assert_equal("��λ���ޤ���", GetText._("Terminated"))
+    assert_equal("終了しました", GetText._("Terminated"))
 
     GetText.bindtextdomain("test2", "locale")
     assert_equal("JAPANESE", GetText._("LANGUAGE"))
 
     GetText.bindtextdomain("libc", "/usr/share/locale/")
-    assert_equal("��λ���ޤ���", GetText._("Terminated"))
+    assert_equal("終了しました", GetText._("Terminated"))
 
     GetText.locale = nil
     GetText.bindtextdomain("libc", "/usr/share/locale", "de")
@@ -46,7 +47,6 @@ class TestGetText < Test::Unit::TestCase
     GetText.locale = nil
     GetText.bindtextdomain("test1", "locale", "ja")
     assert_equal("japanese", GetText._("language"))
-
   end
 
   def test_bindtextdomain_include_module
@@ -130,6 +130,28 @@ DDD
     assert_equal("BBB", testlib5.test_9)
   end
 
+  def test_pgettext
+    GetText.locale = nil
+    testlib6 = TestPGetText.new
+
+    assert_equal("えーびー", testlib6.test_1)
+    assert_equal("えーびー", testlib6.test_2)
+    assert_equal("えーびーしー", testlib6.test_3)
+    assert_equal("CCC", testlib6.test_4)
+    assert_equal("しーびー", testlib6.test_5)
+    assert_equal("びー", testlib6.test_6)
+
+    GetText.locale = "en"
+    testlib6 = TestPGetText.new
+
+    assert_equal("BBB", testlib6.test_1)
+    assert_equal("BBB", testlib6.test_2)
+    assert_equal("CCC", testlib6.test_3)
+    assert_equal("CCC", testlib6.test_4)
+    assert_equal("BBB", testlib6.test_5)
+    assert_equal("BBB", testlib6.test_6)
+  end
+
   def test_nsgettext
     GetText.locale = nil
     testlib5 = TestNSGetText.new
@@ -379,4 +401,12 @@ DDD
     assert_equal("japanese", @@anon::I.new.test2)
     
   end   
+
+  def test_frozen
+    GetText.locale = "ja"
+
+    GetText.bindtextdomain("test1", "locale")
+    assert(GetText._("language").frozen?)
+  end
+
 end

data/test/test_locale.rb

@@ -229,12 +229,12 @@ class TestLocale < Test::Unit::TestCase
       assert_equal("UNICODE", Locale.get.charset)
     else
       assert_equal("ja_JP", Locale.get.to_str)
-      assert_equal("eucJP", Locale.codeset)
+      assert_equal("UTF-8", Locale.codeset)
 
       loc = Locale.set("ja_JP")
       assert_equal("ja_JP", loc.to_str)
       assert_equal("ja_JP", Locale.get.to_str)
-      assert_equal("eucJP", Locale.codeset)
+      assert_equal("UTF-8", Locale.codeset)
 
       # Confirm to set Locale::Object
       assert_equal(loc, Locale.set(loc))

data/test/test_parser.rb

@@ -75,6 +75,14 @@ class TestGetTextParser < Test::Unit::TestCase
     assert_equal(["mmmmmm\000mmm2mmm2", 'testlib/ngettext.rb:59'], ary[10])
     assert_equal(["nnn\000nnn2", 'testlib/ngettext.rb:60'], ary[11])
   end
+  
+  def test_ruby_p
+    ary = GetText::RubyParser.parse('testlib/pgettext.rb')
+    assert_equal(["AAA\004BBB", "testlib/pgettext.rb:10", "testlib/pgettext.rb:14"], ary[0])
+    assert_equal(["AAA|BBB\004CCC", "testlib/pgettext.rb:18"], ary[1])
+    assert_equal(["AAA\004CCC", "testlib/pgettext.rb:22"], ary[2])
+    assert_equal(["CCC\004BBB", "testlib/pgettext.rb:26"], ary[3])
+  end
 
   def test_glade
     ary = GetText::GladeParser.parse('testlib/gladeparser.glade')
@@ -122,8 +130,8 @@ class TestGetTextParser < Test::Unit::TestCase
     assert_equal(["Topic|Replies count", "fixtures/topic.rb:-"], ary[9])
     assert_equal(["Topic|Parent", "fixtures/topic.rb:-"], ary[10])
     assert_equal(["Topic|Type", "fixtures/topic.rb:-"], ary[11])
-    assert_equal(["Topic|Terms of service", "fixtures/topic.rb:5"], ary[12])
-    assert_equal(["must be abided", "fixtures/topic.rb:6"], ary[13])
+    assert_equal(["Topic|Terms of service", "fixtures/topic.rb:35"], ary[12])
+    assert_equal(["must be abided", "fixtures/topic.rb:36"], ary[13])
 
     GetText::ActiveRecordParser.target?("fixtures/reply.rb")
     ary = GetText::ActiveRecordParser.parse("fixtures/reply.rb")
@@ -175,6 +183,9 @@ class TestGetTextParser < Test::Unit::TestCase
     GetText::ActiveRecordParser.target?("fixtures/user.rb")
     ary = GetText::ActiveRecordParser.parse("fixtures/user.rb")
     assert_equal(0, ary.size)
+
+    ary = GetText::ActiveRecordParser.parse("fixtures/wizard.rb")
+    assert_equal(0, ary.size)
   end
 
 

data/test/test_rails_caching.rb

@@ -10,7 +10,7 @@ require 'action_controller'
 begin
   require 'breakpoint'
 rescue LoadError
-  p "breakpoint is not found."
+#  p "breakpoint is not found."
 end
 require 'action_controller/test_process'
 gem 'rails'
@@ -21,15 +21,18 @@ require 'gettext/rails'
 ActiveSupport::Deprecation.debug = true
 
 ActionController::Base.logger = nil
-ActionController::Base.ignore_missing_templates = false
+#ActionController::Base.ignore_missing_templates = false
 ActionController::Routing::Routes.reload rescue nil
 
 CACHE_DIR = 'test_cache'
 # Don't change '/../temp/' cavalierly or you might hoze something you don't want hozed
 FILE_STORE_PATH = File.join(File.dirname(__FILE__), 'cache', CACHE_DIR)
-ActionController::Base.perform_caching = true
 ActionController::Base.page_cache_directory = FILE_STORE_PATH
-ActionController::Base.fragment_cache_store = :file_store, FILE_STORE_PATH
+ActionController::Base.cache_store = :file_store, FILE_STORE_PATH
+ActionController::Base.view_paths = [ File.dirname(__FILE__) + '/../fixtures/' ]
+#ActionController::Base.perform_caching = true
+#ActionController::Base.page_cache_directory = FILE_STORE_PATH
+#ActionController::Base.fragment_cache_store = :file_store, FILE_STORE_PATH
 
 RAILS_ROOT = File.join(File.dirname(__FILE__))
 
@@ -135,6 +138,7 @@ class ActionCacheTest < Test::Unit::TestCase
     assert_not_equal cached_time, @response.body
     reset!
 
+=begin
     get :index, :lang => "ja"
     assert_response :success
     assert_equal new_cached_time, @response.body
@@ -150,6 +154,7 @@ class ActionCacheTest < Test::Unit::TestCase
     assert_response :success
     assert_equal new_cached_time_en, @response.body
     reset!
+=end
   end
 
   def test_cache_is_scoped_by_subdomain
@@ -222,4 +227,6 @@ class ActionCacheTest < Test::Unit::TestCase
       @controller = ActionCachingTestController.new
       @request.host = 'hostname.com'
     end
+
 end
+

data/test/testlib/pgettext.rb

@@ -0,0 +1,33 @@
+require 'gettext'
+
+class TestPGetText
+  include GetText
+  def initialize
+    bindtextdomain("test_pgettext", "locale")
+  end
+
+  def test_1
+    p_("AAA", "BBB")
+  end
+  
+  def test_2
+    pgettext("AAA", "BBB")
+  end
+
+  def test_3
+    pgettext("AAA|BBB", "CCC")
+  end
+  
+  def test_4
+    p_("AAA", "CCC") #not found
+  end
+
+  def test_5
+    p_("CCC", "BBB")
+  end
+
+  def test_6  # not pgettext.
+    _("BBB")
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: gettext
 version: !ruby/object:Gem::Version 
-  version: 1.91.0
+  version: 1.92.0
 platform: ruby
 authors: 
 - Masao Mutoh
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-05-11 00:00:00 +09:00
+date: 2008-08-02 00:00:00 +09:00
 default_executable: 
 dependencies: []
 
@@ -72,6 +72,9 @@ files:
 - po/hr/rails.po
 - po/et
 - po/et/rails.po
+- po/lv
+- po/lv/rgettext.po
+- po/lv/rails.po
 - po/it
 - po/it/rgettext.po
 - po/it/rails.po
@@ -108,6 +111,7 @@ files:
 - doc/classes
 - doc/classes/MOFile
 - doc/classes/MOFile/InvalidFormat.html
+- doc/classes/MOFile/HeaderRev1.html
 - doc/classes/GetText
 - doc/classes/GetText/ErbContainer.html
 - doc/classes/GetText/PoParser.html
@@ -142,6 +146,7 @@ files:
 - doc/classes/Locale/SystemJRuby.html
 - doc/classes/Locale.html
 - doc/classes/ActionView
+- doc/classes/ActionView/TemplateFinder.html
 - doc/classes/ActionView/Helpers
 - doc/classes/ActionView/Helpers/FormBuilder.html
 - doc/classes/MOFile.html
@@ -317,6 +322,14 @@ files:
 - samples/po/hr/hellotk.po
 - samples/po/hr/hellogtk.po
 - samples/po/hr/hello.po
+- samples/po/lv
+- samples/po/lv/hello_plural.po
+- samples/po/lv/hello_noop.po
+- samples/po/lv/hello2.po
+- samples/po/lv/helloglade2.po
+- samples/po/lv/hellotk.po
+- samples/po/lv/hellogtk.po
+- samples/po/lv/hello.po
 - samples/po/it
 - samples/po/it/hello_plural.po
 - samples/po/it/hello_noop.po
@@ -630,6 +643,8 @@ files:
 - samples/rails/po/ua/blog.po
 - samples/rails/po/hr
 - samples/rails/po/hr/blog.po
+- samples/rails/po/lv
+- samples/rails/po/lv/blog.po
 - samples/rails/po/it
 - samples/rails/po/it/blog.po
 - samples/rails/po/pt_BR
@@ -771,7 +786,6 @@ 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
@@ -833,6 +847,8 @@ files:
 - samples/rails/vendor/plugins/gettext/po/ua/gettext_plugin.po
 - samples/rails/vendor/plugins/gettext/po/hr
 - samples/rails/vendor/plugins/gettext/po/hr/gettext_plugin.po
+- samples/rails/vendor/plugins/gettext/po/lv
+- samples/rails/vendor/plugins/gettext/po/lv/gettext_plugin.po
 - samples/rails/vendor/plugins/gettext/po/it
 - samples/rails/vendor/plugins/gettext/po/it/gettext_plugin.po
 - samples/rails/vendor/plugins/gettext/po/pt_BR
@@ -998,6 +1014,11 @@ files:
 - samples/cgi/po/hr/helloerb2.po
 - samples/cgi/po/hr/main.po
 - samples/cgi/po/hr/helloerb1.po
+- samples/cgi/po/lv
+- samples/cgi/po/lv/hellolib.po
+- samples/cgi/po/lv/helloerb2.po
+- samples/cgi/po/lv/main.po
+- samples/cgi/po/lv/helloerb1.po
 - samples/cgi/po/it
 - samples/cgi/po/it/hellolib.po
 - samples/cgi/po/it/helloerb2.po
@@ -1246,6 +1267,7 @@ files:
 - test/po/ja/test6.po
 - test/po/ja/active_record.po
 - test/po/ja/test_sgettext.po
+- test/po/ja/test_pgettext.po
 - test/po/ja/plural_error.po
 - test/po/ja/plural.po
 - test/po/ja/test2.po
@@ -1270,6 +1292,9 @@ files:
 - test/fixtures/topic.rb
 - test/fixtures/topics.yml
 - test/fixtures/book.rb
+- test/fixtures/people.yml
+- test/fixtures/wizard.rb
+- test/fixtures/inept_wizard.rb
 - test/fixtures/reply.rb
 - test/fixtures/developer.rb
 - test/test_gladeparser.glade
@@ -1333,6 +1358,7 @@ files:
 - test/testlib/gladeparser.glade
 - test/testlib/testlib5.rb
 - test/testlib/N_.rb
+- test/testlib/pgettext.rb
 - test/testlib/testlib4.rb
 - test/testlib/sgettext.rb
 - test/testlib/testlib3.rb
@@ -1398,6 +1424,7 @@ files:
 - test/rails/test/result/fr/custom_error_message.html
 - test/rails/test/result/fr/singlepart.html
 - test/rails/test/result/fr/list.html
+- test/rails/test/result/fr/new.html
 - test/rails/test/result/fr/custom_error_message_with_plural.html
 - test/rails/test/result/ja
 - test/rails/test/result/ja/multipart.html
@@ -1448,6 +1475,7 @@ files:
 - test/rails/app/views/articles/show.html.erb
 - test/rails/app/views/articles/active_form_error.html.erb
 - test/rails/app/views/articles/multi_error_messages_for.html.erb
+- test/rails/app/views/articles/_form_fr.html.erb
 - test/rails/app/views/articles/_form.html.erb
 - test/rails/app/views/articles/list.html.erb
 - test/rails/app/views/articles/new.html.erb
@@ -1598,7 +1626,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: gettext
-rubygems_version: 1.0.1
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: Ruby-GetText-Package is a libary and tools to localize messages.