gettext 3.0.8 → 3.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b7c65c66dc413a1c1278b0507dc6d8b6c06c6c0
-  data.tar.gz: 9d142c55ea1518f4ea03755b43e86abc805156af
+  metadata.gz: 1b781a60677e7d0b803b8d28dc33a6f1b5e65a11
+  data.tar.gz: 86c661948b0dc4eaa89490d9af1360a792b50f5e
 SHA512:
-  metadata.gz: e77abb4a5d0674f71996ac2d2657cb9b8ea9da7a169b6f6ecb5af39d0722b3c6b2e18aec80751cf2ea2582d6baf53ad000441ee6830f0a5b7b44d486fcbef8f1
-  data.tar.gz: 9525c497a69d6f42314317a52bd75348ee6aa26ef666ab2ca2b33e03d45772569c0d82d9e115665b56252fd2f95c7526c69b505af88505c3151dafa3a2b5592f
+  metadata.gz: af7c1f0755860c2d0a7923b987dd7a76a98e2872aad9eec36f545d0294fa5415c2f841f1c1b065f989c8171e75e8b9264290125fbdbf62b1b99b4965d7ba39f4
+  data.tar.gz: 410f8f7813b41da1bd30e44eb6d98f2e7c07c770bfa3e1602dd679b08391379711f4ea06d01a172a9765bc074313c7d0281f270fb6537a56e040222bd8d7f07a

data/doc/text/news.md

@@ -1,5 +1,11 @@
 # News
 
+## <a id="3-0-9">3.0.9</a>: 2014-02-09
+
+### Improvements
+
+  * `rmsgimerge`: Improves fuzzy matching speed.
+
 ## <a id="3-0-8">3.0.8</a>: 2014-02-09
 
 ### Fixes

data/lib/gettext/tools/msgmerge.rb

@@ -186,6 +186,7 @@ module GetText
           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
@@ -195,10 +196,14 @@ module GetText
           min_distance_entry
         end
 
+        MAX_N_CHARACTERS_DIFFERENCE = 10
         def normalize_distance(source, destination)
-          max_size = [source.size, destination.size].max
+          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
 

data/lib/gettext/version.rb

@@ -9,5 +9,5 @@
 =end
 
 module GetText
-  VERSION = "3.0.8"
+  VERSION = "3.0.9"
 end

data/po/gettext.pot

@@ -6,10 +6,10 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext 3.0.8\n"
+"Project-Id-Version: gettext 3.0.9\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-09 22:02+0900\n"
-"PO-Revision-Date: 2014-02-09 22:02+0900\n"
+"POT-Creation-Date: 2014-02-09 22:50+0900\n"
+"PO-Revision-Date: 2014-02-09 22:50+0900\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -35,12 +35,12 @@ msgid "Concatenates and merges PO files."
 msgstr ""
 
 #: ../lib/gettext/tools/msgcat.rb:176 ../lib/gettext/tools/msgfmt.rb:86
-#: ../lib/gettext/tools/msginit.rb:92 ../lib/gettext/tools/msgmerge.rb:329
+#: ../lib/gettext/tools/msginit.rb:92 ../lib/gettext/tools/msgmerge.rb:334
 #: ../lib/gettext/tools/xgettext.rb:248
 msgid "Specific options:"
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:179 ../lib/gettext/tools/msgmerge.rb:337
+#: ../lib/gettext/tools/msgcat.rb:179 ../lib/gettext/tools/msgmerge.rb:342
 msgid "Write output to specified file"
 msgstr ""
 
@@ -49,26 +49,26 @@ msgid "(default: the standard output)"
 msgstr ""
 
 #: ../lib/gettext/tools/msgcat.rb:185 ../lib/gettext/tools/msgcat.rb:202
-#: ../lib/gettext/tools/msgmerge.rb:342 ../lib/gettext/tools/msgmerge.rb:361
+#: ../lib/gettext/tools/msgmerge.rb:347 ../lib/gettext/tools/msgmerge.rb:366
 #: ../lib/gettext/tools/xgettext.rb:302
 msgid "Sort output by msgid"
 msgstr ""
 
 #: ../lib/gettext/tools/msgcat.rb:190 ../lib/gettext/tools/msgcat.rb:195
-#: ../lib/gettext/tools/msgmerge.rb:349 ../lib/gettext/tools/msgmerge.rb:356
+#: ../lib/gettext/tools/msgmerge.rb:354 ../lib/gettext/tools/msgmerge.rb:361
 msgid "Sort output by location"
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:196 ../lib/gettext/tools/msgmerge.rb:350
+#: ../lib/gettext/tools/msgcat.rb:196 ../lib/gettext/tools/msgmerge.rb:355
 msgid "It is same as --sort-by-location"
 msgstr ""
 
 #: ../lib/gettext/tools/msgcat.rb:197 ../lib/gettext/tools/msgcat.rb:204
-#: ../lib/gettext/tools/msgmerge.rb:344 ../lib/gettext/tools/msgmerge.rb:351
+#: ../lib/gettext/tools/msgmerge.rb:349 ../lib/gettext/tools/msgmerge.rb:356
 msgid "Just for GNU gettext's msgcat compatibility"
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:203 ../lib/gettext/tools/msgmerge.rb:343
+#: ../lib/gettext/tools/msgcat.rb:203 ../lib/gettext/tools/msgmerge.rb:348
 msgid "It is same as --sort-by-msgid"
 msgstr ""
 
@@ -80,12 +80,12 @@ msgstr ""
 msgid "Remove all comments"
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:219 ../lib/gettext/tools/msgmerge.rb:371
+#: ../lib/gettext/tools/msgcat.rb:219 ../lib/gettext/tools/msgmerge.rb:376
 #: ../lib/gettext/tools/xgettext.rb:312
 msgid "Set output page width"
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:225 ../lib/gettext/tools/msgmerge.rb:377
+#: ../lib/gettext/tools/msgcat.rb:225 ../lib/gettext/tools/msgmerge.rb:382
 #: ../lib/gettext/tools/xgettext.rb:318
 msgid ""
 "Break long message lines, longer than the output page width, into several line"
@@ -156,7 +156,7 @@ msgstr ""
 msgid "Use EMAIL as translator email address"
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:130 ../lib/gettext/tools/msgmerge.rb:398
+#: ../lib/gettext/tools/msginit.rb:130 ../lib/gettext/tools/msgmerge.rb:403
 msgid "Display this help and exit"
 msgstr ""
 
@@ -190,11 +190,11 @@ msgstr ""
 msgid "Please enter your email address"
 msgstr ""
 
-#: ../lib/gettext/tools/msgmerge.rb:318
+#: ../lib/gettext/tools/msgmerge.rb:323
 msgid "Usage: %s [OPTIONS] definition.po reference.pot"
 msgstr ""
 
-#: ../lib/gettext/tools/msgmerge.rb:321
+#: ../lib/gettext/tools/msgmerge.rb:326
 msgid ""
 "Merges two Uniforum style .po files together. The definition.po file is an exi"
 "sting PO file with translations. The reference.pot file is the last created PO"
@@ -202,27 +202,27 @@ msgid ""
 "d by rxgettext."
 msgstr ""
 
-#: ../lib/gettext/tools/msgmerge.rb:332
+#: ../lib/gettext/tools/msgmerge.rb:337
 msgid "Update definition.po"
 msgstr ""
 
-#: ../lib/gettext/tools/msgmerge.rb:366 ../lib/gettext/tools/xgettext.rb:307
+#: ../lib/gettext/tools/msgmerge.rb:371 ../lib/gettext/tools/xgettext.rb:307
 msgid "Preserve '#: FILENAME:LINE' lines"
 msgstr ""
 
-#: ../lib/gettext/tools/msgmerge.rb:388
+#: ../lib/gettext/tools/msgmerge.rb:393
 msgid "Disable fuzzy matching"
 msgstr ""
 
-#: ../lib/gettext/tools/msgmerge.rb:389
+#: ../lib/gettext/tools/msgmerge.rb:394
 msgid "(enable)"
 msgstr ""
 
-#: ../lib/gettext/tools/msgmerge.rb:394
+#: ../lib/gettext/tools/msgmerge.rb:399
 msgid "Don't output obsolete entries"
 msgstr ""
 
-#: ../lib/gettext/tools/msgmerge.rb:404
+#: ../lib/gettext/tools/msgmerge.rb:409
 msgid "Display version information and exit"
 msgstr ""
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gettext
 version: !ruby/object:Gem::Version
-  version: 3.0.8
+  version: 3.0.9
 platform: ruby
 authors:
 - Kouhei Sutou