gettext 1.93.0 → 2.0.0

data/lib/gettext/{rmsgfmt.rb → tools/rmsgfmt.rb}

@@ -1,7 +1,7 @@
 =begin
   rmsgfmt.rb - Generate a .mo
 
-  Copyright (C) 2003-2006 Masao Mutoh
+  Copyright (C) 2003-2009 Masao Mutoh
 
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
@@ -14,15 +14,13 @@ require 'gettext/poparser'
 require 'rbconfig'
 
 module GetText
-  GetText.bindtextdomain("rgettext")
 
   module RMsgfmt  #:nodoc:
-    extend GetText 
+    extend GetText
+    extend self
+
+    bindtextdomain "rgettext"
 
-    VERSION = GetText::VERSION 
-    DATE = %w($Date: 2008/07/26 06:59:34 $)[1] # :nodoc:
-    
-    module_function
     def run(targetfile = nil, output_path = nil) # :nodoc:
       unless targetfile
 	targetfile, output_path = check_options
@@ -51,26 +49,25 @@ module GetText
       opts.separator(_("Specific options:"))
 
       opts.on("-o", "--output=FILE", _("write output to specified file")) do |out|
-	output = out
+        output = out
       end
 
       opts.on_tail("--version", _("display version information and exit")) do
-	puts "#{$0} #{VERSION} (#{DATE})"
-	puts "#{File.join(Config::CONFIG["bindir"], Config::CONFIG["RUBY_INSTALL_NAME"])} #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}]"
-	exit
+        puts "#{$0} #{GetText::VERSION}"
+        puts "#{File.join(Config::CONFIG["bindir"], Config::CONFIG["RUBY_INSTALL_NAME"])} #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}]"
+        exit
       end
       opts.parse!(ARGV)
 
       if ARGV.size == 0
-	puts opts.help
-	exit 1
+        puts opts.help
+        exit 1
       end
 
       [ARGV[0], output]
     end
   end
-
-  module_function
+  
   # Creates a mo-file from a targetfile(po-file), then output the result to out. 
   # If no parameter is set, it behaves same as command line tools(rmsgfmt).
   # * targetfile: An Array of po-files or nil.
@@ -79,17 +76,6 @@ module GetText
   def rmsgfmt(targetfile = nil, output_path = nil)
     RMsgfmt.run(targetfile, output_path)
   end
-
-  # Move to gettext/utils.rb. This will be removed in the feature. 
-  # This remains for backward compatibility. Use gettext/utils.rb instead.
-  def create_mofiles(verbose = false, 
-		     podir = "./po", targetdir = "./data/locale", 
-		     targetpath_rule = "%s/LC_MESSAGES") #:nodoc:
-    $stderr.puts "This function will be moved to utils.rb. So requires 'utils' first, please."
-    require 'gettext/utils'
-    GetText.create_mofiles(verbose, podir, targetdir, targetpath_rule)
-    self
-  end
 end
 
 if $0 == __FILE__ then

data/lib/gettext/{rmsgmerge.rb → tools/rmsgmerge.rb}

@@ -1,7 +1,7 @@
 =begin
   rmsgmerge.rb - Merge old .po to new .po
 
-  Copyright (C) 2005,2006 Masao Mutoh
+  Copyright (C) 2005-2009 Masao Mutoh
   Copyright (C) 2005,2006 speakillof
 
   You may redistribute it and/or modify it under the same
@@ -389,6 +389,7 @@ module GetText
   
   module RMsgMerge
     extend GetText
+    extend self
 
     bindtextdomain("rgettext")
     
@@ -396,8 +397,6 @@ module GetText
     VERSION = GetText::VERSION
     DATE = %w($Date: 2007/07/21 15:03:05 $)[1]
     
-    module_function
-
     def check_options(config)
       opts = OptionParser.new
       opts.banner = _("Usage: %s def.po ref.pot [-o output.pot]") % $0
@@ -483,8 +482,6 @@ end
 
 module GetText
   
-  module_function
-
   # Experimental
   def rmsgmerge(reference = nil, definition = nil, out = STDOUT)
     RMsgMerge.run(reference, definition, out)
@@ -502,4 +499,4 @@ if $0 == __FILE__ then
   #pp parser.parse(ARGF.read)
   
   GetText.rmsgmerge
-end
+end

data/lib/gettext/utils.rb

@@ -7,148 +7,31 @@
   license terms as Ruby.
 =end
 
-require 'rbconfig'
-if /mingw|mswin|mswin32/ =~ RUBY_PLATFORM
-  ENV['PATH'] = %w(bin lib).collect{|dir|
-    "#{Config::CONFIG["prefix"]}\\lib\\GTK\\#{dir};"
-  }.join('') + ENV['PATH']
-end
+require 'gettext/tools'
 
-require 'gettext/rgettext'
-require 'gettext/rmsgfmt'
-require 'fileutils'
+warn "'gettext/utils.rb' is deprecated. Use gettext/tools.rb."
 
 module GetText
-  bindtextdomain "rgettext"
 
-  BOM_UTF8 = [0xef, 0xbb, 0xbf].pack("c3")
+  alias :create_mofiles_org :create_mofiles
+  alias :update_pofiles_org :update_pofiles
 
-  module_function
 
-  # Currently, GNU msgmerge doesn't accept BOM. 
-  # This mesthod remove the UTF-8 BOM from the po-file.
-  def remove_bom(path)  #:nodoc:
-    bom = IO.read(path, 3)
-    if bom == BOM_UTF8
-      data = IO.read(path)
-      File.open(path, "w") do |out|
-        out.write(data[3..-1])
-      end
-    end
+  # Deprecated. Use gettext/tools instead.
+  def create_mofiles(verbose = false,
+                     podir = "./po", targetdir = "./data/locale",
+                     targetpath_rule = "%s/LC_MESSAGES")
+    warn "'gettext/utils.rb' is deprecated. Use gettext/tools.rb."
+    create_mofiles_org(:verbose => verbose,
+                        :po_root => podir,
+                        :mo_root => targetdir,
+                        :mo_root_rule => targetpath_rule)
   end
 
-  # Merges two Uniforum style .po files together. 
-  #
-  # *Note* This function requires "msgmerge" tool included in GNU GetText. So you need to install GNU GetText. 
-  #
-  # The def.po file is an existing PO file with translations which will be taken 
-  # over to the newly created file as long as they still match; comments will be preserved,
-  # but extracted comments and file positions will be discarded. 
-  #
-  # The ref.pot file is the last created PO file with up-to-date source references but
-  # old translations, or a PO Template file (generally created by rgettext);
-  # any translations or comments in the file will be discarded, however dot
-  # comments and file positions will be preserved.  Where an exact match
-  # cannot be found, fuzzy matching is used to produce better results.
-  #
-  # Usually you don't need to call this function directly. Use GetText.update_pofiles instead.
-  #
-  # * defpo: a po-file. translations referring to old sources
-  # * refpo: a po-file. references to new sources
-  # * app_version: the application information which appears "Project-Id-Version: #{app_version}" in the pot/po-files.
-  # * Returns: self 
-  def msgmerge(defpo, refpo, app_version) 
-    $stderr.print defpo + " "
-    cmd = ENV["MSGMERGE_PATH"] || "msgmerge"
-
-    cont = ""
-    if FileTest.exist? defpo
-      `#{cmd} --help`
-      unless $? && $?.success?
-        raise _("`%{cmd}' may not be found. \nInstall GNU Gettext then set PATH or MSGMERGE_PATH correctly.") % {:cmd => cmd}
-      end
-      remove_bom(defpo)
-      cont = `#{cmd} #{defpo} #{refpo}`
-    else
-      File.open(refpo) do |io| 
-	cont = io.read
-      end
-    end
-    if cont.empty?
-      failed_filename = refpo + "~"
-      FileUtils.cp(refpo, failed_filename)
-      $stderr.puts _("Failed to merge with %{defpo}") % {:defpo => defpo}
-      $stderr.puts _("New .pot was copied to %{failed_filename}") %{:failed_filename => failed_filename}
-      raise _("Check these po/pot-files. It may have syntax errors or something wrong.")
-    else
-      cont.sub!(/(Project-Id-Version\:).*$/, "\\1 #{app_version}\\n\"")
-      File.open(defpo, "w") do |out|
-        out.write(cont)
-      end
-    end
-    self
-  end
-
-  def msgmerge_all(textdomain, app_version, po_root = "po", refpot = "tmp.pot") # :nodoc:
-    FileUtils.mkdir_p(po_root) unless FileTest.exist? po_root
-    msgmerge("#{po_root}/#{textdomain}.pot", refpot, app_version)
-    
-    Dir.glob("#{po_root}/*/#{textdomain}.po"){ |f|
-      lang = /#{po_root}\/(.*)\//.match(f).to_a[1]
-      msgmerge("#{po_root}/#{lang}/#{textdomain}.po", refpot, app_version)
-    }
-  end
-
-  # Creates mo-files using #{po_root}/#{lang}/*.po an put them to 
-  # #{targetdir}/#{targetpath_rule}/. 
-  #
-  # This is a convenience function of GetText.rmsgfmt for plural target files. 
-  # * verbose: true if verbose mode, otherwise false
-  # * po_root: the root directory of po-files.
-  # * targetdir: the target root directory where the mo-files are stored.
-  # * targetpath_rule: the target directory for each mo-files. "%s" becomes "#{lang}" under po_root.
-  def create_mofiles(verbose = false, 
-		     podir = "./po", targetdir = "./data/locale", 
-		     targetpath_rule = "%s/LC_MESSAGES") 
-
-    modir = File.join(targetdir, targetpath_rule)
-    Dir.glob(File.join(podir, "*/*.po")) do |file|
-      lang, basename = /\/([^\/]+?)\/(.*)\.po/.match(file[podir.size..-1]).to_a[1,2]
-      outdir = modir % lang
-      FileUtils.mkdir_p(outdir) unless File.directory?(outdir)
-      $stderr.print %Q[#{file} -> #{File.join(outdir, "#{basename}.mo")} ... ] if verbose
-      begin
-        rmsgfmt(file, File.join(outdir, "#{basename}.mo"))
-      rescue Exception => e
-        $stderr.puts "Error." if verbose
-        raise e
-      end
-      $stderr.puts "Done." if verbose
-    end
-  end
-
-
-  # At first, this creates the #{po_root}/#{domainname}.pot file using GetText.rgettext.
-  # Since 2nd time, this updates(merges) the #{po_root}/#{domainname}.pot and all of the 
-  # #{po_root}/#{lang}/#{domainname}.po files under "po_root" using "msgmerge". 
-  #
-  # *Note* "msgmerge" tool is included in GNU GetText. So you need to install GNU GetText. 
-  #
-  # See <HOWTO maintain po/mo files(http://www.yotabanana.com/hiki/ruby-gettext-howto-manage.html)> for more detals.
-  # * domainname: the textdomain name.
-  # * targetfiles: An Array of target files or nil (See GetText.rgettext for more details).
-  # * app_version: the application information which appears "Project-Id-Version: #{app_version}" in the pot/po-files.
-  # * po_root: the root directory of po-files.
-  # * refpot: set the temporary file name. You shouldn't use this(It will be removed).
-  #
-  #  (e.g.) GetText.update_pofiles("myapp", Dir.glob("lib/*.rb"), "myapp 1.0.0")
+  # Deprecated. Use gettext/tools instead.
   def update_pofiles(textdomain, files, app_version, po_root = "po", refpot = "tmp.pot")
-    rgettext(files, refpot)
-    msgmerge_all(textdomain, app_version, po_root, refpot)
-    File.delete(refpot)
+    warn "'gettext/utils.rb' is deprecated. Use gettext/tools.rb."
+    options = {:po_root => po_root}
+    update_pofiles_org(textdomain, files, app_version, options)
   end
-end
-
-if __FILE__ == $0
-  GetText.update_pofiles("foo", ARGV, "foo 1.1.0")
-end
+end

data/lib/gettext/version.rb

@@ -2,11 +2,11 @@
 =begin
   version - version information of Ruby-GetText-Package
 
-  Copyright (C) 2005-2008 Masao Mutoh
+  Copyright (C) 2005-2009 Masao Mutoh
  
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
 =end
 module GetText
-  VERSION = "1.93.0"
+  VERSION = "2.0.0"
 end

data/po/bg/rgettext.po

@@ -8,8 +8,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: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Sava Chankov <sava.chankov@gmail.com>\n"
 "Language-Team: Bulgarian <ruby-on-rails-bulgaria@googlegroups.com>\n"
@@ -18,82 +18,37 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\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 "заредете библиотеката с require преди да изпълните rgettext"
-
-#: lib/gettext/rgettext.rb:208
-msgid "run in debugging mode"
-msgstr "изпълнение в режим на дебъгване"
-
-#: lib/gettext/rgettext.rb:212 lib/gettext/rmsgfmt.rb:57
-#: lib/gettext/rmsgmerge.rb:421
-msgid "display version information and exit"
-msgstr "показване на версията и изход"
-
-#: lib/gettext/rgettext.rb:236 lib/gettext/rmsgfmt.rb:31
-msgid "no input files"
-msgstr "няма зададени файлове"
-
-#: lib/gettext/rmsgfmt.rb:47
-msgid "Usage: %s input.po [-o output.mo]"
-msgstr "Употреба: %s input.po [-o output.mo]"
-
-#: lib/gettext/rmsgfmt.rb:49
+#: lib/gettext/tools/rmsgfmt.rb:47
 msgid "Generate binary message catalog from textual translation description."
 msgstr "Генериране на двоични файлове с преводите от текстовите описания."
 
-#: lib/gettext/rmsgmerge.rb:403
-msgid "Usage: %s def.po ref.pot [-o output.pot]"
-msgstr "Употреба: %s def.po ref.pot [-o output.pot]"
-
-#: lib/gettext/rmsgmerge.rb:406
+#: 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 "
@@ -103,37 +58,26 @@ msgstr ""
 "pot е пресен PO файл с актуални референции към кода. ref.pot обикновено е "
 "създаден от rgettext."
 
-#: lib/gettext/rmsgmerge.rb:447
-msgid "definition po is not given."
-msgstr "съществуващия po не е зададен."
-
-#: lib/gettext/rmsgmerge.rb:449
-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.rb:74
+msgid "New .pot was copied to %{failed_filename}"
+msgstr "Новия .pot беше копиран като %{failed_filename}"
 
-#: lib/gettext/parser/active_record.rb:80
-msgid "Ignored '%{file}'. Solve dependencies first."
-msgstr "'%{file}' беше игнориран. Първо оправете зависимостите."
+#: lib/gettext/tools/rgettext.rb:194 lib/gettext/tools/rmsgmerge.rb:407
+#: lib/gettext/tools/rmsgfmt.rb:49
+msgid "Specific options:"
+msgstr "Специфични опции:"
 
-#: lib/gettext/parser/active_record.rb:104
-msgid "No database is available."
-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/parser/active_record.rb:140
-msgid "rubygems are not found."
-msgstr "rubygems липсват."
+#: lib/gettext/tools/rmsgfmt.rb:45
+msgid "Usage: %s input.po [-o output.mo]"
+msgstr "Употреба: %s input.po [-o output.mo]"
 
-#: lib/gettext.rb:417
-msgid "3rd parmeter is wrong: value = %{number}"
-msgstr "Третият параметър е грешен: value = %{number}"
+#: 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] "
 
 #: src/poparser.ry:38 src/poparser.ry:55
 msgid "Warning: fuzzy message was ignored.\n"
@@ -144,3 +88,55 @@ msgid "Warning: obsolete msgid exists.\n"
 msgstr ""
 "Предупреждение: има несъществуващи вече msgid\n"
 "."
+
+#: lib/gettext/tools.rb:178
+msgid ""
+"`%{cmd}' can not be found. \n"
+"Install GNU Gettext then set PATH or MSGMERGE_PATH correctly."
+msgstr ""
+
+#: 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/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/tools/rgettext.rb:205
+msgid "require the library before executing rgettext"
+msgstr "заредете библиотеката с require преди да изпълните rgettext"
+
+#: lib/gettext/tools/rgettext.rb:209
+msgid "run in debugging mode"
+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 "изходът беше записан в зададения файл"
+
+#~ msgid "'%{file}' is not found."
+#~ msgstr "'%{file}' не беше намерен."
+
+#~ msgid "Ignored '%{file}'. Solve dependencies first."
+#~ msgstr "'%{file}' беше игнориран. Първо оправете зависимостите."
+
+#~ msgid "No database is available."
+#~ msgstr "Базата данни я е хванала липса."
+
+#~ msgid "rubygems are not found."
+#~ msgstr "rubygems липсват."