gettext 3.2.9 → 3.3.0

data/test/po/ja/hello.edit.po

@@ -7,7 +7,6 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hello 3.1.7\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-22 14:05+0900\n"
 "PO-Revision-Date: 2015-09-22 14:06+0900\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Japanese\n"

data/test/po/non_ascii.pot

@@ -1,15 +1,15 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the gettext package.
+# This file is distributed under the same license as the non_ascii package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext 3.0.0\n"
+"Project-Id-Version: non_ascii 3.2.9\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-30 22:00+0900\n"
-"PO-Revision-Date: 2013-08-30 22:00+0900\n"
+"POT-Creation-Date: 2018-06-16 12:12+0900\n"
+"PO-Revision-Date: 2018-06-16 12:12+0900\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"

data/test/po/np_.pot

@@ -1,22 +1,25 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
+# This file is distributed under the same license as the np_ package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-08-19 22:14+0900\n"
-"PO-Revision-Date: 2012-08-19 22:14+0900\n"
+"Project-Id-Version: np_ 3.2.9\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-06-16 12:12+0900\n"
+"PO-Revision-Date: 2018-06-16 12:12+0900\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: ../fixtures/np_.rb:28 ../fixtures/np_.rb:29 ../fixtures/np_.rb:33 ../fixtures/np_.rb:34
+#: ../fixtures/np_.rb:28 ../fixtures/np_.rb:29 ../fixtures/np_.rb:33
+#: ../fixtures/np_.rb:34
 msgctxt "Magazine"
 msgid "a book"
 msgid_plural "%{num} books"

data/test/po/ns_.pot

@@ -1,16 +1,18 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
+# This file is distributed under the same license as the ns_ package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-08-19 22:38+0900\n"
-"PO-Revision-Date: 2012-08-19 22:38+0900\n"
+"Project-Id-Version: ns_ 3.2.9\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-06-16 12:12+0900\n"
+"PO-Revision-Date: 2018-06-16 12:12+0900\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

data/test/po/p_.pot

@@ -6,10 +6,10 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: p_ 3.1.3\n"
+"Project-Id-Version: p_ 3.2.9\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-07-09 15:25+0900\n"
-"PO-Revision-Date: 2014-07-09 15:25+0900\n"
+"POT-Creation-Date: 2020-01-08 16:01+0900\n"
+"PO-Revision-Date: 2020-01-08 16:01+0900\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"

data/test/po/s_.pot

@@ -1,16 +1,18 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
+# This file is distributed under the same license as the s_ package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-08-19 22:25+0900\n"
-"PO-Revision-Date: 2012-08-19 22:25+0900\n"
+"Project-Id-Version: s_ 3.2.9\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-06-16 12:12+0900\n"
+"PO-Revision-Date: 2018-06-16 12:12+0900\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

data/test/po/untranslated.pot

@@ -1,15 +1,15 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the gettext package.
+# This file is distributed under the same license as the untranslated package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext 3.0.0\n"
+"Project-Id-Version: untranslated 3.2.9\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-30 22:00+0900\n"
-"PO-Revision-Date: 2013-08-30 22:00+0900\n"
+"POT-Creation-Date: 2018-06-16 12:12+0900\n"
+"PO-Revision-Date: 2018-06-16 12:12+0900\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"

data/test/test_class_info.rb

@@ -30,11 +30,6 @@ module M8
   include M9
 end
 
-# Anonymous module
-@@anon = Module.new
-class @@anon::AC1; end
-module @@anon::AM1; end
-
 module TestClassInfoSandbox
   class << self
     def clear
@@ -57,11 +52,15 @@ class TestClassInfo < Test::Unit::TestCase
     assert_equal TestClassInfo, normalize_class(self)
   end
 
+  @@anonymous_module = Module.new
+  class @@anonymous_module::AC1; end
+  module @@anonymous_module::AM1; end
+
   def test_normalize_class_anonymous_module
-    assert_equal Object, normalize_class(@@anon)
-    assert_equal Object, normalize_class(@@anon)
-    assert_equal Object, normalize_class(@@anon::AC1)
-    assert_equal Object, normalize_class(@@anon::AM1)
+    assert_equal Object, normalize_class(@@anonymous_module)
+    assert_equal Object, normalize_class(@@anonymous_module)
+    assert_equal Object, normalize_class(@@anonymous_module::AC1)
+    assert_equal Object, normalize_class(@@anonymous_module::AM1)
   end
 
   def test_related_classes

data/test/test_gettext.rb

@@ -235,7 +235,10 @@ DDD
     set_locale("fr")
     assert_equal("fr_first", n_("first", "second", 0))
     assert_equal("fr_first", n_("first", "second", 1))
-    assert_equal("fr_first", n_("first", "second", 2))
+    assert_equal("fr_first", n_("first", "second", 2)) # no translation
+    assert_equal("fr_first_2", n_("first_2", "second_2", 0))
+    assert_equal("fr_first_2", n_("first_2", "second_2", 1))
+    assert_equal("", n_("first_2", "second_2", 2))     # empty translation
     set_locale("da") # Invalid Plural-Forms.
     assert_equal("da_first", n_("first", "second", 0))
     assert_equal("da_first", n_("first", "second", 1))
@@ -352,6 +355,9 @@ DDD
   end
 
   def test_safe_mode
+    if RUBY_VERSION >= "2.6.0"
+      omit("Per thread $SAFE is removed since Ruby 2.6.")
+    end
     Thread.start{
       $SAFE = 1
       GetText.bindtextdomain("test1", :path => "locale")

data/test/test_parser.rb

@@ -187,7 +187,7 @@ class TestGetTextParser < Test::Unit::TestCase
       fixture_path = "fixtures/erb/non_ascii.rhtml"
       @ary = GetText::ErbParser.parse(fixture_path)
 
-      assert_target('わたし', ["#{fixture_path}:11"])
+      assert_target('わたし', ["#{fixture_path}:12"])
     end
   end
 

data/test/test_po_entry.rb

@@ -1,7 +1,5 @@
-# -*- coding: utf-8 -*-
-#
 # Copyright (C) 2012  Haruka Yoshihara <yoshihara@clear-code.com>
-# Copyright (C) 2012-2014  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2012-2019  Sutou Kouhei <kou@clear-code.com>
 # Copyright (C) 2010  masone (Christian Felder) <ema@rh-productions.ch>
 # Copyright (C) 2009  Masao Mutoh
 #
@@ -35,16 +33,6 @@ class TestPOEntry < Test::Unit::TestCase
     end
   end
 
-  def test_attribute_accumulation
-    tt = GetText::POEntry.new(:plural)
-    tt.set_current_attribute 'long'
-    tt.set_current_attribute ' tail'
-    tt.advance_to_next_attribute
-    tt.set_current_attribute 'long tails'
-    assert_equal 'long tail', tt.msgid
-    assert_equal 'long tails', tt.msgid_plural
-  end
-
   class TestSetType < self
     def test_varid_type
       entry = GetText::POEntry.new(:normal)

data/test/test_po_parser.rb

@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright (C) 2012  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2012-2018  Kouhei Sutou <kou@clear-code.com>
 # Copyright (C) 2012  Haruka Yoshihara <yoshihara@clear-code.com>
 #
 # License: Ruby's or LGPL
@@ -62,6 +60,8 @@ EOP
   end
 
   class TestPO < self
+    include GetTextTestUtils
+
     def test_msgstr
       po_file = create_po_file(<<-EOP)
 # This is the comment.
@@ -220,7 +220,9 @@ EOP
 msgid "hello"
 msgstr "bonjour"
 EOP
-      entries = parse_po_file(po_file, :ignore_fuzzy => false)
+      entries = suppress_warning do
+        parse_po_file(po_file, :ignore_fuzzy => false)
+      end
 
       assert_true(entries.has_key?("hello"))
       assert_equal("fuzzy", entries["hello"].flag)

data/test/test_string.rb

@@ -1,7 +1,7 @@
-# -*- coding: utf-8 -*-
-
 class TestGetTextString < Test::Unit::TestCase
   class TestFormat < self
+    include GetTextTestUtils
+
     def test_basic
       assert_equal("foo is a number", "%{msg} is a number" % {:msg => "foo"})
       assert_equal("bar is a number", "%s is a number" % ["bar"])
@@ -22,7 +22,9 @@ class TestGetTextString < Test::Unit::TestCase
 
     def test_percent
       assert_equal("% 1", "%% %<num>d" % {:num => 1.0})
-      assert_equal("%{num} %<num>d", "%%{num} %%<num>d" % {:num => 1})
+      suppress_warning do
+        assert_equal("%{num} %<num>d", "%%{num} %%<num>d" % {:num => 1})
+      end
     end
 
     def test_percent_in_replacement
@@ -30,8 +32,10 @@ class TestGetTextString < Test::Unit::TestCase
     end
 
     def test_no_placeholder
-      assert_equal("aaa", "aaa" % {:num => 1})
-      assert_equal("bbb", "bbb" % [1])
+      suppress_warning do
+        assert_equal("aaa", "aaa" % {:num => 1})
+        assert_equal("bbb", "bbb" % [1])
+      end
     end
 
     def test_ruby19_style

data/test/tools/test_msgmerge.rb

@@ -292,7 +292,6 @@ msgstr "bonjour"
         @pot[new_msgid] = ""
         merged_po = merge
 
-        puts merged_po
         assert_equal("bonjour", merged_po[new_msgid].msgstr)
         assert_equal("fuzzy", merged_po[new_msgid].flag)
       end
@@ -481,6 +480,8 @@ EOP
       end
 
       class TestMessage < self
+        include GetTextTestUtils
+
         def po_content
           <<-PO
 #{po_header(@po_formatted_time, @po_formatted_time)}
@@ -492,7 +493,9 @@ msgstr "Translated World"
         end
 
         def test_merge_metadata
-          @msgmerge.run("--update", @po_file_path, @pot_file_path)
+          suppress_warning do
+            @msgmerge.run("--update", @po_file_path, @pot_file_path)
+          end
           assert_equal(<<-PO, File.read(@po_file_path))
 #{po_header(@pot_formatted_time, @po_formatted_time)}
 #: hello.rb:1

data/test/tools/test_xgettext.rb

@@ -414,6 +414,7 @@ msgid "World"
 msgstr ""
 
 #: ../lib/xgettext.rb:2
+msgctxt "context"
 msgid "Hello"
 msgstr ""
 
@@ -443,6 +444,7 @@ msgid "World"
 msgstr ""
 
 #: ../lib/xgettext.rb:2
+msgctxt "context"
 msgid "Hello"
 msgstr ""
         POT
@@ -456,6 +458,7 @@ msgid "World"
 msgstr ""
 
 #: ../lib/xgettext.rb:2
+msgctxt "context"
 msgid "Hello"
 msgstr ""
 
@@ -481,6 +484,7 @@ msgid "ABC"
 msgstr ""
 
 #: ../lib/xgettext.rb:2
+msgctxt "context"
 msgid "Hello"
 msgstr ""
 
@@ -502,7 +506,7 @@ msgstr ""
         File.open(@rb_file_path, "w") do |rb_file|
           rb_file.puts(<<-RUBY)
 _('World')
-_('Hello')
+p_('context', 'Hello')
           RUBY
         end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gettext
 version: !ruby/object:Gem::Version
-  version: 3.2.9
+  version: 3.3.0
 platform: ruby
 authors:
 - Kouhei Sutou
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-05 00:00:00.000000000 Z
+date: 2020-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: locale
@@ -145,11 +145,11 @@ email:
 - kou@clear-code.com
 - mutomasa at gmail.com
 executables:
-- rmsginit
 - rmsgfmt
+- rmsgmerge
 - rmsgcat
 - rxgettext
-- rmsgmerge
+- rmsginit
 extensions: []
 extra_rdoc_files: []
 files:
@@ -185,7 +185,6 @@ files:
 - lib/gettext/tools/msgmerge.rb
 - lib/gettext/tools/parser/erb.rb
 - lib/gettext/tools/parser/glade.rb
-- lib/gettext/tools/parser/haml.rb
 - lib/gettext/tools/parser/ruby.rb
 - lib/gettext/tools/task.rb
 - lib/gettext/tools/xgettext.rb
@@ -1660,7 +1659,7 @@ files:
 - test/tools/test_msgmerge.rb
 - test/tools/test_task.rb
 - test/tools/test_xgettext.rb
-homepage: http://ruby-gettext.github.com/
+homepage: https://ruby-gettext.github.io/
 licenses:
 - Ruby or LGPLv3+
 metadata: {}
@@ -1672,30 +1671,30 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: gettext
-rubygems_version: 2.7.6
+rubyforge_project: 
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: Gettext is a pure Ruby libary and tools to localize messages.
 test_files:
-- test/test_locale_path.rb
-- test/test_parser.rb
-- test/test_class_info.rb
+- test/test_mo.rb
 - test/test_text_domain_toplevel.rb
+- test/test_locale_path.rb
+- test/test_text_domain_bind.rb
 - test/test_po_entry.rb
-- test/test_text_domain.rb
-- test/test_mo.rb
-- test/test_string.rb
+- test/test_po_parser.rb
 - test/test_po.rb
+- test/test_string.rb
 - test/test_gettext.rb
-- test/test_text_domain_bind.rb
-- test/test_thread.rb
+- test/test_text_domain.rb
+- test/test_parser.rb
 - test/test_text_domain_multi.rb
-- test/test_po_parser.rb
+- test/test_thread.rb
+- test/test_class_info.rb