gettext 1.93.0 → 2.0.0

data/po/zh_TW/rgettext.po

@@ -9,8 +9,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: ruby-gettext 1.92.0\n"
-"POT-Creation-Date: 2008-09-14 01:48+0900\n"
+"Project-Id-Version: ruby-gettext 2.0.0\n"
+"POT-Creation-Date: 2009-02-15 11:14+0100\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"
@@ -21,124 +21,120 @@ msgstr ""
 "X-Poedit-Language: Chinese\n"
 "X-Poedit-Country: TAIWAN\n"
 
-#: lib/gettext/utils.rb:68
-msgid ""
-"`%{cmd}' may not be found. \n"
-"Install GNU Gettext then set PATH or MSGMERGE_PATH correctly."
-msgstr ""
-
-#: lib/gettext/utils.rb:80
-msgid "Failed to merge with %{defpo}"
-msgstr "不能與 %{defpo} 合併"
+#: lib/gettext/tools/rgettext.rb:43
+msgid "'%{klass}' is ignored."
+msgstr "'%{klass}' 忽略"
 
-#: lib/gettext/utils.rb:81
-msgid "New .pot was copied to %{failed_filename}"
-msgstr "新的 .pot 被复制為 %{failed_filename} 了"
+#: lib/gettext/textdomain_manager.rb:157
+msgid "3rd parmeter is wrong: value = %{number}"
+msgstr "第三个参数錯誤：value = %{number}"
 
-#: lib/gettext/utils.rb:82
+#: lib/gettext/tools.rb:75
 msgid "Check these po/pot-files. It may have syntax errors or something wrong."
 msgstr "檢査这些 po/pot-文件。它们可能有語法或者其他錯誤。"
 
-#: lib/gettext/rgettext.rb:43
-msgid "'%{klass}' is ignored."
-msgstr "'%{klass}' 忽略"
-
-#: lib/gettext/rgettext.rb:189
-msgid "Usage: %s input.rb [-r parser.rb] [-o output.pot]"
-msgstr "使用: %s input.rb [-r parser.rb] [-o output.pot]"
-
-#: lib/gettext/rgettext.rb:191
+#: lib/gettext/tools/rgettext.rb:192
 msgid "Extract translatable strings from given input files."
 msgstr "從輸入檔中取出翻譯字串"
 
-#: lib/gettext/rgettext.rb:193 lib/gettext/rmsgfmt.rb:51
-#: lib/gettext/rmsgmerge.rb:408
-msgid "Specific options:"
-msgstr "特殊選項:"
-
-#: lib/gettext/rgettext.rb:195 lib/gettext/rmsgfmt.rb:53
-#: lib/gettext/rmsgmerge.rb:410
-msgid "write output to specified file"
-msgstr "輸出到指定檔案"
+#: lib/gettext/tools.rb:73
+msgid "Failed to merge with %{defpo}"
+msgstr "不能與 %{defpo} 合併"
 
-#: lib/gettext/rgettext.rb:199
+#: lib/gettext/tools/rgettext.rb:200
 msgid "File '%s' already exists."
 msgstr "檔案 '%s' 已經存在"
 
-#: lib/gettext/rgettext.rb:204
-msgid "require the library before executing rgettext"
-msgstr "在執行 rgettext 之前需要一個庫"
+#: lib/gettext/tools/rmsgfmt.rb:47
+msgid "Generate binary message catalog from textual translation description."
+msgstr "從textual translation description產生二進位訊息 catalog"
 
-#: lib/gettext/rgettext.rb:208
-msgid "run in debugging mode"
-msgstr "執行除錯模式"
+#: lib/gettext/tools/rmsgmerge.rb:405
+msgid ""
+"Merges two Uniforum style .po files together. The def.po file is an existing "
+"PO file with translations. The ref.pot file is the last created PO file with "
+"up-to-date source references. ref.pot is generally created by rgettext."
+msgstr ""
+"合併兩同樣形式的 po 檔， def.po 檔是原來有翻譯的檔案，ref.pot 檔是經過原始碼"
+"更新過的新檔，ref.pot 一般是由rgettext 建立。"
 
-#: lib/gettext/rgettext.rb:212 lib/gettext/rmsgfmt.rb:57
-#: lib/gettext/rmsgmerge.rb:421
-msgid "display version information and exit"
-msgstr "秀出版本資訊後退出"
+#: lib/gettext/tools.rb:74
+msgid "New .pot was copied to %{failed_filename}"
+msgstr "新的 .pot 被复制為 %{failed_filename} 了"
 
-#: lib/gettext/rgettext.rb:236 lib/gettext/rmsgfmt.rb:31
-msgid "no input files"
-msgstr "無輸入檔"
+#: lib/gettext/tools/rgettext.rb:194 lib/gettext/tools/rmsgmerge.rb:407
+#: lib/gettext/tools/rmsgfmt.rb:49
+msgid "Specific options:"
+msgstr "特殊選項:"
+
+#: lib/gettext/tools/rmsgmerge.rb:402
+msgid "Usage: %s def.po ref.pot [-o output.pot]"
+msgstr "使用: %s def.po ref.pot [-o output.pot]"
 
-#: lib/gettext/rmsgfmt.rb:47
+#: lib/gettext/tools/rmsgfmt.rb:45
 msgid "Usage: %s input.po [-o output.mo]"
 msgstr "使用: %s input.po [-o output.mo]"
 
-#: lib/gettext/rmsgfmt.rb:49
-msgid "Generate binary message catalog from textual translation description."
-msgstr "從textual translation description產生二進位訊息 catalog"
+#: lib/gettext/tools/rgettext.rb:190
+msgid "Usage: %s input.rb [-r parser.rb] [-o output.pot]"
+msgstr "使用: %s input.rb [-r parser.rb] [-o output.pot]"
 
-#: lib/gettext/rmsgmerge.rb:403
-msgid "Usage: %s def.po ref.pot [-o output.pot]"
-msgstr "使用: %s def.po ref.pot [-o output.pot]"
+#: src/poparser.ry:38 src/poparser.ry:55
+msgid "Warning: fuzzy message was ignored.\n"
+msgstr "警告: fuzzy 訊息被忽略\n"
+
+#: src/poparser.ry:148
+msgid "Warning: obsolete msgid exists.\n"
+msgstr "警告: 存在過時的 msgid.\n"
 
-#: lib/gettext/rmsgmerge.rb:406
+#: lib/gettext/tools.rb:178
 msgid ""
-"Merges two Uniforum style .po files together. The def.po file is an existing "
-"PO file with translations. The ref.pot file is the last created PO file with "
-"up-to-date source references. ref.pot is generally created by rgettext."
+"`%{cmd}' can not be found. \n"
+"Install GNU Gettext then set PATH or MSGMERGE_PATH correctly."
 msgstr ""
-"合併兩同樣形式的 po 檔， def.po 檔是原來有翻譯的檔案，ref.pot 檔是經過原始碼"
-"更新過的新檔，ref.pot 一般是由rgettext 建立。"
 
-#: lib/gettext/rmsgmerge.rb:447
+#: lib/gettext/parser/glade.rb:75
+msgid "`%{file}' is not glade-2.0 format."
+msgstr "`%{file}' 不是 glade-2.0 格式"
+
+#: lib/gettext/tools/rmsgmerge.rb:446
 msgid "definition po is not given."
 msgstr "沒有指定PO檔"
 
-#: lib/gettext/rmsgmerge.rb:449
+#: lib/gettext/tools/rgettext.rb:213 lib/gettext/tools/rmsgmerge.rb:420
+#: lib/gettext/tools/rmsgfmt.rb:55
+msgid "display version information and exit"
+msgstr "秀出版本資訊後退出"
+
+#: lib/gettext/tools/rgettext.rb:237 lib/gettext/tools/rmsgfmt.rb:29
+msgid "no input files"
+msgstr "無輸入檔"
+
+#: lib/gettext/tools/rmsgmerge.rb:448
 msgid "reference pot is not given."
 msgstr "沒指定參考pot檔"
 
-#: lib/gettext/parser/glade.rb:74
-msgid "`%{file}' is not glade-2.0 format."
-msgstr "`%{file}' 不是 glade-2.0 格式"
-
-#: lib/gettext/parser/active_record.rb:39
-msgid "'%{file}' is not found."
-msgstr "'%{file}' 找不到"
+#: lib/gettext/tools/rgettext.rb:205
+msgid "require the library before executing rgettext"
+msgstr "在執行 rgettext 之前需要一個庫"
 
-#: lib/gettext/parser/active_record.rb:80
-msgid "Ignored '%{file}'. Solve dependencies first."
-msgstr "忽略檔案 '%{file}'. 先解決相依問題。"
+#: lib/gettext/tools/rgettext.rb:209
+msgid "run in debugging mode"
+msgstr "執行除錯模式"
 
-#: lib/gettext/parser/active_record.rb:104
-msgid "No database is available."
-msgstr "無資料庫可用"
+#: lib/gettext/tools/rgettext.rb:196 lib/gettext/tools/rmsgmerge.rb:409
+#: lib/gettext/tools/rmsgfmt.rb:51
+msgid "write output to specified file"
+msgstr "輸出到指定檔案"
 
-#: lib/gettext/parser/active_record.rb:140
-msgid "rubygems are not found."
-msgstr "找不到 rubygems"
+#~ msgid "'%{file}' is not found."
+#~ msgstr "'%{file}' 找不到"
 
-#: lib/gettext.rb:417
-msgid "3rd parmeter is wrong: value = %{number}"
-msgstr "第三个参数錯誤：value = %{number}"
+#~ msgid "Ignored '%{file}'. Solve dependencies first."
+#~ msgstr "忽略檔案 '%{file}'. 先解決相依問題。"
 
-#: src/poparser.ry:38 src/poparser.ry:55
-msgid "Warning: fuzzy message was ignored.\n"
-msgstr "警告: fuzzy 訊息被忽略\n"
+#~ msgid "No database is available."
+#~ msgstr "無資料庫可用"
 
-#: src/poparser.ry:148
-msgid "Warning: obsolete msgid exists.\n"
-msgstr "警告: 存在過時的 msgid.\n"
+#~ msgid "rubygems are not found."
+#~ msgstr "找不到 rubygems"

data/samples/README

@@ -5,16 +5,12 @@ $ruby sample_script.rb
 
 hello.rb        - Basic sample
 hello2.rb       - Basic sample2 (using printf)
-hello_various_format.rb - Basic sample2 (multiple line strings)
 hello_noop.rb   - N_ sample
 hello_plural.rb - n_ sample
-hellogtk.rb     - Ruby/GTK sample
-hellotk.rb      - Ruby/TK sample
-hellogtk2.rb    - Ruby/GTK2 sample(using UTF-8)
-helloglade2.rb  - Ruby/Glade2 sample(using UTF-8)
-  * you need to copy locale/ja/LC_MESSAGES/helloglade2.mo to GTK+ locale dir.
-    e.g.)/usr/share/locale/ja/LC_MESSAGES/helloglade2.mo
+hello_gtk.rb     - Ruby/GTK2 sample
+hello_tk.rb      - Ruby/TK sample
+hello_glade2.rb  - Ruby/Glade2 sample
+
 makemo.rb       - Create mo files from po files.
 
 cgi/* - CGI/ERB sample (See cgi/README)
-rails/* - Ruby on Rails sample (See rails/README)

data/samples/cgi/Rakefile

@@ -1,10 +1,10 @@
 task :default => [:makemo]
 
-require 'gettext/utils'
+require 'gettext/tools'
 
 desc "Create *.mo from *.po"
 task :makemo  do
-  GetText.create_mofiles(false, "po", "locale")
+  GetText.create_mofiles(:mo_root => "locale")
 end
 
 desc "Update pot/po files to match new version."

data/samples/cgi/cookie.cgi

@@ -12,6 +12,7 @@
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
 =end
+$:.insert(0, "../../lib")
 
 # gettext/cgi support CGI.
 begin

data/samples/cgi/helloerb1.cgi

@@ -7,22 +7,25 @@
   Recommanded to set UTF-8 forcely because some web browser
   doesn't send HTTP_ACCEPT_CHARSET correctly.
 
-  Copyright (C) 2005  Masao Mutoh
+  Copyright (C) 2005-2009  Masao Mutoh
 
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
 =end
+$:.insert(0, "../../lib")
+
 begin
   require 'rubygems'
 rescue LoadError
 end
 
+require 'erb'
 require 'gettext/cgi'
-require 'gettext/erb'
 
 class SimpleContainer1
-  include GetText::ErbContainer
+  include GetText
 
+  
   def initialize(domainname, domainpath, cgi)
     set_cgi(cgi)
     bindtextdomain(domainname, :path => domainpath)
@@ -34,7 +37,8 @@ class SimpleContainer1
   end
 
   def to_html(path)
-    eval_file(path)
+    erb = ERB.new(IO.read(path)).src
+    eval(erb, binding)
   end
 end
 

data/samples/cgi/helloerb2.cgi

@@ -13,6 +13,7 @@
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
 =end
+$:.insert(0, "../../lib")
 
 begin
   require 'rubygems'
@@ -20,10 +21,10 @@ rescue LoadError
 end
 
 require 'gettext/cgi'
-require 'gettext/erb'
+require 'erb'
 
 class SimpleContainer2
-  include GetText::ErbContainer
+  include GetText
 
   def initialize(domainname, domainpath)
     bindtextdomain(domainname, :path => domainpath)
@@ -35,14 +36,15 @@ class SimpleContainer2
   end
 
   def to_html(path)
-    eval_file(path)
+    erb = ERB.new(IO.read(path)).src
+    eval(erb, binding)
   end
 end
 
 cgi = CGI.new
 GetText.set_cgi(cgi)
 
-print "Content-type:text/html; charset=#{Locale.get.charset}\n\n"
+print "Content-type:text/html; charset=#{Locale.charset}\n\n"
 
 con = SimpleContainer2.new("helloerb2", "locale")
 

data/samples/cgi/hellolib.rb

@@ -11,9 +11,8 @@
 
 require 'gettext'
 
-include GetText
-
 class HelloLib
+  include GetText
   bindtextdomain("hellolib", "locale")
   def hello
     _("This message is from hellolib.")

data/samples/cgi/index.cgi

@@ -12,6 +12,7 @@
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
 =end
+$:.insert(0, "../../lib")
 
 # gettext/cgi support CGI.
 begin

data/samples/cgi/po/ja/helloerb1.po

@@ -4,7 +4,7 @@
 #
 # This file is distributed under the same license as the Ruby-GetText-Package.
 #
-# Masao Mutoh <mutoh@highway.ne.jp>, 2005.
+# Masao Mutoh <mutomasa at gmail.com>, 2005.
 #
 #, fuzzy
 msgid ""
@@ -12,7 +12,7 @@ msgstr ""
 "Project-Id-Version: cgi-sample 1.1.1\n"
 "POT-Creation-Date: 2006-01-07 14:48+0900\n"
 "PO-Revision-Date: 2005-04-23 12:44+0900\n"
-"Last-Translator: Masao Mutoh <mutoh@highway.ne.jp>\n"
+"Last-Translator: Masao Mutoh <mutomasa at gmail.com>\n"
 "Language-Team: Japanese\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

data/samples/cgi/po/ja/helloerb2.po

@@ -4,7 +4,7 @@
 #
 # This file is distributed under the same license as the Ruby-GetText-Package.
 #
-# Masao Mutoh <mutoh@highway.ne.jp>, 2005.
+# Masao Mutoh <mutomasa at gmail.com>, 2005.
 #
 #, fuzzy
 msgid ""
@@ -12,7 +12,7 @@ msgstr ""
 "Project-Id-Version: cgi-sample 1.1.1\n"
 "POT-Creation-Date: 2006-01-07 14:51+0900\n"
 "PO-Revision-Date: 2005-04-23 12:43+0900\n"
-"Last-Translator: Masao Mutoh <mutoh@highway.ne.jp>\n"
+"Last-Translator: Masao Mutoh <mutomasa at gmail.com>\n"
 "Language-Team: Japanese\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"