gettext 3.0.2 → 3.0.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 5dd7b69714925629b741151ac292ea6cdd610594
+  data.tar.gz: d46007fce3f43d56375c311bcf13c0edbc493adb
+SHA512:
+  metadata.gz: e902eb611d9e036c68aafcd6b2f0cb462c43344b683ee841a5792e2a5061dc587f351ddf172e0234eebad4a0f0d87aa7c9ef3c563a04b129ecba94dec35e0399
+  data.tar.gz: 57ab4f506008399e3b5b0c52a2ecdb09cbc2f1f401abdfd8005a238228b9fcbe4e90f182dfb5db4d57b7a8c14f5f9b532d74b1dd5c4d479873936311f5d63e78

data/doc/text/news.md

@@ -1,5 +1,35 @@
 # News
 
+## <a id="3-0-3">3.0.3</a>: 2013-12-15
+
+### Improvements
+
+  * Documented {GetText::Tools::Task#namespace_prefix}.
+  * Added `--copyright-year` option to {GetText::Tools::XGetText}.
+    [GitHub#25] [Debian #726941] [Reported by Francesco Poli]
+    [Reported by 375gnu]
+  * {GetText::Tools::XGetText} respects new lines in translate target
+    message.
+  * Added {GetText::POEntry#header?}.
+  * Added {GetText::POEntry#obsolete?}.
+  * Added `--no-fuzzy-matching` option to {GetText::Tools::MsgMerge}.
+    [GitHub#28] [Reported by Sam Lown]
+
+### Fixes
+
+  * Fixed cache key hash conflict on armv7hl. Memoization feature is
+    removed for this fix. If you get performance issue. Please report
+    it. We will solve the issue. See also locale gem's GitHub issue #3.
+    [GitHub#22] [Reported by mtasaka]
+  * Fixed a bug that obsolete comment misses the last new line.
+
+### Thanks
+
+  * Francesco Poli
+  * 375gnu
+  * Sam Lown
+  * mtasaka
+
 ## <a id="3-0-2">3.0.2</a>: 2013-09-29
 
 ### Improvements

data/lib/gettext/class_info.rb

@@ -1,15 +1,11 @@
 # -*- coding: utf-8 -*-
 
-require 'locale/util/memoizable'
-
 module GetText
   # For normalize/finding the related classes/modules.
   # This is used for realizing the scope of TextDomain.
   # (see: http://www.yotabanana.com/hiki/ruby-gettext-scope.html)
   module ClassInfo
     extend self
-    include Locale::Util::Memoizable
-
     # normalize the class name
     # klass should kind of the class, not object.
     def normalize_class(klass)
@@ -23,7 +19,6 @@ module GetText
     def root_ancestors  # :nodoc:
       Object.ancestors
     end
-    memoize :root_ancestors
 
     # Internal method for related_classes.
     def related_classes_internal(klass, all_classes = [], analyzed_classes = [] )
@@ -64,6 +59,5 @@ module GetText
       end
       ret
     end
-    memoize :related_classes
   end
 end

data/lib/gettext/locale_path.rb

@@ -15,8 +15,6 @@ require 'rbconfig'
 module GetText
   # Treats locale-path for mo-files.
   class LocalePath
-    include Locale::Util::Memoizable
-
     # The default locale paths.
     CONFIG_PREFIX = RbConfig::CONFIG['prefix'].gsub(/\/local/, "")
     DEFAULT_RULES = [
@@ -29,8 +27,6 @@ module GetText
                     ].uniq
 
     class << self
-      include Locale::Util::Memoizable
-
       # Add default locale path. Usually you should use GetText.add_default_locale_path instead.
       # * path: a new locale path. (e.g.) "/usr/share/locale/%{lang}/LC_MESSAGES/%{name}.mo"
       #   ('locale' => "ja_JP", 'name' => "textdomain")
@@ -66,7 +62,6 @@ module GetText
           Dir.glob(path % {:lang => "*", :name => "*"}).size > 0}.uniq
         default_path_rules
       end
-      memoize_dup :default_path_rules
     end
 
     attr_reader :locale_paths, :supported_locales
@@ -114,7 +109,5 @@ module GetText
       end
       nil
     end
-    memoize :current_path
-
   end
 end

data/lib/gettext/po_entry.rb

@@ -165,6 +165,18 @@ module GetText
       [:plural, :msgctxt_plural].include?(@type)
     end
 
+    # @return true if the entry is header entry, false otherwise.
+    #   Header entry is normal type and has empty msgid.
+    def header?
+      @type == :normal and @msgid == ""
+    end
+
+    # @return true if the entry is obsolete entry, false otherwise.
+    #   Obsolete entry is normal type and has :last msgid.
+    def obsolete?
+      @type == :normal and @msgid == :last
+    end
+
     def [](number)
       param = @param_type[number]
       raise ParseError, 'no more string parameters expected' unless param
@@ -220,8 +232,7 @@ module GetText
       end
 
       def format
-        # extracted comments
-        if @entry.msgid == :last
+        if @entry.obsolete?
           return format_obsolete_comment(@entry.comment)
         end
 
@@ -343,7 +354,7 @@ module GetText
         formatted_comment = ""
         comment.each_line do |comment_line|
           if /\A#[^~]/ =~ comment_line or comment_line.start_with?(mark)
-            formatted_comment << comment_line
+            formatted_comment << "#{comment_line.chomp}\n"
           elsif comment_line == "\n"
             formatted_comment << "\n"
           else
@@ -373,13 +384,16 @@ module GetText
         return [message] if message.empty?
 
         max_line_width = @options[:max_line_width]
-        return [message] if max_line_width <= 0
 
         chunks = []
         message.each_line do |line|
-          # TODO: use character width instead of the number of characters
-          line.scan(/.{1,#{max_line_width}}/m) do |chunk|
-            chunks << chunk
+          if max_line_width <= 0
+            chunks << line
+          else
+            # TODO: use character width instead of the number of characters
+            line.scan(/.{1,#{max_line_width}}/m) do |chunk|
+              chunks << chunk
+            end
           end
         end
         chunks

data/lib/gettext/text_domain_manager.rb

@@ -96,7 +96,7 @@ module GetText
     #   it returns a last part of msgid separeted "div".
     def translate_singular_message(klass, msgid, div = nil)
       klass = ClassInfo.normalize_class(klass)
-      key = [Locale.current, klass, msgid, div].hash
+      key = [Locale.current, klass, msgid, div]
       msg = @@singular_message_cache[key]
       return msg if msg and @@cached
       # Find messages from related classes.
@@ -156,7 +156,7 @@ module GetText
         div = arg4
       end
 
-      key = [Locale.current, klass, msgid, msgid_plural, div].hash
+      key = [Locale.current, klass, msgid, msgid_plural, div]
       msgs = @@plural_message_cache[key]
       unless (msgs and @@cached)
         # Find messages from related classes.

data/lib/gettext/tools/msgmerge.rb

@@ -29,7 +29,49 @@ require "gettext/po"
 module GetText
   module Tools
     class MsgMerge
-      class Merger #:nodoc:
+      class << self
+        # (see #run)
+        #
+        # This method is provided just for convenience. It equals to
+        # `new.run(*command_line)`.
+        def run(*command_line)
+          new.run(*command_line)
+        end
+      end
+
+      # Merge a po-file inluding translated messages and a new pot-file.
+      #
+      # @param [Array<String>] command_line
+      #   command line arguments for rmsgmerge.
+      # @return [void]
+      def run(*command_line)
+        config = Config.new
+        config.parse(command_line)
+
+        parser = POParser.new
+        parser.ignore_fuzzy = false
+        definition_po = PO.new
+        reference_pot = PO.new
+        parser.parse_file(config.definition_po, definition_po)
+        parser.parse_file(config.reference_pot, reference_pot)
+
+        merger = Merger.new(reference_pot, definition_po, config)
+        result = merger.merge
+        result.order = config.order
+        p result if $DEBUG
+        print result.generate_po if $DEBUG
+
+        if config.output.is_a?(String)
+          File.open(File.expand_path(config.output), "w+") do |file|
+            file.write(result.to_s(config.po_format_options))
+          end
+        else
+          puts(result.to_s(config.po_format_options))
+        end
+      end
+
+      # @private
+      class Merger
         # Merge the reference with the definition: take the #. and
         #  #: comments from the reference, take the # comments from
         # the definition, take the msgstr from the definition.  Add
@@ -38,55 +80,60 @@ module GetText
         POT_DATE_EXTRACT_RE = /POT-Creation-Date:\s*(.*)?\s*$/
         POT_DATE_RE = /POT-Creation-Date:.*?$/
 
-        def merge(definition, reference)
+        def initialize(reference, definition, config)
+          @reference = reference
+          @definition = definition
+          @translated_entries = @definition.reject do |entry|
+            entry.msgstr.nil?
+          end
+          @config = config
+        end
+
+        def merge
           result = GetText::PO.new
 
-          translated_entries = definition.reject do |entry|
-            entry.msgstr.nil?
+          @reference.each do |entry|
+            id = [entry.msgctxt, entry.msgid]
+            result[*id] = merge_definition(entry)
           end
 
-          reference.each do |entry|
-            msgid = entry.msgid
-            msgctxt = entry.msgctxt
-            id = [msgctxt, msgid]
+          add_obsolete_entry(result)
+          result
+        end
 
-            if definition.has_key?(*id)
-              result[*id] = merge_entry(definition[*id], entry)
-              next
-            end
+        private
+        def merge_definition(entry)
+          msgid = entry.msgid
+          msgctxt = entry.msgctxt
+          id = [msgctxt, msgid]
 
-            if msgctxt.nil?
-              same_msgid_entry = find_by_msgid(translated_entries, msgid)
-              if not same_msgid_entry.nil? and not same_msgid_entry.msgctxt.nil?
-                result[nil, msgid] = merge_fuzzy_entry(same_msgid_entry, entry)
-                next
-              end
-            end
+          if @definition.has_key?(*id)
+            return merge_entry(entry, @definition[*id])
+          end
 
-            fuzzy_entry = find_fuzzy_entry(translated_entries, msgid, msgctxt)
-            unless fuzzy_entry.nil?
-              result[*id] = merge_fuzzy_entry(fuzzy_entry, entry)
-              next
+          return entry unless @config.enable_fuzzy_matching?
+
+          if msgctxt.nil?
+            same_msgid_entry = find_by_msgid(@translated_entries, msgid)
+            if same_msgid_entry and same_msgid_entry.msgctxt
+              return merge_fuzzy_entry(entry, same_msgid_entry)
             end
+          end
 
-            result[*id] = entry
+          fuzzy_entry = find_fuzzy_entry(@translated_entries, msgid, msgctxt)
+          if fuzzy_entry
+            return merge_fuzzy_entry(entry, fuzzy_entry)
           end
 
-          add_obsolete_entry(result, translated_entries)
-          result
+          entry
         end
 
-        def merge_entry(definition_entry, reference_entry)
-          if definition_entry.msgid.empty? and definition_entry.msgctxt.nil?
-            new_header = merge_header(definition_entry, reference_entry)
-            return new_header
+        def merge_entry(reference_entry, definition_entry)
+          if definition_entry.header?
+            return merge_header(reference_entry, definition_entry)
           end
 
-          if definition_entry.flag == "fuzzy"
-            entry = definition_entry
-            entry.flag = "fuzzy"
-            return entry
-          end
+          return definition_entry if definition_entry.flag == "fuzzy"
 
           entry = reference_entry
           entry.translator_comment = definition_entry.translator_comment
@@ -100,7 +147,7 @@ module GetText
           entry
         end
 
-        def merge_header(old_header, new_header)
+        def merge_header(new_header, old_header)
           header = old_header
           if POT_DATE_EXTRACT_RE =~ new_header.msgstr
             create_date = $1
@@ -121,8 +168,8 @@ module GetText
           same_msgid_entries.first
         end
 
-        def merge_fuzzy_entry(fuzzy_entry, entry)
-          merged_entry = merge_entry(fuzzy_entry, entry)
+        def merge_fuzzy_entry(entry, fuzzy_entry)
+          merged_entry = merge_entry(entry, fuzzy_entry)
           merged_entry.flag = "fuzzy"
           merged_entry
         end
@@ -155,40 +202,38 @@ module GetText
           Text::Levenshtein.distance(source, destination) / max_size.to_f
         end
 
-        def add_obsolete_entry(result, definition)
-          obsolete_entry = generate_obsolete_entry(result, definition)
-          unless obsolete_entry.nil?
-            result[:last] = obsolete_entry
-          end
-          result
+        def add_obsolete_entry(result)
+          obsolete_entry = generate_obsolete_entry(result)
+          return if obsolete_entry.nil?
+
+          result[:last] = obsolete_entry
         end
 
-        def generate_obsolete_entry(result, definition)
-          obsolete_entry = nil
+        def generate_obsolete_entry(result)
+          obsolete_entries = extract_obsolete_entries(result)
+          obsolete_comments = obsolete_entries.collect do |entry|
+            entry.to_s
+          end
 
-          obsolete_entries = extract_obsolete_entries(result, definition)
-          unless obsolete_entries.empty?
-            obsolete_comment = []
+          return nil if obsolete_comments.empty?
 
-            obsolete_entries.each do |entry|
-              obsolete_comment << entry.to_s
-            end
-            obsolete_entry = POEntry.new(:normal)
-            obsolete_entry.msgid = :last
-            obsolete_entry.comment = obsolete_comment.join("\n")
-          end
+          obsolete_entry = POEntry.new(:normal)
+          obsolete_entry.msgid = :last
+          obsolete_entry.comment = obsolete_comments.join("\n")
           obsolete_entry
         end
 
-        def extract_obsolete_entries(result, definition)
-          obsolete_entries = []
-          definition.each do |entry|
-            id = [entry.msgctxt, entry.msgid]
-            if not result.has_key?(*id) and not entry.msgid == :last
-              obsolete_entries << entry
+        def extract_obsolete_entries(result)
+          @definition.find_all do |entry|
+            if entry.obsolete?
+              true
+            elsif entry.msgstr.nil?
+              false
+            else
+              id = [entry.msgctxt, entry.msgid]
+              not result.has_key?(*id)
             end
           end
-          obsolete_entries
         end
       end
 
@@ -199,13 +244,16 @@ module GetText
         bindtextdomain("gettext")
 
         attr_accessor :definition_po, :reference_pot
-        attr_accessor :output, :fuzzy, :update
+        attr_accessor :output, :update
         attr_accessor :order
         attr_accessor :po_format_options
 
         # update mode options
         attr_accessor :backup, :suffix
 
+        # (#see #enable_fuzzy_matching?)
+        attr_writer :enable_fuzzy_matching
+
         # The result is written back to def.po.
         #       --backup=CONTROL        make a backup of def.po
         #       --suffix=SUFFIX         override the usual backup suffix
@@ -228,7 +276,7 @@ module GetText
           @po_format_options = {
             :max_line_width => POEntry::Formatter::DEFAULT_MAX_LINE_WIDTH,
           }
-          @fuzzy = nil
+          @enable_fuzzy_matching = true
           @update = nil
           @backup = ENV["VERSION_CONTROL"]
           @suffix = ENV["SIMPLE_BACKUP_SUFFIX"] || "~"
@@ -248,6 +296,11 @@ module GetText
           @output = @definition_po if @update
         end
 
+        # @return [Bool] true if fuzzy matching is enabled, false otherwise.
+        def enable_fuzzy_matching?
+          @enable_fuzzy_matching
+        end
+
         private
         def create_option_parser
           parser = OptionParser.new
@@ -312,7 +365,11 @@ module GetText
             @po_format_options[:max_line_width] = max_line_width
           end
 
-          #parser.on("-F", "--fuzzy-matching")
+          parser.on("--[no-]fuzzy-matching",
+                    _("Disable fuzzy matching"),
+                    _("(enable)")) do |boolean|
+            @enable_fuzzy_matching = boolean
+          end
 
           parser.on("-h", "--help", _("Display this help and exit")) do
             puts(parser.help)
@@ -328,47 +385,6 @@ module GetText
           parser
         end
       end
-
-      class << self
-        # (see #run)
-        #
-        # This method is provided just for convenience. It equals to
-        # `new.run(*command_line)`.
-        def run(*command_line)
-          new.run(*command_line)
-        end
-      end
-
-      # Merge a po-file inluding translated messages and a new pot-file.
-      #
-      # @param [Array<String>] command_line
-      #   command line arguments for rmsgmerge.
-      # @return [void]
-      def run(*command_line)
-        config = Config.new
-        config.parse(command_line)
-
-        parser = POParser.new
-        parser.ignore_fuzzy = false
-        definition_po = PO.new
-        reference_pot = PO.new
-        parser.parse_file(config.definition_po, definition_po)
-        parser.parse_file(config.reference_pot, reference_pot)
-
-        merger = Merger.new
-        result = merger.merge(definition_po, reference_pot)
-        result.order = config.order
-        p result if $DEBUG
-        print result.generate_po if $DEBUG
-
-        if config.output.is_a?(String)
-          File.open(File.expand_path(config.output), "w+") do |file|
-            file.write(result.to_s(config.po_format_options))
-          end
-        else
-          puts(result.to_s(config.po_format_options))
-        end
-      end
     end
   end
 end