gettext 2.0.4 → 2.1.0

data/lib/gettext/tools/rgettext.rb

@@ -9,7 +9,7 @@
       Masao Mutoh     <mutomasa at gmail.com>
  
   You may redistribute it and/or modify it under the same
-  license terms as Ruby.
+  license terms as Ruby or LGPL.
 =end
 
 require 'optparse'
@@ -25,19 +25,16 @@ module GetText
 
     # constant values
     VERSION = GetText::VERSION
-    DATE = %w($Date: 2008/08/06 17:35:52 $)[1]
-    MAX_LINE_LEN = 70
-
+ 
     @ex_parsers = []
     [
       ["glade.rb", "GladeParser"],
       ["erb.rb", "ErbParser"],
-#      ["active_record.rb", "ActiveRecordParser"],
 #      ["ripper.rb", "RipperParser"],
       ["ruby.rb", "RubyParser"] # Default parser.
     ].each do |f, klass|
       begin
-        require "gettext/parser/#{f}"
+        require "gettext/tools/parser/#{f}"
         @ex_parsers << GetText.const_get(klass)
       rescue
         $stderr.puts _("'%{klass}' is ignored.") % {:klass => klass}
@@ -50,7 +47,7 @@ module GetText
     # Add an option parser
     # the option parser module requires to have target?(file) and parser(file, ary) method.
     # 
-    #  require 'gettext/rgettext'
+    #  require 'gettext/tools/rgettext'
     #  module FooParser
     #    module_function
     #    def target?(file)
@@ -94,93 +91,51 @@ msgstr ""
 TITLE
     end
 
-    def generate_pot(ary) # :nodoc:
+    def generate_pot(paths) # :nodoc:
+      pomessages = parse(paths)
       str = ""
-      ary.each do |key|
-        msgid = key.shift
-        curr_pos = MAX_LINE_LEN
-        key.each do |e|
-          if curr_pos + e.size > MAX_LINE_LEN
-            str << "\n#:"
-            curr_pos = 3
-          else
-            curr_pos += (e.size + 1)
-          end
-          str << " " << e
-        end
-        msgid.gsub!(/"/, '\"')
-        msgid.gsub!(/\r/, '')
-        if msgid.include?("\004")
-          msgctxt, msgid = msgid.split(/\004/)
-          str << "\nmsgctxt \"" << msgctxt << "\"\n"
-        else
-          str << "\n"
-        end
-        if msgid.include?("\000")
-          ids = msgid.split(/\000/)
-          str << "msgid \"" << ids[0] << "\"\n"
-          str << "msgid_plural \"" << ids[1] << "\"\n"
-          str << "msgstr[0] \"\"\n"
-          str << "msgstr[1] \"\"\n"
-        else
-          str << "msgid \"" << msgid << "\"\n"
-          str << "msgstr \"\"\n"
-        end
+      pomessages.each do |target|
+        str << target.to_po_str
       end
       str
     end
 
-    def normalize(ary)  # :nodoc:
-      used_plural_msgs = []
-      ary.select{|item| item[0].include? "\000"}.each do |plural_msg|
-        next if used_plural_msgs.include?(plural_msg[0])
-
-        key = plural_msg[0].split("\000")[0]
-
-        ary.dup.each do |single_msg|
-          if single_msg[0] == key or
-              (single_msg[0] =~ /^#{Regexp.quote(key)}\000/ and 
-               single_msg[0] != plural_msg[0])
-            if single_msg[0] != key 
-              warn %Q[Warning: n_("#{plural_msg[0].gsub(/\000/, '", "')}") and n_("#{single_msg[0].gsub(/\000/, '", "')}") are duplicated. First msgid was used.] 
-              used_plural_msgs << single_msg[0]
-            end
-
-            single_msg[1..-1].each do |line_info|
-              plural_msg << line_info
-              fname = line_info.split(/:/)[0]
-              sorted = plural_msg[1..-1].select{|l| l.split(/:/)[0].include?(fname)}.collect{|l| 
-                aline = l.split(/:/)
-                [aline[0], aline[1] =~ /[0-9]+/ ? aline[1].to_i : aline[1]]
-              }.sort.collect{|l| "#{l[0]}:#{l[1]}"}
-              plural_msg.delete_if{|i| sorted.include?(i)}
-              sorted.each {|i|
-                plural_msg << i
-              }
-            end
-            ary.delete(single_msg)
-          end
-        end
-      end
-      ary.collect{|i| i.uniq}
-    end
-
-    def parse(files) # :nodoc:
-      ary = []
-      files.each do |file|
+    def parse(paths) # :nodoc:
+      pomessages = []
+      paths.each do |path|
         begin
           @ex_parsers.each do |klass|
-            if klass.target?(file)
-              ary = klass.parse(file, ary)
+            if klass.target?(path)
+              if klass.method(:parse).arity == 1
+                targets = klass.parse(path)
+              else
+                # For backward compatibility.
+                targets = klass.parse(path, [])
+              end
+
+              targets.each{|pomessage|
+                if pomessage.kind_of? Array
+                  pomessage = PoMessage.new_from_ary(pomessage)
+                end
+
+                # Save the previous target.
+                existing = pomessages.find_index {|t| t == pomessage}
+                if existing
+                  pomessage = pomessages[existing].merge(pomessage)
+                  pomessages[existing] = pomessage
+                else
+                  pomessages << pomessage
+                end
+              }
               break
             end
           end
         rescue
-          puts "Error occurs in " + file
+          puts _("Error parsing %{path}") % {:path => path}
           raise
         end
       end
-      normalize(ary)
+      pomessages
     end
 
     def check_options # :nodoc:
@@ -211,7 +166,7 @@ TITLE
       end
 
       opts.on_tail("--version", _("display version information and exit")) do
-        puts "#{$0} #{VERSION} (#{DATE})"
+        puts "#{$0} #{VERSION}"
         puts "#{File.join(Config::CONFIG["bindir"], Config::CONFIG["RUBY_INSTALL_NAME"])} #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}]"
         exit
       end
@@ -226,25 +181,25 @@ TITLE
       [ARGV, output]
     end
 
-    def run(targetfiles = nil, out = STDOUT)  # :nodoc:
-      if targetfiles.is_a? String
-        targetfiles = [targetfiles]
-      elsif ! targetfiles
-        targetfiles, out = check_options
+    def run(paths = nil, out = STDOUT)  # :nodoc:
+      if paths.is_a? String
+        paths = [paths]
+      elsif ! paths
+        paths, out = check_options
       end
 
-      if targetfiles.size == 0
+      if paths.size == 0
         raise ArgumentError, _("no input files")
       end
 
       if out.is_a? String
         File.open(File.expand_path(out), "w+") do |file|
           file.puts generate_pot_header
-          file.puts generate_pot(parse(targetfiles))
+          file.puts generate_pot(paths)
         end
       else
         out.puts generate_pot_header
-        out.puts generate_pot(parse(targetfiles))
+        out.puts generate_pot(paths)
       end
       self
     end
@@ -256,11 +211,11 @@ TITLE
   # This function is a part of GetText.create_pofiles.
   # Usually you don't need to call this function directly.
   #
-  # * targetfiles: An Array of po-files or nil.
+  # * paths: An Array of po-file paths or nil.
   # * out: output IO or output path.
   # * Returns: self
-  def rgettext(targetfiles = nil, out = STDOUT)
-    RGetText.run(targetfiles, out)
+  def rgettext(paths = nil, out = STDOUT)
+    RGetText.run(paths, out)
     self
   end
 end

data/lib/gettext/tools/rmsgfmt.rb

@@ -4,13 +4,13 @@
   Copyright (C) 2003-2009 Masao Mutoh
 
   You may redistribute it and/or modify it under the same
-  license terms as Ruby.
+  license terms as Ruby or LGPL.
 =end
 
 require 'optparse'
 require 'fileutils'
 require 'gettext'
-require 'gettext/poparser'
+require 'gettext/tools/poparser'
 require 'rbconfig'
 
 module GetText

data/lib/gettext/tools/rmsgmerge.rb

@@ -5,12 +5,12 @@
   Copyright (C) 2005,2006 speakillof
 
   You may redistribute it and/or modify it under the same
-  license terms as Ruby.
+  license terms as Ruby or LGPL.
 =end
 
 require 'optparse'
 require 'gettext'
-require 'gettext/poparser'
+require 'gettext/tools/poparser'
 require 'rbconfig'
 
 module GetText

data/lib/gettext/utils.rb

@@ -4,7 +4,7 @@
   Copyright (C) 2005,2006 Masao Mutoh
 
   You may redistribute it and/or modify it under the same
-  license terms as Ruby.
+  license terms as Ruby or LGPL.
 =end
 
 require 'gettext/tools'

data/lib/gettext/version.rb

@@ -5,8 +5,8 @@
   Copyright (C) 2005-2009 Masao Mutoh
  
   You may redistribute it and/or modify it under the same
-  license terms as Ruby.
+  license terms as Ruby or LGPL.
 =end
 module GetText
-  VERSION = "2.0.4"
+  VERSION = "2.1.0"
 end

data/po/bg/rgettext.po

@@ -8,8 +8,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: ruby-gettext 2.0.3\n"
-"POT-Creation-Date: 2009-05-17 23:09+0900\n"
+"Project-Id-Version: ruby-gettext 2.1.0\n"
+"POT-Creation-Date: 2009-11-08 22:43+0900\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,70 +18,76 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: lib/gettext/tools.rb:68
-msgid "Failed to merge with %{defpo}"
-msgstr "Пропадна сливането с %{defpo}"
-
-#: lib/gettext/tools.rb:69
-msgid "New .pot was copied to %{failed_filename}"
-msgstr "Новия .pot беше копиран като %{failed_filename}"
-
-#: lib/gettext/tools.rb:70
-msgid "Check these po/pot-files. It may have syntax errors or something wrong."
-msgstr ""
-"Проверете тези po/pot файлове. Може да имат синтактични грешки или нещо "
-"друго."
+#: 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/tools.rb:173
+#: lib/gettext/tools/rmsgmerge.rb:405
 msgid ""
-"`%{cmd}' can not be found. \n"
-"Install GNU Gettext then set PATH or MSGMERGE_PATH correctly."
+"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 ""
+"Слива два Uniforum .pо файла. def.po е съществуващ PO файл с преводи. ref."
+"pot е пресен PO файл с актуални референции към кода. ref.pot обикновено е "
+"създаден от rgettext."
 
-#: lib/gettext/textdomain_manager.rb:147
-msgid "3rd parmeter is wrong: value = %{number}"
-msgstr "Третият параметър е грешен: value = %{number}"
+#: lib/gettext/tools/rmsgmerge.rb:407 lib/gettext/tools/rgettext.rb:149
+#: 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/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/rmsgfmt.rb:56
+msgid "display version information and exit"
+msgstr "показване на версията и изход"
 
-#: lib/gettext/tools/rgettext.rb:43
+#: lib/gettext/tools/rmsgmerge.rb:446
+msgid "definition po is not given."
+msgstr "съществуващия po не е зададен."
+
+#: lib/gettext/tools/rmsgmerge.rb:448
+msgid "reference pot is not given."
+msgstr "pot с референциите не е зададен."
+
+#: lib/gettext/tools/parser/glade.rb:73
+msgid "`%{file}' is not glade-2.0 format."
+msgstr "`%{file}' не е във формат glade-2.0."
+
+#: lib/gettext/tools/rgettext.rb:40
 msgid "'%{klass}' is ignored."
 msgstr "'%{klass}' беше игнориран."
 
-#: lib/gettext/tools/rgettext.rb:190
+#: lib/gettext/tools/rgettext.rb:134
+msgid "Error parsing %{path}"
+msgstr ""
+
+#: lib/gettext/tools/rgettext.rb:145
 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:192
+#: lib/gettext/tools/rgettext.rb:147
 msgid "Extract translatable strings from given input files."
 msgstr "Извличане на преводните низове от зададените файлове."
 
-#: lib/gettext/tools/rgettext.rb:194 lib/gettext/tools/rmsgfmt.rb:50
-#: lib/gettext/tools/rmsgmerge.rb:407
-msgid "Specific options:"
-msgstr "Специфични опции:"
-
-#: lib/gettext/tools/rgettext.rb:196 lib/gettext/tools/rmsgfmt.rb:52
-#: lib/gettext/tools/rmsgmerge.rb:409
-msgid "write output to specified file"
-msgstr "изходът беше записан в зададения файл"
-
-#: lib/gettext/tools/rgettext.rb:200
+#: lib/gettext/tools/rgettext.rb:155
 msgid "File '%s' already exists."
 msgstr "Файлът '%s' съществува."
 
-#: lib/gettext/tools/rgettext.rb:205
+#: lib/gettext/tools/rgettext.rb:160
 msgid "require the library before executing rgettext"
 msgstr "заредете библиотеката с require преди да изпълните rgettext"
 
-#: lib/gettext/tools/rgettext.rb:209
+#: lib/gettext/tools/rgettext.rb:164
 msgid "run in debugging mode"
 msgstr "изпълнение в режим на дебъгване"
 
-#: lib/gettext/tools/rgettext.rb:213 lib/gettext/tools/rmsgfmt.rb:56
-#: lib/gettext/tools/rmsgmerge.rb:420
-msgid "display version information and exit"
-msgstr "показване на версията и изход"
-
-#: lib/gettext/tools/rgettext.rb:237 lib/gettext/tools/rmsgfmt.rb:29
+#: lib/gettext/tools/rgettext.rb:192 lib/gettext/tools/rmsgfmt.rb:29
 msgid "no input files"
 msgstr "няма зададени файлове"
 
@@ -93,31 +99,29 @@ msgstr "Употреба: %s input.po [-o output.mo]"
 msgid "Generate binary message catalog from textual translation description."
 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/tools.rb:68
+msgid "Failed to merge with %{defpo}"
+msgstr "Пропадна сливането с %{defpo}"
 
-#: 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 ""
-"Слива два Uniforum .pо файла. def.po е съществуващ PO файл с преводи. ref."
-"pot е пресен PO файл с актуални референции към кода. ref.pot обикновено е "
-"създаден от rgettext."
+#: lib/gettext/tools.rb:69
+msgid "New .pot was copied to %{failed_filename}"
+msgstr "Новия .pot беше копиран като %{failed_filename}"
 
-#: lib/gettext/tools/rmsgmerge.rb:446
-msgid "definition po is not given."
-msgstr "съществуващия po не е зададен."
+#: lib/gettext/tools.rb:70
+msgid "Check these po/pot-files. It may have syntax errors or something wrong."
+msgstr ""
+"Проверете тези po/pot файлове. Може да имат синтактични грешки или нещо "
+"друго."
 
-#: lib/gettext/tools/rmsgmerge.rb:448
-msgid "reference pot is not given."
-msgstr "pot с референциите не е зададен."
+#: lib/gettext/tools.rb:173
+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/runtime/textdomain_manager.rb:147
+msgid "3rd parmeter is wrong: value = %{number}"
+msgstr "Третият параметър е грешен: value = %{number}"
 
 #: src/poparser.ry:38 src/poparser.ry:55
 msgid "Warning: fuzzy message was ignored.\n"