gettext 2.3.0 → 2.3.1

data/.yardopts

@@ -0,0 +1,6 @@
+--protected
+--no-private
+--output doc/reference/en
+--title "gettext API Reference"
+-
+doc/text/*

data/Rakefile

@@ -44,13 +44,15 @@ poparser_rb_path = "lib/gettext/tools/poparser.rb"
 desc "Create #{poparser_rb_path}"
 task :poparser => poparser_rb_path
 
+def fix_racc_output_indent(racc_output)
+  racc_output.gsub(/^  (end\s*\# module GetText)$/, '\1')
+end
+
 poparser_ry_path = "src/poparser.ry"
 file poparser_rb_path => poparser_ry_path do
   racc = File.join(Gem.bindir, "racc")
   tempfile = Tempfile.new("gettext-poparser")
-  command_line = "#{racc} -g #{poparser_ry_path} -o #{tempfile.path}"
-  ruby(command_line)
-  $stderr.puts("ruby #{command_line}")
+  ruby(racc, "-g", poparser_ry_path, "-o", tempfile.path)
 
   File.open(poparser_rb_path, "w") do |poparser_rb|
     poparser_rb.puts(<<-EOH)
@@ -66,9 +68,8 @@ file poparser_rb_path => poparser_ry_path do
 
 EOH
 
-    poparser_rb.puts(tempfile.read)
+    poparser_rb.puts(fix_racc_output_indent(tempfile.read))
   end
-  $stderr.puts "Create #{poparser_rb_path}."
 end
 
 desc "Run all tests"
@@ -117,7 +118,7 @@ task "samples:cgi:gettext"
 
 task "samples:gettext" => "samples:cgi:gettext"
 
-["backslash", "non_ascii", "np_", "p_"].each do |domain|
+["untranslated", "backslash", "non_ascii", "np_", "p_"].each do |domain|
   GetText::Task.new(spec) do |task|
     task.domain = domain
     task.namespace_prefix = "test:#{domain}"

data/doc/text/news.md

@@ -1,4 +1,53 @@
 # News
+## <a id="2-3-1">2.3.1</a>: 2012-09-13
+
+It's a Bug and package fix release.
+Then, it's also encoding support release, only if you use Ruby 1.9.
+
+### Improvements
+
+  * [xgettext] Added backword compatibility method
+    (GetText::RGetText.run).
+    [Suggested by Fotos Georgiadis]
+  * [xgettext] Removed deprecated parse argument support.
+  * [erb parer] Assumed the encoding in the magic comment of the
+    input file as the encoding of it.
+  * [ruby parser] Assumed the encoding in the magic comment of the
+    input file as the encoding of it.
+  * [xgettext] Added the "--output-encoding" option to set encoding of
+    output pot file.
+  * [xgettext] Used UTF-8 as the default encoding of output pot file.
+  * [xgettext] Supported multiple encoding sources.
+
+### Changes
+
+  * [MoFile] Returned nil instead of "" as msgstr when its msgid isn't
+    translated (when this msgstr is "").
+  * [PoParser] Converted msgstr from "" to nil when parsing.
+
+### Fixes
+
+  * Added missing .yardopts file. [Reported by Takahiro Kambe]
+  * [news] Fixed Eddie Lau name instead of github name.
+  * [msginit] Added the "Plural-Forms:" entry to the header even if a
+    pot file doesn't have it.
+  * [msgmerge] Fixed the bug the new line between a header and
+    contents doesn't exist.
+  * [msginit] Fixed the bug that msgstr with msgid_plural aren't
+    generated in output po file.
+  * [xgettext] Supported class based xgettext parser add API.
+    [GitHub #10] [Suggested by Michael Grosser]
+  * [erb parer] Fixed erb parser bug with unicode msgid in Ruby 1.9
+    ERB templates.
+    [Github #9] [Patch by Fotos Georgiadis]
+  * Added missing documents for GetText::Tools::XGetText.
+
+### Thanks
+
+  * Takahiro Kambe
+  * Michael Grosser
+  * Fotos Georgiadis
+
 ## <a id="2-3-0">2.3.0</a>: 2012-08-28
 
 Various improvements, changes and fixes release.
@@ -23,7 +72,7 @@ Various improvements, changes and fixes release.
 
   * Renamed the package name from "Ruby-GetText-Package" to "gettext".
   * Renamed RGetText to XGetText, RMsgMerge to MsgMerge, RMsgFmt to MsgFmt.
-  * Renamed rgettext to rxgettext, rmsgmerge to msgmerge, rmsgfmt to msgfmt.
+  * Renamed rgettext to rxgettext.
   * Defined tools(XGetText, MsgMerge, MsgFmt) as Class under GetText::Tools
     module.
   * Removed shortcuts for tools in GetText module.
@@ -57,7 +106,7 @@ Various improvements, changes and fixes release.
   * Francesco Poli (wintermute)
   * 375gnu
   * Michael Grosser
-  * 3dd13
+  * Eddie Lau
   * Yves-Eric Martin
 
 ## <a id="2-2-0">2.2.0</a>: 2012-03-11

data/gettext.gemspec

@@ -21,6 +21,7 @@ So you can use GNU gettext tools for maintaining.
   Dir.chdir(base_dir) do
     s.files = Dir.glob("{bin,data,doc/text,lib,po,samples,src,test}/**/*")
     s.files += ["COPYING", "README.rdoc", "Rakefile", "gettext.gemspec"]
+    s.files += [".yardopts"]
     s.executables = Dir.chdir("bin") do
       Dir.glob("*")
     end

data/lib/gettext/runtime/locale_path.rb

@@ -100,7 +100,6 @@ module GetText
     # * lang: a Locale::Tag.
     def current_path(lang)
       lang_candidates = lang.to_posix.candidates
-      search_files = []
 
       lang_candidates.each do |tag|
         path = @locale_paths[tag.to_s]

data/lib/gettext/runtime/mofile.rb

@@ -152,7 +152,10 @@ module GetText
             @plural = "0" unless @plural
           end
         else
-          msgstr = convert_encoding(msgstr, msgid)
+          msgstr = nil if msgstr.empty?
+          unless msgstr.nil?
+            msgstr = convert_encoding(msgstr, msgid)
+          end
         end
         self[convert_encoding(msgid, msgid)] = msgstr.freeze
       end
@@ -185,7 +188,6 @@ module GetText
     # 1986, 1987 Bell Telephone Laboratories, Inc.]
     def hash_string(str)
       hval = 0
-      i = 0
       str.each_byte do |b|
         break if b == '\0'
         hval <<= 4
@@ -218,6 +220,10 @@ module GetText
       io.write(header.to_a.pack('a4V*'))
 
       ary = to_a
+      ary = ary.collect do |msgid, msgstr|
+        msgstr ||= ""
+        [msgid, msgstr]
+      end
       ary.sort!{|a, b| a[0] <=> b[0]} # sort by original string
 
       pos = header.hash_table_size * 4 + header.hash_table_offset

data/lib/gettext/runtime/textdomain.rb

@@ -84,42 +84,40 @@ module GetText
         return nil
       end
 
-      msgstr = mofile[msgid]
-      if not msgstr.nil?
-        if msgstr.empty?
-          nil
-        else
-          msgstr
-        end
-      elsif msgid.include?("\000")
+      return mofile[msgid] if mofile.has_key?(msgid)
+
+      ret = nil
+      if msgid.include?("\000")
         # Check "aaa\000bbb" and show warning but return the singular part.
-        ret = nil
         msgid_single = msgid.split("\000")[0]
         msgid_single_prefix_re = /^#{Regexp.quote(msgid_single)}\000/
-        mofile.each{|key, val|
-          if key =~ msgid_single_prefix_re
+        mofile.each do |key, val|
+          if msgid_single_prefix_re =~ key
             # Usually, this is not caused to make po-files from rgettext.
-            warn %Q[Warning: n_("#{msgid_single}", "#{msgid.split("\000")[1]}") and n_("#{key.gsub(/\000/, '", "')}") are duplicated.]
+            separated_msgid = msgid.gsub(/\000/, '", "')
+            duplicated_msgid = key.gsub(/\000/, '", "')
+            warn("Warning: " +
+                  "n_(\"#{separated_msgid}\") and " +
+                  "n_(\"#{duplicated_msgid}\") " +
+                  "are duplicated.")
             ret = val
             break
           end
-        }
-        ret
+        end
       else
-        ret = nil
         msgid_prefix_re = /^#{Regexp.quote(msgid)}\000/
-        mofile.each{|key, val|
-          if key =~ msgid_prefix_re
+        mofile.each do |key, val|
+          if msgid_prefix_re =~ key
             ret = val.split("\000")[0]
             break
           end
-        }
-        ret
+        end
       end
+      ret
     end
 
-    DEFAULT_PLURAL_CALC = Proc.new{|n| n != 1}
-    DEFAULT_SINGLE_CALC = Proc.new{|n| 0}
+    DEFAULT_PLURAL_CALC = Proc.new {|n| n != 1}
+    DEFAULT_SINGLE_CALC = Proc.new {|n| 0}
 
     # Translates the translated string.
     # * lang: Locale::Tag::Simple's subclass.

data/lib/gettext/runtime/textdomain_manager.rb

@@ -79,7 +79,6 @@ module GetText
     def each_textdomains(klass) #:nodoc:
       lang = Locale.candidates[0]
       ClassInfo.related_classes(klass, @@gettext_classes).each do |target|
-        msg = nil
         if group = @@textdomain_group_pool[target]
           group.textdomains.each do |textdomain|
             yield textdomain, lang

data/lib/gettext/tools/msginit.rb

@@ -109,7 +109,7 @@ module GetText
           @locale = loc
         end
 
-        parser.on("-h", "--help", _("Dispray this help and exit")) do
+        parser.on("-h", "--help", _("Display this help and exit")) do
           puts(parser.help)
           exit(true)
         end
@@ -254,9 +254,6 @@ module GetText
       POT_REVISION_DATE_KEY = /^(PO-Revision-Date:).+/
 
       def replace_pot_revision_date #:nodoc:
-        date = Time.now
-        revision_date = date.strftime("%Y-%m-%d %H:%M%z")
-
         @entry = @entry.gsub(POT_REVISION_DATE_KEY,
                              "\\1 #{revision_date}")
       end
@@ -274,7 +271,12 @@ module GetText
         /^(Plural-Forms:) nplurals=INTEGER; plural=EXPRESSION;$/
 
       def replace_plural_forms #:nodoc:
-        @entry = @entry.gsub(PLURAL_FORMS, "\\1 #{plural_forms(@language)}")
+        plural_entry = plural_forms(@language)
+        if PLURAL_FORMS =~ @entry
+          @entry = @entry.gsub(PLURAL_FORMS, "\\1 #{plural_entry}")
+        else
+          @entry << "Plural-Forms: #{plural_entry}"
+        end
       end
 
       def plural_forms(language) #:nodoc:
@@ -343,8 +345,6 @@ module GetText
       LAST_TRANSLATOR_KEY = /^(Last-Translator:) FULL NAME <#{EMAIL}>$/
 
       def replace_first_author #:nodoc:
-        year = Time.now.year
-
         @comment = @comment.gsub(YEAR_KEY, "\\1 #{year}.")
         unless @translator.nil?
           @comment = @comment.gsub(FIRST_AUTHOR_KEY,
@@ -354,9 +354,19 @@ module GetText
 
       COPYRIGHT_KEY = /(\s*#\s* Copyright \(C\)) YEAR (THE PACKAGE'S COPYRIGHT HOLDER)$/
       def replace_copyright_year #:nodoc:
-        date = Time.now
+        @comment = @comment.gsub(COPYRIGHT_KEY, "\\1 #{year} \\2")
+      end
+
+      def now
+        @now ||= Time.now
+      end
+
+      def revision_date
+        now.strftime("%Y-%m-%d %H:%M%z")
+      end
 
-        @comment = @comment.gsub(COPYRIGHT_KEY, "\\1 #{date.year} \\2")
+      def year
+        now.year
       end
     end
   end

data/lib/gettext/tools/msgmerge.rb

@@ -57,7 +57,7 @@ module GetText
 
         def []=(msgid, msgstr)
           # Retain the order
-          if @msgid2msgstr[msgid].nil?
+          unless @msgid2msgstr.has_key?(msgid)
             @msgids << msgid
           end
 
@@ -98,6 +98,7 @@ module GetText
         def generate_po
           str = ""
           str << generate_po_header
+          str << "\n"
 
           po_entries = []
           self.each_msgid do |id|
@@ -120,7 +121,7 @@ module GetText
           str << 'msgstr ""' << "\n"
           msgstr = @msgid2msgstr[""].gsub(/"/, '\"').gsub(/\r/, "")
           msgstr = msgstr.gsub(/^(.*)$/, '"\1\n"')
-          str << msgstr
+          str << msgstr.chomp
           str << "\n"
 
           str
@@ -134,7 +135,12 @@ module GetText
           end
 
           id = msgid.gsub(/\r/, "")
-          msgstr = @msgid2msgstr[msgid].gsub(/\r/, "")
+          msgstr = @msgid2msgstr[msgid]
+          if msgstr.nil?
+            msgstr = ""
+          else
+            msgstr = msgstr.gsub(/\r/, "")
+          end
 
           if id.include?("\004")
             ids = id.split(/\004/)
@@ -150,8 +156,14 @@ module GetText
               str << "msgid_plural " << __conv(single_id) << "\n"
             end
 
-            msgstr.split("\000", -1).each_with_index do |m, n|
-              str << "msgstr[#{n}] " << __conv(m) << "\n"
+            if msgstr.empty?
+              nplurals.times do |id_count|
+                str << "msgstr[#{id_count}] " << '""' << "\n"
+              end
+            else
+              msgstr.split("\000", -1).each_with_index do |m, n|
+                str << "msgstr[#{n}] " << __conv(m) << "\n"
+              end
             end
           else
             str << "msgid "  << __conv(id) << "\n"
@@ -199,6 +211,16 @@ module GetText
         POT_DATE_RE = /POT-Creation-Date:.*?$/
 
         def merge(definition, reference)
+          definition.each_msgid do |msgid|
+            msgstr = definition[msgid] || ""
+            definition[msgid] = msgstr
+          end
+
+          reference.each_msgid do |msgid|
+            msgstr = reference[msgid] || ""
+            reference[msgid] = msgstr
+          end
+
           # deep copy
           result = Marshal.load( Marshal.dump(reference) )
 
@@ -422,15 +444,6 @@ module GetText
       def check_command_line_options(*options) #:nodoc:
         options, output = parse_arguments(*options)
 
-        if output.nil?
-          output = nil
-        else
-          if not FileTest.exist?(output)
-            $stderr.puts(_("File '%s' has already existed.") % out)
-            exit(false)
-          end
-        end
-
         config = Config.new
         config.output = output
         config.defpo = options[0]
@@ -469,7 +482,7 @@ module GetText
 
         #parser.on("-F", "--fuzzy-matching")
 
-        parser.on("-h", "--help", _("Dispray this help and exit")) do
+        parser.on("-h", "--help", _("Display this help and exit")) do
           puts(parser.help)
           exit(true)
         end

data/lib/gettext/tools/parser/erb.rb

@@ -29,12 +29,32 @@ module GetText
       }
     end
 
-    def parse(file, targets = []) # :nodoc:
-      src = ERB.new(IO.readlines(file).join).src
-      # Remove magic comment prepended by erb in Ruby 1.9.
-      src.sub!(/\A#.*?coding[:=].*?\n/, '') if src.respond_to?(:encode)
+    MAGIC_COMMENT = /\A#coding:.*\n/
+
+    def parse(file) # :nodoc:
+      content = IO.read(file)
+      src = ERB.new(content).src
+
+      if src.respond_to?(:encode)
+        # Force the src encoding back to the encoding in magic comment
+        # or original content.
+        encoding = detect_encoding(src) || content.encoding
+        src.force_encoding(encoding)
+
+        # Remove magic comment prepended by erb in Ruby 1.9.
+        src = src.gsub(MAGIC_COMMENT, "")
+      end
+
       erb = src.split(/$/)
-      RubyParser.parse_lines(file, erb, targets)
+      RubyParser.parse_lines(file, erb)
+    end
+
+    def detect_encoding(erb_source)
+      if /\A#coding:(.*)\n/ =~ erb_source
+        $1
+      else
+        nil
+      end
     end
 
     def target?(file) # :nodoc:

data/lib/gettext/tools/parser/glade.rb

@@ -22,13 +22,14 @@ module GetText
     TARGET1 = /<property.*translatable="yes">(.*)/
     TARGET2 = /(.*)<\/property>/
 
-    def parse(file, targets = []) # :nodoc:
+    def parse(file) # :nodoc:
       lines = IO.readlines(file)
-      parse_lines(file, lines, targets)
+      parse_lines(file, lines)
     end
 
     #from ary of lines.
-    def parse_lines(file, lines, targets) # :nodoc:
+    def parse_lines(file, lines) # :nodoc:
+      targets = []
       cnt = 0
       target = false
       line_no = 0