gettext 2.1.0 → 2.2.0

data/po/vi/rgettext.po

@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ruby-gettext 2.1.0\n"
-"POT-Creation-Date: 2009-11-08 22:43+0900\n"
+"POT-Creation-Date: 2010-06-25 01:16+0900\n"
 "PO-Revision-Date: 2008-07-13 21:28+0900\n"
 "Last-Translator: Ngoc Dao <ngocdaothanh@gmail.com>\n"
 "Language-Team: Vietnamese\n"
@@ -33,17 +33,17 @@ msgstr ""
 "có chứa lời dịch. Tập tin ref.pot là tập tin PO được tạo ra lần trước có "
 "chứa tham chiếu mới nhất. ref.pot thường do rgettext tạo ra."
 
-#: lib/gettext/tools/rmsgmerge.rb:407 lib/gettext/tools/rgettext.rb:149
+#: lib/gettext/tools/rmsgmerge.rb:407 lib/gettext/tools/rgettext.rb:176
 #: lib/gettext/tools/rmsgfmt.rb:50
 msgid "Specific options:"
 msgstr "Tùy chọn cụ thể:"
 
-#: lib/gettext/tools/rmsgmerge.rb:409 lib/gettext/tools/rgettext.rb:151
+#: lib/gettext/tools/rmsgmerge.rb:409 lib/gettext/tools/rgettext.rb:178
 #: lib/gettext/tools/rmsgfmt.rb:52
 msgid "write output to specified file"
 msgstr "ghi ra tập tin được chỉ định"
 
-#: lib/gettext/tools/rmsgmerge.rb:420 lib/gettext/tools/rgettext.rb:168
+#: lib/gettext/tools/rmsgmerge.rb:420 lib/gettext/tools/rgettext.rb:195
 #: lib/gettext/tools/rmsgfmt.rb:56
 msgid "display version information and exit"
 msgstr "hiện thông tin về phiên bản rồi thoát"
@@ -64,31 +64,31 @@ msgstr "`%{file}' không có định dạng là glade-2.0."
 msgid "'%{klass}' is ignored."
 msgstr "'%{klass}' đã được bỏ qua."
 
-#: lib/gettext/tools/rgettext.rb:134
+#: lib/gettext/tools/rgettext.rb:161
 msgid "Error parsing %{path}"
 msgstr ""
 
-#: lib/gettext/tools/rgettext.rb:145
+#: lib/gettext/tools/rgettext.rb:172
 msgid "Usage: %s input.rb [-r parser.rb] [-o output.pot]"
 msgstr "Cách sử dụng: %s input.rb [-r parser.rb] [-o output.pot]"
 
-#: lib/gettext/tools/rgettext.rb:147
+#: lib/gettext/tools/rgettext.rb:174
 msgid "Extract translatable strings from given input files."
 msgstr "Trích chuỗi cần dịch từ những tập tin đầu vào."
 
-#: lib/gettext/tools/rgettext.rb:155
+#: lib/gettext/tools/rgettext.rb:182
 msgid "File '%s' already exists."
 msgstr "Tập tin '%s' đã tồn tại."
 
-#: lib/gettext/tools/rgettext.rb:160
+#: lib/gettext/tools/rgettext.rb:187
 msgid "require the library before executing rgettext"
 msgstr "require thư viện trước khi chạy rgettext"
 
-#: lib/gettext/tools/rgettext.rb:164
+#: lib/gettext/tools/rgettext.rb:191
 msgid "run in debugging mode"
 msgstr "chạy trong chế độ debug"
 
-#: lib/gettext/tools/rgettext.rb:192 lib/gettext/tools/rmsgfmt.rb:29
+#: lib/gettext/tools/rgettext.rb:218 lib/gettext/tools/rmsgfmt.rb:29
 msgid "no input files"
 msgstr "không có tập tin đầu vào"
 
@@ -120,9 +120,14 @@ msgid ""
 msgstr ""
 
 #: lib/gettext/runtime/textdomain_manager.rb:147
-msgid "3rd parmeter is wrong: value = %{number}"
+#, fuzzy
+msgid "ngettext: 3rd parmeter is wrong: value = %{number}"
 msgstr "Tham số thứ 3 sai: giá trị = %{number}"
 
+#: lib/gettext/runtime/textdomain_manager.rb:153
+msgid "ngettext: 3rd parameter should be a number, not nil."
+msgstr ""
+
 #: src/poparser.ry:38 src/poparser.ry:55
 msgid "Warning: fuzzy message was ignored.\n"
 msgstr "Cảnh báo: fuzzy message đã bị bỏ qua.\n"

data/po/zh/rgettext.po

@@ -12,7 +12,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ruby-gettext 2.1.0\n"
-"POT-Creation-Date: 2009-11-08 22:43+0900\n"
+"POT-Creation-Date: 2010-06-25 01:16+0900\n"
 "PO-Revision-Date: 2006-04-15 13:11+0300\n"
 "Last-Translator: Yang Bob <bob.yang.dev at gmail.com>\n"
 "Language-Team: Simplified Chinese\n"
@@ -35,17 +35,17 @@ msgstr ""
 "合并两个同样形式的 po 文件， def.po 是原來有翻译的文件，ref.pot 是经过原始码"
 "更新过的新文件，ref.pot 一般是由 rgettext 建立的。"
 
-#: lib/gettext/tools/rmsgmerge.rb:407 lib/gettext/tools/rgettext.rb:149
+#: lib/gettext/tools/rmsgmerge.rb:407 lib/gettext/tools/rgettext.rb:176
 #: lib/gettext/tools/rmsgfmt.rb:50
 msgid "Specific options:"
 msgstr "具体选项："
 
-#: lib/gettext/tools/rmsgmerge.rb:409 lib/gettext/tools/rgettext.rb:151
+#: lib/gettext/tools/rmsgmerge.rb:409 lib/gettext/tools/rgettext.rb:178
 #: lib/gettext/tools/rmsgfmt.rb:52
 msgid "write output to specified file"
 msgstr "输出到指定文件"
 
-#: lib/gettext/tools/rmsgmerge.rb:420 lib/gettext/tools/rgettext.rb:168
+#: lib/gettext/tools/rmsgmerge.rb:420 lib/gettext/tools/rgettext.rb:195
 #: lib/gettext/tools/rmsgfmt.rb:56
 msgid "display version information and exit"
 msgstr "显示版本信息并退出"
@@ -66,31 +66,31 @@ msgstr "`%{file}'不是glade-2.0格式。"
 msgid "'%{klass}' is ignored."
 msgstr "'%{klass}'被忽略。"
 
-#: lib/gettext/tools/rgettext.rb:134
+#: lib/gettext/tools/rgettext.rb:161
 msgid "Error parsing %{path}"
 msgstr ""
 
-#: lib/gettext/tools/rgettext.rb:145
+#: lib/gettext/tools/rgettext.rb:172
 msgid "Usage: %s input.rb [-r parser.rb] [-o output.pot]"
 msgstr "使用方法：%s input.rb [-r parser.rb] [-o output.pot]"
 
-#: lib/gettext/tools/rgettext.rb:147
+#: lib/gettext/tools/rgettext.rb:174
 msgid "Extract translatable strings from given input files."
 msgstr "从给定输入文件中提取翻译字符串。"
 
-#: lib/gettext/tools/rgettext.rb:155
+#: lib/gettext/tools/rgettext.rb:182
 msgid "File '%s' already exists."
 msgstr "文件'%s'已经存在。"
 
-#: lib/gettext/tools/rgettext.rb:160
+#: lib/gettext/tools/rgettext.rb:187
 msgid "require the library before executing rgettext"
 msgstr "在执行 rgettext 之前需要一个库"
 
-#: lib/gettext/tools/rgettext.rb:164
+#: lib/gettext/tools/rgettext.rb:191
 msgid "run in debugging mode"
 msgstr "运行于调试模式"
 
-#: lib/gettext/tools/rgettext.rb:192 lib/gettext/tools/rmsgfmt.rb:29
+#: lib/gettext/tools/rgettext.rb:218 lib/gettext/tools/rmsgfmt.rb:29
 msgid "no input files"
 msgstr "没有输入文件"
 
@@ -121,9 +121,14 @@ msgid ""
 msgstr ""
 
 #: lib/gettext/runtime/textdomain_manager.rb:147
-msgid "3rd parmeter is wrong: value = %{number}"
+#, fuzzy
+msgid "ngettext: 3rd parmeter is wrong: value = %{number}"
 msgstr "第三个参数错误：value = %{number}"
 
+#: lib/gettext/runtime/textdomain_manager.rb:153
+msgid "ngettext: 3rd parameter should be a number, not nil."
+msgstr ""
+
 #: src/poparser.ry:38 src/poparser.ry:55
 msgid "Warning: fuzzy message was ignored.\n"
 msgstr "警告：不明确信息(fuzzy message)已被忽略。"

data/po/zh_TW/rgettext.po

@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ruby-gettext 2.1.0\n"
-"POT-Creation-Date: 2009-11-08 22:43+0900\n"
+"POT-Creation-Date: 2010-06-25 01:16+0900\n"
 "PO-Revision-Date: 2006-08-21 09:39+0800\n"
 "Last-Translator: Yang Bob <bob.yang.dev at gmail.com>\n"
 "Language-Team: zh_TW <xmarsh at gmail.com>\n"
@@ -34,17 +34,17 @@ msgstr ""
 "合併兩同樣形式的 po 檔， def.po 檔是原來有翻譯的檔案，ref.pot 檔是經過原始碼"
 "更新過的新檔，ref.pot 一般是由rgettext 建立。"
 
-#: lib/gettext/tools/rmsgmerge.rb:407 lib/gettext/tools/rgettext.rb:149
+#: lib/gettext/tools/rmsgmerge.rb:407 lib/gettext/tools/rgettext.rb:176
 #: lib/gettext/tools/rmsgfmt.rb:50
 msgid "Specific options:"
 msgstr "特殊選項:"
 
-#: lib/gettext/tools/rmsgmerge.rb:409 lib/gettext/tools/rgettext.rb:151
+#: lib/gettext/tools/rmsgmerge.rb:409 lib/gettext/tools/rgettext.rb:178
 #: lib/gettext/tools/rmsgfmt.rb:52
 msgid "write output to specified file"
 msgstr "輸出到指定檔案"
 
-#: lib/gettext/tools/rmsgmerge.rb:420 lib/gettext/tools/rgettext.rb:168
+#: lib/gettext/tools/rmsgmerge.rb:420 lib/gettext/tools/rgettext.rb:195
 #: lib/gettext/tools/rmsgfmt.rb:56
 msgid "display version information and exit"
 msgstr "秀出版本資訊後退出"
@@ -65,31 +65,31 @@ msgstr "`%{file}' 不是 glade-2.0 格式"
 msgid "'%{klass}' is ignored."
 msgstr "'%{klass}' 忽略"
 
-#: lib/gettext/tools/rgettext.rb:134
+#: lib/gettext/tools/rgettext.rb:161
 msgid "Error parsing %{path}"
 msgstr ""
 
-#: lib/gettext/tools/rgettext.rb:145
+#: lib/gettext/tools/rgettext.rb:172
 msgid "Usage: %s input.rb [-r parser.rb] [-o output.pot]"
 msgstr "使用: %s input.rb [-r parser.rb] [-o output.pot]"
 
-#: lib/gettext/tools/rgettext.rb:147
+#: lib/gettext/tools/rgettext.rb:174
 msgid "Extract translatable strings from given input files."
 msgstr "從輸入檔中取出翻譯字串"
 
-#: lib/gettext/tools/rgettext.rb:155
+#: lib/gettext/tools/rgettext.rb:182
 msgid "File '%s' already exists."
 msgstr "檔案 '%s' 已經存在"
 
-#: lib/gettext/tools/rgettext.rb:160
+#: lib/gettext/tools/rgettext.rb:187
 msgid "require the library before executing rgettext"
 msgstr "在執行 rgettext 之前需要一個庫"
 
-#: lib/gettext/tools/rgettext.rb:164
+#: lib/gettext/tools/rgettext.rb:191
 msgid "run in debugging mode"
 msgstr "執行除錯模式"
 
-#: lib/gettext/tools/rgettext.rb:192 lib/gettext/tools/rmsgfmt.rb:29
+#: lib/gettext/tools/rgettext.rb:218 lib/gettext/tools/rmsgfmt.rb:29
 msgid "no input files"
 msgstr "無輸入檔"
 
@@ -120,9 +120,14 @@ msgid ""
 msgstr ""
 
 #: lib/gettext/runtime/textdomain_manager.rb:147
-msgid "3rd parmeter is wrong: value = %{number}"
+#, fuzzy
+msgid "ngettext: 3rd parmeter is wrong: value = %{number}"
 msgstr "第三个参数錯誤：value = %{number}"
 
+#: lib/gettext/runtime/textdomain_manager.rb:153
+msgid "ngettext: 3rd parameter should be a number, not nil."
+msgstr ""
+
 #: src/poparser.ry:38 src/poparser.ry:55
 msgid "Warning: fuzzy message was ignored.\n"
 msgstr "警告: fuzzy 訊息被忽略\n"

data/samples/cgi/hellolib.rb

@@ -3,7 +3,7 @@
 #
 # Copyright (C) 2005-2009  Masao Mutoh
 #
-# This file is distributed under the same 
+# This file is distributed under the same
 # license as Ruby-GetText-Package.
 #
 

data/samples/cgi/http.rb

@@ -13,16 +13,16 @@ require 'cgi'
 require 'rbconfig'
 
 interpreter = File.join(Config::CONFIG['bindir'], Config::CONFIG['ruby_install_name']) +
- 			       Config::CONFIG['EXEEXT']
+              Config::CONFIG['EXEEXT']
 
 srv = WEBrick::HTTPServer.new({:BindAddress => '127.0.0.1',
                                :Logger => WEBrick::Log::new($stderr, WEBrick::Log::DEBUG),
-			       :CGIInterpreter => interpreter,
-			      # :CGIInterpreter => "ruby -d",
-			       :Port => 10080})
+             :CGIInterpreter => interpreter,
+            # :CGIInterpreter => "ruby -d",
+             :Port => 10080})
 
 ['INT', 'TERM'].each { |signal|
-   trap(signal){ srv.shutdown} 
+   trap(signal){ srv.shutdown}
 }
 
 srv.mount("/", WEBrick::HTTPServlet::FileHandler, File.expand_path('.'))

data/samples/hello.rb

@@ -21,7 +21,7 @@ if __FILE__ == $0
   a = HelloWorld.new
 
   a.hello # Show in your locale
-  
+
   old = GetText.locale
   p old.to_s # Show current locale
 

data/samples/hello_gtk2.rb

@@ -11,7 +11,7 @@ require 'gtk2'
 class LocalizedWindow < Gtk::Window
   include GetText
 
-  bindtextdomain("hello_gtk", :path => "locale", :output_charset => "utf-8") 
+  bindtextdomain("hello_gtk", :path => "locale", :output_charset => "utf-8")
 
   def initialize
     super

data/samples/hello_noop.rb

@@ -14,7 +14,7 @@ class HelloNoop
 
   def initialize
     # You can call bindtextdomain as instance methods.
-    # In this case, it initializes(decided the locale lazily) 
+    # In this case, it initializes(decided the locale lazily)
     # in a instance.
     bindtextdomain("hello_noop", :path => "locale")
   end

data/samples/makemo.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'rubygems'
 require 'gettext/tools'
 

data/samples/po/test.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 filename, to = ARGV
 p filename
 p to

data/test/Rakefile

@@ -12,6 +12,6 @@ desc 'Run all tests'
 task :test do
    Dir.glob("**/test_*.rb").each do |path|
     puts ""
-    ruby "-I../lib:../../locale/lib -rubygems #{path}"
+    ruby "-I../lib:../../locale/lib:. -rubygems #{path}"
    end
 end

data/test/test_class_info.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'testlib/helper.rb'
 require 'gettext/runtime/class_info'
 
@@ -80,4 +82,7 @@ class TestClassInfo < Test::Unit::TestCase
     assert_equal [M8, M8::M9, Object], related_classes(M8)
   end
 
+  def test_ruby19
+    assert_equal Object, GetText::ClassInfo.normalize_class(Module.new)
+  end
 end

data/test/test_gettext.rb

@@ -110,10 +110,14 @@ DDD
     assert_equal(["a picture", "%{num} pictures"], test.test_5)
   end
 
-  def test_n_defaults_to_1_when_number_is_missing
+  def test_ngettext_defaults_to_1_when_number_is_missing
     assert_equal n_("aaa","aaa2",1), "aaa"
   end
 
+  def test_ngettext_format_error
+    assert_raise(ArgumentError) { n_("aaa", "aaa2") }
+  end
+
   def test_nsgettext
     GetText.locale = nil
     test = TestNSGetText.new
@@ -308,4 +312,11 @@ DDD
     assert(GetText._("language").frozen?)
   end
 
+  def test_safe_mode
+    Thread.start{
+      $SAFE = 1
+      GetText.bindtextdomain("test1", :path => "locale")
+      _("language")
+    }.join
+  end
 end

data/test/test_locale_path.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'testlib/helper.rb'
 require 'testlib/simple'
 
@@ -14,8 +16,8 @@ class TestLocalePath < Test::Unit::TestCase
     default_locale_dirs = [
       "./locale/%{lang}/LC_MESSAGES/%{name}.mo",
       "./locale/%{lang}/%{name}.mo",
-      "#{Config::CONFIG['datadir']}/locale/%{lang}/LC_MESSAGES/%{name}.mo",
-      "#{Config::CONFIG['datadir'].gsub(/\/local/, "")}/locale/%{lang}/LC_MESSAGES/%{name}.mo",
+      "#{RbConfig::CONFIG['datadir']}/locale/%{lang}/LC_MESSAGES/%{name}.mo",
+      "#{RbConfig::CONFIG['datadir'].gsub(/\/local/, "")}/locale/%{lang}/LC_MESSAGES/%{name}.mo",
       "#{prefix}/share/locale/%{lang}/LC_MESSAGES/%{name}.mo",
       "#{prefix}/local/share/locale/%{lang}/LC_MESSAGES/%{name}.mo"
     ].uniq
@@ -28,7 +30,7 @@ class TestLocalePath < Test::Unit::TestCase
   def test_initialize_with_topdir
     testdir = File.dirname(File.expand_path(__FILE__))
     path = GetText::LocalePath.new("test1", "#{testdir}/locale")
-    assert_equal path.locale_paths, { "ja" => "#{testdir}/locale/ja/LC_MESSAGES/test1.mo", 
+    assert_equal path.locale_paths, { "ja" => "#{testdir}/locale/ja/LC_MESSAGES/test1.mo",
                                      "fr" => "#{testdir}/locale/fr/LC_MESSAGES/test1.mo"}
     assert_equal path.current_path(Locale::Tag.parse("ja")), "#{testdir}/locale/ja/LC_MESSAGES/test1.mo"
     assert_equal path.current_path(Locale::Tag.parse("ja-JP")), "#{testdir}/locale/ja/LC_MESSAGES/test1.mo"
@@ -47,4 +49,28 @@ class TestLocalePath < Test::Unit::TestCase
     path = GetText::LocalePath.new("nodomain", "#{testdir}/locale")
     assert_equal [], path.supported_locales
   end
+
+  def test_env_GETTEXT_PATH
+    topdir = File.join(File.dirname(File.expand_path(__FILE__)), "../samples")
+    path1 = File.join(topdir, "locale")
+    path2 = File.join(topdir, "cgi", "locale")
+
+    GetText::LocalePath.memoize_clear
+    ENV["GETTEXT_PATH"] = path1
+    default_path_rules = GetText::LocalePath.default_path_rules
+    assert(Regexp.compile(path1) =~ default_path_rules[0])
+
+    GetText::LocalePath.memoize_clear
+    ENV["GETTEXT_PATH"] = "#{path1},#{path2}"
+    default_path_rules = GetText::LocalePath.default_path_rules
+    assert(Regexp.compile(path1) =~ default_path_rules[0])
+    assert(Regexp.compile(path2) =~ default_path_rules[1])
+  end
+
+  def test_default_path_rules
+    GetText::LocalePath.memoize_clear
+    $LOAD_PATH.unshift("./lib")
+    default_path_rules = GetText::LocalePath.default_path_rules
+    assert_equal($LOAD_PATH[0], "./lib")
+  end
 end