gettext 3.0.5 → 3.0.6

data/test/test_po_entry.rb

@@ -621,6 +621,33 @@ msgstr ""
         assert_false(entry.fuzzy?)
       end
     end
+
+    class TestTranslated < self
+      def setup
+        @entry = GetText::POEntry.new(:normal)
+        @entry.msgid = "Hello"
+      end
+
+      def test_have_msgstr
+        @entry.msgstr = "Bonjour"
+        assert_true(@entry.translated?)
+      end
+
+      def test_nil_msgstr
+        @entry.msgstr = nil
+        assert_false(@entry.translated?)
+      end
+
+      def test_empty_msgstr
+        @entry.msgstr = ""
+        assert_false(@entry.translated?)
+      end
+
+      def test_fuzzy
+        @entry.flag = "fuzzy"
+        assert_false(@entry.translated?)
+      end
+    end
   end
 
   class TestFormatter < self

data/test/tools/test_msgcat.rb

@@ -99,35 +99,42 @@ msgstr "Monde"
 
   class TestDuplicated < self
     class TestTranslated < self
-      class TestSame < self
-        def setup
-          @po = <<-PO
+      def test_same
+        po = <<-PO
 msgid "Hello"
 msgstr "Bonjour"
-          PO
-        end
+        PO
 
-        def test_default
-          assert_equal(@po, run_msgcat([@po, @po]))
-        end
+        assert_equal(po, run_msgcat([po, po]))
       end
 
-      class TestDifferent < self
-        def setup
-          @po1 = <<-PO
+      def test_different
+        po1 = <<-PO
 msgid "Hello"
 msgstr "Bonjour"
-          PO
+        PO
 
-          @po2 = <<-PO
+        po2 = <<-PO
 msgid "Hello"
 msgstr "Salut"
-          PO
-        end
+        PO
+
+        assert_equal(po1, run_msgcat([po1, po2]))
+      end
+
+      def test_one_not_translated
+        po_not_translated = <<-PO
+msgid "Hello"
+msgstr ""
+        PO
+
+        po_translated = <<-PO
+msgid "Hello"
+msgstr "Bonjour"
+        PO
 
-        def test_default
-          assert_equal(@po1, run_msgcat([@po1, @po2]))
-        end
+        assert_equal(po_translated,
+                     run_msgcat([po_not_translated, po_translated]))
       end
     end
   end

data/test/tools/test_msgmerge.rb

@@ -710,5 +710,43 @@ msgstr ""
         PO
       end
     end
+
+    class TestObsoleteEntries < self
+      def pot_content
+        <<-POT
+msgid "World"
+msgstr ""
+        POT
+      end
+
+      def po_content
+        <<-PO
+msgid "Hello!"
+msgstr "Bonjour!"
+        PO
+      end
+
+      def test_default
+        @msgmerge.run("--update",
+                      @po_file_path, @pot_file_path)
+        assert_equal(<<-PO, File.read(@po_file_path))
+msgid "World"
+msgstr ""
+
+#~ msgid "Hello!"
+#~ msgstr "Bonjour!"
+        PO
+      end
+
+      def test_no_obsolete_entries
+        @msgmerge.run("--update",
+                      "--no-obsolete-entries",
+                      @po_file_path, @pot_file_path)
+        assert_equal(<<-PO, File.read(@po_file_path))
+msgid "World"
+msgstr ""
+        PO
+      end
+    end
   end
 end

metadata

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