gettext 3.3.0 → 3.3.1

data/test/po/ja/_.edit.po

@@ -93,10 +93,6 @@ msgid ""
 "Here document2\n"
 msgstr ""
 
-#: ../fixtures/_.rb:109
-msgid "in_quote"
-msgstr ""
-
 #. TRANSLATORS: This is a proper name.  See the gettext
 #. manual, section Names.  Note this is actually a non-ASCII
 #. name: The first name is (with Unicode escapes)

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

@@ -7,6 +7,7 @@ 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 non_ascii package.
+# This file is distributed under the same license as the gettext package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: non_ascii 3.2.9\n"
+"Project-Id-Version: gettext 3.0.0\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"
+"POT-Creation-Date: 2013-08-30 22:00+0900\n"
+"PO-Revision-Date: 2013-08-30 22:00+0900\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"

data/test/po/np_.pot

@@ -1,25 +1,22 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the np_ package.
+# This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"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"
+"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"
 "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,18 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the ns_ package.
+# This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"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"
+"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"
 "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.2.9\n"
+"Project-Id-Version: p_ 3.1.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-01-08 16:01+0900\n"
-"PO-Revision-Date: 2020-01-08 16:01+0900\n"
+"POT-Creation-Date: 2014-07-09 15:25+0900\n"
+"PO-Revision-Date: 2014-07-09 15:25+0900\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"

data/test/po/s_.pot

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

data/test/run-test.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 #
-# Copyright (C) 2012  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2012-2020  Sutou Kouhei <kou@clear-code.com>
 #
 # License: Ruby's or LGPL
 #
@@ -32,7 +32,7 @@ require "test-unit"
 require "test/unit/notify"
 require "test/unit/rr"
 
-require "gettext-test-utils"
+require "helper"
 
 Dir.chdir(test_dir) do
   Dir.glob("**/test_*.rb").each do |test_file_path|

data/test/test_parser.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # Copyright (C) 2012  Haruka Yoshihara <yoshihara@clear-code.com>
-# Copyright (C) 2012-2013  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2012-2020  Sutou Kouhei <kou@clear-code.com>
 # Copyright (C) 2010  masone (Christian Felder) <ema@rh-productions.ch>
 # Copyright (C) 2009  Vladimir Dobriakov <vladimir@geekq.net>
 # Copyright (C) 2009-2010  Masao Mutoh
@@ -160,7 +160,7 @@ class TestGetTextParser < Test::Unit::TestCase
   end
 
   class TestErbParser < self
-    include GetTextTestUtils
+    include Helper::Path
 
     def test_detect_encoding
       euc_file = Tempfile.new("euc-jp.rhtml")
@@ -175,19 +175,20 @@ class TestGetTextParser < Test::Unit::TestCase
     end
 
     def test_ascii
-      @ary = GetText::ErbParser.parse('fixtures/erb/ascii.rhtml')
+      path = fixture_path("erb", "ascii.rhtml")
+      @ary = GetText::ErbParser.parse(path)
 
-      assert_target 'aaa', ['fixtures/erb/ascii.rhtml:8']
-      assert_target "aaa\n", ['fixtures/erb/ascii.rhtml:11']
-      assert_target 'bbb', ['fixtures/erb/ascii.rhtml:12']
-      assert_plural_target "ccc1", "ccc2", ['fixtures/erb/ascii.rhtml:13']
+      assert_target 'aaa', ["#{path}:8"]
+      assert_target "aaa\n", ["#{path}:11"]
+      assert_target 'bbb', ["#{path}:12"]
+      assert_plural_target "ccc1", "ccc2", ["#{path}:13"]
     end
 
     def test_non_ascii
-      fixture_path = "fixtures/erb/non_ascii.rhtml"
-      @ary = GetText::ErbParser.parse(fixture_path)
+      path = fixture_path("erb", "non_ascii.rhtml")
+      @ary = GetText::ErbParser.parse(path)
 
-      assert_target('わたし', ["#{fixture_path}:12"])
+      assert_target('わたし', ["#{path}:12"])
     end
   end
 

data/test/test_po_parser.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2018  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2012-2020  Sutou Kouhei <kou@clear-code.com>
 # Copyright (C) 2012  Haruka Yoshihara <yoshihara@clear-code.com>
 #
 # License: Ruby's or LGPL
@@ -60,7 +60,7 @@ EOP
   end
 
   class TestPO < self
-    include GetTextTestUtils
+    include Helper::Warning
 
     def test_msgstr
       po_file = create_po_file(<<-EOP)

data/test/test_string.rb

@@ -1,6 +1,6 @@
 class TestGetTextString < Test::Unit::TestCase
   class TestFormat < self
-    include GetTextTestUtils
+    include Helper::Warning
 
     def test_basic
       assert_equal("foo is a number", "%{msg} is a number" % {:msg => "foo"})

data/test/tools/parser/test_gtk_builder_ui_definitions.rb

@@ -0,0 +1,45 @@
+# Copyright (C) 2020  Sutou Kouhei <kou@clear-code.com>
+#
+# License: Ruby's or LGPL
+#
+# This library is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+require "gettext/tools/parser/gtk_builder_ui_definitions"
+
+class TestGtkBuilderUIDefinitionsParser < Test::Unit::TestCase
+  include Helper::Parser
+
+  def parse(file)
+    GetText::GtkBuilderUIDefinitionsParser.parse(fixture_path(file))
+  end
+
+  def test_all
+    assert_parse([
+                   {
+                     :msgid => "label with context",
+                     :msgctxt => "context",
+                     :references => ["gtk_builder_ui_definitions.ui:19"],
+                   },
+                   {
+                     :msgid => "label simple",
+                     :references => ["gtk_builder_ui_definitions.ui:31"],
+                   },
+                   {
+                     :msgid => "multiple\n" + "lines\n" + "label",
+                     :references => ["gtk_builder_ui_definitions.ui:55"],
+                   },
+                 ],
+                 "gtk_builder_ui_definitions.ui")
+  end
+end

data/test/tools/parser/test_ruby.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # Copyright (C) 2012  Haruka Yoshihara <yoshihara@clear-code.com>
-# Copyright (C) 2012-2013  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2012-2020  Sutou Kouhei <kou@clear-code.com>
 # Copyright (C) 2010  masone (Christian Felder) <ema@rh-productions.ch>
 # Copyright (C) 2009  Vladimir Dobriakov <vladimir@geekq.net>
 # Copyright (C) 2009-2010  Masao Mutoh
@@ -24,49 +24,12 @@
 require "gettext/tools/parser/ruby"
 
 class TestRubyParser < Test::Unit::TestCase
-  include GetTextTestUtils
+  include Helper::Parser
 
-  private
   def parse(file)
     GetText::RubyParser.parse(fixture_path(file))
   end
 
-  def assert_parse(expected, file)
-    assert_equal(normalize_expected(expected),
-                 normalize_actual(parse(file)))
-  end
-
-  def normalize_expected(messages)
-    messages.collect do |message|
-      default = {
-        :msgid        => nil,
-        :msgid_plural => nil,
-        :msgstr       => nil,
-        :separator    => nil,
-        :references   => nil,
-      }
-      default.merge(message)
-    end
-  end
-
-  def normalize_actual(po)
-    po.collect do |po_entry|
-      {
-        :msgid        => po_entry.msgid,
-        :msgid_plural => po_entry.msgid_plural,
-        :msgstr       => po_entry.msgstr,
-        :separator    => po_entry.separator,
-        :references   => normalize_references(po_entry.references),
-      }
-    end
-  end
-
-  def normalize_references(references)
-    references.collect do |reference|
-      reference.sub(/\A#{Regexp.escape(fixture_path)}\//, "")
-    end
-  end
-
   class TestDetectEncoding < self
     def test_ascii_and_hyphen
       assert_equal("euc-jp", detect_encoding("# coding: euc-jp"))
@@ -227,6 +190,30 @@ class TestRubyParser < Test::Unit::TestCase
                    path)
     end
 
+
+    def test_percent_strings
+      path = "percent_strings.rb"
+      assert_parse([
+                     {
+                       :msgid      => "hello world",
+                       :references => ["#{path}:34"],
+                     }
+                   ],
+                   path)
+    end
+
+    def test_quoted_symbol
+      path = "quoted_symbol.rb"
+      assert_parse([],
+                   path)
+    end
+
+    def test_backtick
+      path = "backtick.rb"
+      assert_parse([],
+                   path)
+    end
+
     private
     def fixture_path(*components)
       super("_", *components)

data/test/tools/test_msgmerge.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2012-2015  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2012-2020  Sutou Kouhei <kou@clear-code.com>
 # Copyright (C) 2010  Eddie Lau <tatonlto@gmail.com>
 #
 # License: Ruby's or LGPL
@@ -363,7 +363,7 @@ EOC
   end
 
   class TestCommand < self
-    include GetTextTestUtils
+    include Helper::Tmpdir
 
     def setup
       @msgmerge = GetText::Tools::MsgMerge.new
@@ -480,7 +480,7 @@ EOP
       end
 
       class TestMessage < self
-        include GetTextTestUtils
+        include Helper::Warning
 
         def po_content
           <<-PO

data/test/tools/test_xgettext.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2012-2013  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2012-2020  Sutou Kouhei <kou@clear-code.com>
 # Copyright (C) 2012  Haruka Yoshihara <yoshihara@clear-code.com>
 #
 # License: Ruby's or LGPL
@@ -22,7 +22,7 @@ require "locale"
 require "gettext/tools/xgettext"
 
 class TestToolsXGetText < Test::Unit::TestCase
-  include GetTextTestUtils
+  include Helper::Tmpdir
 
   def setup
     @xgettext = GetText::Tools::XGetText.new

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gettext
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.3.1
 platform: ruby
 authors:
 - Kouhei Sutou
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-08 00:00:00.000000000 Z
+date: 2020-01-11 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:
-- rmsgfmt
 - rmsgmerge
+- rmsginit
 - rmsgcat
 - rxgettext
-- rmsginit
+- rmsgfmt
 extensions: []
 extra_rdoc_files: []
 files:
@@ -185,6 +185,7 @@ files:
 - lib/gettext/tools/msgmerge.rb
 - lib/gettext/tools/parser/erb.rb
 - lib/gettext/tools/parser/glade.rb
+- lib/gettext/tools/parser/gtk_builder_ui_definitions.rb
 - lib/gettext/tools/parser/ruby.rb
 - lib/gettext/tools/task.rb
 - lib/gettext/tools/xgettext.rb
@@ -1513,6 +1514,7 @@ files:
 - samples/po/zh_TW/hello_tk.po.time_stamp
 - src/po_parser.ry
 - test/fixtures/_.rb
+- test/fixtures/_/backtick.rb
 - test/fixtures/_/block_parameter.rb
 - test/fixtures/_/double_quote_in_double_quote.rb
 - test/fixtures/_/double_quote_in_single_quote.rb
@@ -1523,11 +1525,14 @@ files:
 - test/fixtures/_/multiple_same_messages.rb
 - test/fixtures/_/one_line.rb
 - test/fixtures/_/one_new_line.rb
+- test/fixtures/_/percent_strings.rb
+- test/fixtures/_/quoted_symbol.rb
 - test/fixtures/backslash.rb
 - test/fixtures/erb/ascii.rhtml
 - test/fixtures/erb/ascii.rxml
 - test/fixtures/erb/non_ascii.rhtml
 - test/fixtures/gladeparser.glade
+- test/fixtures/gtk_builder_ui_definitions.ui
 - test/fixtures/hello.rb
 - test/fixtures/lower_n_.rb
 - test/fixtures/multi_text_domain.rb
@@ -1541,7 +1546,7 @@ files:
 - test/fixtures/simple.rb
 - test/fixtures/untranslated.rb
 - test/fixtures/upper_n_.rb
-- test/gettext-test-utils.rb
+- test/helper.rb
 - test/locale/cr/LC_MESSAGES/plural.mo
 - test/locale/da/LC_MESSAGES/plural.mo
 - test/locale/da/LC_MESSAGES/plural_error.mo
@@ -1652,6 +1657,7 @@ files:
 - test/tools/files/simple_2.po
 - test/tools/files/simple_translation.rb
 - test/tools/files/version.po
+- test/tools/parser/test_gtk_builder_ui_definitions.rb
 - test/tools/parser/test_ruby.rb
 - test/tools/test.pot
 - test/tools/test_msgcat.rb
@@ -1685,16 +1691,16 @@ specification_version: 4
 summary: Gettext is a pure Ruby libary and tools to localize messages.
 test_files:
 - 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_parser.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_text_domain.rb
-- test/test_parser.rb
-- test/test_text_domain_multi.rb
+- test/test_string.rb
+- test/test_locale_path.rb
 - test/test_thread.rb
 - test/test_class_info.rb
+- test/test_text_domain_multi.rb
+- test/test_po_entry.rb
+- test/test_gettext.rb
+- test/test_text_domain_toplevel.rb
+- test/test_po.rb