gettext 3.1.4 → 3.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e3cbe59d74f377ce2eeb1c5fa7adc692bb69acd1
-  data.tar.gz: 5b7d4beec9c775032dc01ac8d93cdf9e75faa6c1
+  metadata.gz: 8592733fa01752d7e11db601596b3d96e56d5b12
+  data.tar.gz: 14494dcb23c418e6559b38d5e9ededf2341710dc
 SHA512:
-  metadata.gz: a05da54dfbed4308073ddb1a067ee2c8d5d4ed004bd06104b53fc03f3c9279d6149a2c06e7da1b56f914d154aa8cf56111b38afbfedd212a3be044f633aa5890
-  data.tar.gz: 9b67977b6cf311d5b16b76cc6b3206432989bab4a495f61e1cff5212b95e6368956076ed68b1af48cb299a2a3db132b8c91fee7b1088481d3899cce12494aa22
+  metadata.gz: 1b9afdf774200aa0497b396b5f13b710298051a402412cff87b7bf4e63215d669b70379935f25c5dd3640178ae5d34c712db5059291742c93888e61e54911d42
+  data.tar.gz: 8242fe49ef0a32af88be0d093f0c70318543160692774e1b99c20f7cf168aa949473b85f449452cf5988c774d6b4ab4b1b3066d1af9485e6bce610fdff3d5d72

data/doc/text/news.md

@@ -1,5 +1,26 @@
 # News
 
+## 3.1.5: 2015-01-17 {#version-3-1-5}
+
+### Improvements
+
+  * `rmsgmerge`: Improves fuzzy matching speed.
+    [GitHub#36][Reported by Dominic Cleal]
+
+### Fixes
+
+  * Fixed a bug that msgid uses wrong encoding.
+    [Patch by OBATA Akio]
+  * Fixed a typo in document.
+    [GitHub#35][Patch by Masafumi Yokoyama]
+  * `rmsgmerge`: Fixed a bug that `fuzzy` flag may be added twice.
+
+### Thanks
+
+  * OBATA Akio
+  * Masafumi Yokoyama
+  * Dominic Cleal
+
 ## 3.1.4: 2014-08-26 {#version-3-1-4}
 
 ### Improvements
@@ -45,7 +66,7 @@
 
 ### Improvements
 
-  * Travis CI: Enabled Rubyinus again.
+  * Travis CI: Enabled Rubinius again.
     [GitHub#30] [Patch by Masafumi Yokoyama]
   * `GetText::Tools::Task`: Added `msginit_options` to customize `msginit`
     command line.

data/lib/gettext/mo.rb

@@ -55,6 +55,7 @@ module GetText
       @filename = nil
       @last_modified = nil
       @little_endian = true
+      @charset = nil
       @output_charset = output_charset
       @plural_proc = nil
       super()
@@ -157,7 +158,8 @@ module GetText
             msgstr = convert_encoding(msgstr, msgid)
           end
         end
-        self[convert_encoding(msgid, msgid)] = msgstr.freeze
+        msgid.force_encoding(@charset) if @charset
+        self[msgid] = msgstr.freeze
       end
       self
     end

data/lib/gettext/text_domain.rb

@@ -95,12 +95,12 @@ module GetText
           end
         end
       else
-        msgid_prefix_re = /^#{Regexp.quote(msgid)}\000/
+        plural_msgid_prefix = "#{msgid}\000"
         mo.each do |key, val|
-          if msgid_prefix_re =~ key
-            ret = val.split("\000")[0]
-            break
-          end
+          next unless Encoding.compatible?(key, plural_msgid_prefix)
+          next unless key.start_with?(plural_msgid_prefix)
+          ret = val.split("\000")[0]
+          break
         end
       end
       ret

data/lib/gettext/tools/msgmerge.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # Copyright (C) 2012-2013  Haruka Yoshihara <yoshihara@clear-code.com>
-# Copyright (C) 2012-2014  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2012-2015  Kouhei Sutou <kou@clear-code.com>
 # Copyright (C) 2005-2009 Masao Mutoh
 # Copyright (C) 2005,2006 speakillof
 #
@@ -86,6 +86,7 @@ module GetText
           @translated_entries = @definition.reject do |entry|
             entry.msgstr.nil?
           end
+          @fuzzy_entry_finder = FuzzyEntryFinder.new(@translated_entries)
           @config = config
         end
 
@@ -120,7 +121,7 @@ module GetText
             end
           end
 
-          fuzzy_entry = find_fuzzy_entry(@translated_entries, msgid, msgctxt)
+          fuzzy_entry = @fuzzy_entry_finder.find(msgid, msgctxt)
           if fuzzy_entry
             return merge_fuzzy_entry(entry, fuzzy_entry)
           end
@@ -139,7 +140,7 @@ module GetText
 
           if definition_entry.fuzzy? or
               definition_entry.msgid_plural != reference_entry.msgid_plural
-            entry.flags << "fuzzy"
+            entry.flags << "fuzzy" unless entry.fuzzy?
           end
 
           entry.msgstr = definition_entry.msgstr
@@ -169,43 +170,10 @@ module GetText
 
         def merge_fuzzy_entry(entry, fuzzy_entry)
           merged_entry = merge_entry(entry, fuzzy_entry)
-          merged_entry.flags << "fuzzy"
+          merged_entry.flags << "fuzzy" unless merged_entry.fuzzy?
           merged_entry
         end
 
-        MAX_FUZZY_DISTANCE = 0.5 # XXX: make sure that its value is proper.
-
-        def find_fuzzy_entry(definition, msgid, msgctxt)
-          return nil if msgid == :last
-          min_distance_entry = nil
-          min_distance = MAX_FUZZY_DISTANCE
-
-          same_msgctxt_entries = definition.find_all do |entry|
-            entry.msgctxt == msgctxt and not entry.msgid == :last
-          end
-          same_msgctxt_entries.each do |entry|
-            distance = normalize_distance(entry.msgid, msgid)
-            next if distance.nil?
-            if min_distance > distance
-              min_distance = distance
-              min_distance_entry = entry
-            end
-          end
-
-          min_distance_entry
-        end
-
-        MAX_N_CHARACTERS_DIFFERENCE = 10
-        def normalize_distance(source, destination)
-          n_characters_difference = (source.size - destination.size).abs
-          return nil if n_characters_difference > MAX_N_CHARACTERS_DIFFERENCE
-
-          max_size = [source.size, destination.size].max
-          return 0.0 if max_size.zero?
-
-          Text::Levenshtein.distance(source, destination) / max_size.to_f
-        end
-
         def add_obsolete_entry(result)
           obsolete_entry = generate_obsolete_entry(result)
           return if obsolete_entry.nil?
@@ -241,6 +209,60 @@ module GetText
         end
       end
 
+      # @private
+      class FuzzyEntryFinder
+        def initialize(entries)
+          @entries = entries
+          @target_entries = {}
+        end
+
+        MAX_FUZZY_DISTANCE = 0.5 # XXX: make sure that its value is proper.
+        def find(msgid, msgctxt)
+          return nil if msgid == :last
+          min_distance_entry = nil
+          min_distance = MAX_FUZZY_DISTANCE
+
+          target_entries = extract_target_entries(msgctxt)
+          target_entries.each do |entry|
+            distance = compute_distance(entry.msgid, msgid)
+            next if distance.nil?
+            if min_distance > distance
+              min_distance = distance
+              min_distance_entry = entry
+            end
+          end
+
+          min_distance_entry
+        end
+
+        private
+        def collect_same_msgctxt_entries(msgctxt)
+          @entries.find_all do |entry|
+            entry.msgctxt == msgctxt and not entry.msgid == :last
+          end
+        end
+
+        def extract_target_entries(msgctxt)
+          @target_entries[msgctxt] ||= collect_same_msgctxt_entries(msgctxt)
+        end
+
+        MAX_N_CHARACTERS_DIFFERENCE = 10
+        def compute_distance(source, destination)
+          max_size = [source.size, destination.size].max
+          return 0.0 if max_size.zero?
+
+          distance = Text::Levenshtein.distance(source,
+                                                destination,
+                                                MAX_N_CHARACTERS_DIFFERENCE + 1)
+          if distance == MAX_N_CHARACTERS_DIFFERENCE + 1
+            nil
+          else
+            distance / max_size.to_f
+          end
+        end
+
+      end
+
       # @private
       class Config
         include GetText

data/lib/gettext/version.rb

@@ -9,5 +9,5 @@
 =end
 
 module GetText
-  VERSION = "3.1.4"
+  VERSION = "3.1.5"
 end

data/po/bg/gettext.edit.po

@@ -35,11 +35,11 @@ msgstr ""
 msgid "Concatenates and merges PO files."
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:211 ../lib/gettext/tools/msgfmt.rb:86 ../lib/gettext/tools/msginit.rb:92 ../lib/gettext/tools/msgmerge.rb:333 ../lib/gettext/tools/xgettext.rb:248
+#: ../lib/gettext/tools/msgcat.rb:211 ../lib/gettext/tools/msgfmt.rb:86 ../lib/gettext/tools/msginit.rb:92 ../lib/gettext/tools/msgmerge.rb:355 ../lib/gettext/tools/xgettext.rb:248
 msgid "Specific options:"
 msgstr "Специфични опции:"
 
-#: ../lib/gettext/tools/msgcat.rb:214 ../lib/gettext/tools/msgmerge.rb:341
+#: ../lib/gettext/tools/msgcat.rb:214 ../lib/gettext/tools/msgmerge.rb:363
 msgid "Write output to specified file"
 msgstr "изходът беше записан в зададения файл"
 
@@ -47,23 +47,23 @@ msgstr "изходът беше записан в зададения файл"
 msgid "(default: the standard output)"
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:220 ../lib/gettext/tools/msgcat.rb:237 ../lib/gettext/tools/msgmerge.rb:346 ../lib/gettext/tools/msgmerge.rb:365 ../lib/gettext/tools/xgettext.rb:302
+#: ../lib/gettext/tools/msgcat.rb:220 ../lib/gettext/tools/msgcat.rb:237 ../lib/gettext/tools/msgmerge.rb:368 ../lib/gettext/tools/msgmerge.rb:387 ../lib/gettext/tools/xgettext.rb:302
 msgid "Sort output by msgid"
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:225 ../lib/gettext/tools/msgcat.rb:230 ../lib/gettext/tools/msgmerge.rb:353 ../lib/gettext/tools/msgmerge.rb:360
+#: ../lib/gettext/tools/msgcat.rb:225 ../lib/gettext/tools/msgcat.rb:230 ../lib/gettext/tools/msgmerge.rb:375 ../lib/gettext/tools/msgmerge.rb:382
 msgid "Sort output by location"
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:231 ../lib/gettext/tools/msgmerge.rb:354
+#: ../lib/gettext/tools/msgcat.rb:231 ../lib/gettext/tools/msgmerge.rb:376
 msgid "It is same as --sort-by-location"
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:232 ../lib/gettext/tools/msgcat.rb:239 ../lib/gettext/tools/msgmerge.rb:348 ../lib/gettext/tools/msgmerge.rb:355
+#: ../lib/gettext/tools/msgcat.rb:232 ../lib/gettext/tools/msgcat.rb:239 ../lib/gettext/tools/msgmerge.rb:370 ../lib/gettext/tools/msgmerge.rb:377
 msgid "Just for GNU gettext's msgcat compatibility"
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:238 ../lib/gettext/tools/msgmerge.rb:347
+#: ../lib/gettext/tools/msgcat.rb:238 ../lib/gettext/tools/msgmerge.rb:369
 msgid "It is same as --sort-by-msgid"
 msgstr ""
 
@@ -91,11 +91,11 @@ msgstr ""
 msgid "Remove all comments"
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:274 ../lib/gettext/tools/msgmerge.rb:375 ../lib/gettext/tools/xgettext.rb:312
+#: ../lib/gettext/tools/msgcat.rb:274 ../lib/gettext/tools/msgmerge.rb:397 ../lib/gettext/tools/xgettext.rb:312
 msgid "Set output page width"
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:280 ../lib/gettext/tools/msgmerge.rb:381 ../lib/gettext/tools/xgettext.rb:318
+#: ../lib/gettext/tools/msgcat.rb:280 ../lib/gettext/tools/msgmerge.rb:403 ../lib/gettext/tools/xgettext.rb:318
 msgid "Break long message lines, longer than the output page width, into several lines"
 msgstr ""
 
@@ -107,7 +107,7 @@ msgstr ""
 msgid "Don't report warning messages"
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:301 ../lib/gettext/tools/msgmerge.rb:398
+#: ../lib/gettext/tools/msgcat.rb:301 ../lib/gettext/tools/msgmerge.rb:420
 msgid "Don't output obsolete entries"
 msgstr ""
 
@@ -171,7 +171,7 @@ msgstr ""
 msgid "Use EMAIL as translator email address"
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:131 ../lib/gettext/tools/msgmerge.rb:402
+#: ../lib/gettext/tools/msginit.rb:131 ../lib/gettext/tools/msgmerge.rb:424
 msgid "Display this help and exit"
 msgstr ""
 
@@ -203,31 +203,31 @@ msgstr ""
 msgid "Please enter your email address"
 msgstr ""
 
-#: ../lib/gettext/tools/msgmerge.rb:322
+#: ../lib/gettext/tools/msgmerge.rb:344
 msgid "Usage: %s [OPTIONS] definition.po reference.pot"
 msgstr ""
 
-#: ../lib/gettext/tools/msgmerge.rb:325
+#: ../lib/gettext/tools/msgmerge.rb:347
 msgid "Merges two Uniforum style .po files together. The definition.po file is an existing PO file with translations. The reference.pot file is the last created PO file with up-to-date source references. The reference.pot is generally created by rxgettext."
 msgstr "Слива два Uniforum .pо файла. definition.po е съществуващ PO файл с преводи. reference.pot е пресен PO файл с актуални референции към кода. reference.pot обикновено е създаден от rgettext."
 
-#: ../lib/gettext/tools/msgmerge.rb:336
+#: ../lib/gettext/tools/msgmerge.rb:358
 msgid "Update definition.po"
 msgstr ""
 
-#: ../lib/gettext/tools/msgmerge.rb:370 ../lib/gettext/tools/xgettext.rb:307
+#: ../lib/gettext/tools/msgmerge.rb:392 ../lib/gettext/tools/xgettext.rb:307
 msgid "Preserve '#: FILENAME:LINE' lines"
 msgstr ""
 
-#: ../lib/gettext/tools/msgmerge.rb:392
+#: ../lib/gettext/tools/msgmerge.rb:414
 msgid "Disable fuzzy matching"
 msgstr ""
 
-#: ../lib/gettext/tools/msgmerge.rb:393
+#: ../lib/gettext/tools/msgmerge.rb:415
 msgid "(enable)"
 msgstr ""
 
-#: ../lib/gettext/tools/msgmerge.rb:408
+#: ../lib/gettext/tools/msgmerge.rb:430
 msgid "Display version information and exit"
 msgstr "показване на версията и изход"
 

data/po/bs/gettext.edit.po

@@ -37,11 +37,11 @@ msgstr ""
 msgid "Concatenates and merges PO files."
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:211 ../lib/gettext/tools/msgfmt.rb:86 ../lib/gettext/tools/msginit.rb:92 ../lib/gettext/tools/msgmerge.rb:333 ../lib/gettext/tools/xgettext.rb:248
+#: ../lib/gettext/tools/msgcat.rb:211 ../lib/gettext/tools/msgfmt.rb:86 ../lib/gettext/tools/msginit.rb:92 ../lib/gettext/tools/msgmerge.rb:355 ../lib/gettext/tools/xgettext.rb:248
 msgid "Specific options:"
 msgstr "Specifične opcije:"
 
-#: ../lib/gettext/tools/msgcat.rb:214 ../lib/gettext/tools/msgmerge.rb:341
+#: ../lib/gettext/tools/msgcat.rb:214 ../lib/gettext/tools/msgmerge.rb:363
 msgid "Write output to specified file"
 msgstr "zapiši izlaz u specifičnu datoteku"
 
@@ -49,23 +49,23 @@ msgstr "zapiši izlaz u specifičnu datoteku"
 msgid "(default: the standard output)"
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:220 ../lib/gettext/tools/msgcat.rb:237 ../lib/gettext/tools/msgmerge.rb:346 ../lib/gettext/tools/msgmerge.rb:365 ../lib/gettext/tools/xgettext.rb:302
+#: ../lib/gettext/tools/msgcat.rb:220 ../lib/gettext/tools/msgcat.rb:237 ../lib/gettext/tools/msgmerge.rb:368 ../lib/gettext/tools/msgmerge.rb:387 ../lib/gettext/tools/xgettext.rb:302
 msgid "Sort output by msgid"
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:225 ../lib/gettext/tools/msgcat.rb:230 ../lib/gettext/tools/msgmerge.rb:353 ../lib/gettext/tools/msgmerge.rb:360
+#: ../lib/gettext/tools/msgcat.rb:225 ../lib/gettext/tools/msgcat.rb:230 ../lib/gettext/tools/msgmerge.rb:375 ../lib/gettext/tools/msgmerge.rb:382
 msgid "Sort output by location"
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:231 ../lib/gettext/tools/msgmerge.rb:354
+#: ../lib/gettext/tools/msgcat.rb:231 ../lib/gettext/tools/msgmerge.rb:376
 msgid "It is same as --sort-by-location"
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:232 ../lib/gettext/tools/msgcat.rb:239 ../lib/gettext/tools/msgmerge.rb:348 ../lib/gettext/tools/msgmerge.rb:355
+#: ../lib/gettext/tools/msgcat.rb:232 ../lib/gettext/tools/msgcat.rb:239 ../lib/gettext/tools/msgmerge.rb:370 ../lib/gettext/tools/msgmerge.rb:377
 msgid "Just for GNU gettext's msgcat compatibility"
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:238 ../lib/gettext/tools/msgmerge.rb:347
+#: ../lib/gettext/tools/msgcat.rb:238 ../lib/gettext/tools/msgmerge.rb:369
 msgid "It is same as --sort-by-msgid"
 msgstr ""
 
@@ -93,11 +93,11 @@ msgstr ""
 msgid "Remove all comments"
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:274 ../lib/gettext/tools/msgmerge.rb:375 ../lib/gettext/tools/xgettext.rb:312
+#: ../lib/gettext/tools/msgcat.rb:274 ../lib/gettext/tools/msgmerge.rb:397 ../lib/gettext/tools/xgettext.rb:312
 msgid "Set output page width"
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:280 ../lib/gettext/tools/msgmerge.rb:381 ../lib/gettext/tools/xgettext.rb:318
+#: ../lib/gettext/tools/msgcat.rb:280 ../lib/gettext/tools/msgmerge.rb:403 ../lib/gettext/tools/xgettext.rb:318
 msgid "Break long message lines, longer than the output page width, into several lines"
 msgstr ""
 
@@ -109,7 +109,7 @@ msgstr ""
 msgid "Don't report warning messages"
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:301 ../lib/gettext/tools/msgmerge.rb:398
+#: ../lib/gettext/tools/msgcat.rb:301 ../lib/gettext/tools/msgmerge.rb:420
 msgid "Don't output obsolete entries"
 msgstr ""
 
@@ -173,7 +173,7 @@ msgstr ""
 msgid "Use EMAIL as translator email address"
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:131 ../lib/gettext/tools/msgmerge.rb:402
+#: ../lib/gettext/tools/msginit.rb:131 ../lib/gettext/tools/msgmerge.rb:424
 msgid "Display this help and exit"
 msgstr ""
 
@@ -205,31 +205,31 @@ msgstr ""
 msgid "Please enter your email address"
 msgstr ""
 
-#: ../lib/gettext/tools/msgmerge.rb:322
+#: ../lib/gettext/tools/msgmerge.rb:344
 msgid "Usage: %s [OPTIONS] definition.po reference.pot"
 msgstr ""
 
-#: ../lib/gettext/tools/msgmerge.rb:325
+#: ../lib/gettext/tools/msgmerge.rb:347
 msgid "Merges two Uniforum style .po files together. The definition.po file is an existing PO file with translations. The reference.pot file is the last created PO file with up-to-date source references. The reference.pot is generally created by rxgettext."
 msgstr "Spaja dvije Uniforum style .po datoteke skupa. definition.po datoteka je već postojeća PO datoteka sa prevodima. reference.pot je zadnja napravljena PO datoteka sa najnovijim referencama koda. reference.pot je najčešće napravljen sa rgettext."
 
-#: ../lib/gettext/tools/msgmerge.rb:336
+#: ../lib/gettext/tools/msgmerge.rb:358
 msgid "Update definition.po"
 msgstr ""
 
-#: ../lib/gettext/tools/msgmerge.rb:370 ../lib/gettext/tools/xgettext.rb:307
+#: ../lib/gettext/tools/msgmerge.rb:392 ../lib/gettext/tools/xgettext.rb:307
 msgid "Preserve '#: FILENAME:LINE' lines"
 msgstr ""
 
-#: ../lib/gettext/tools/msgmerge.rb:392
+#: ../lib/gettext/tools/msgmerge.rb:414
 msgid "Disable fuzzy matching"
 msgstr ""
 
-#: ../lib/gettext/tools/msgmerge.rb:393
+#: ../lib/gettext/tools/msgmerge.rb:415
 msgid "(enable)"
 msgstr ""
 
-#: ../lib/gettext/tools/msgmerge.rb:408
+#: ../lib/gettext/tools/msgmerge.rb:430
 #, fuzzy
 msgid "Display version information and exit"
 msgstr "prikaži informaciju o verziji i završi"