gettext 3.3.0 → 3.3.1

data/test/fixtures/_/multiple_lines_literal.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2013  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2013-2020  Sutou Kouhei <kou@clear-code.com>
 #
 # License: Ruby's or LGPL
 #
@@ -22,7 +22,7 @@ module Fixtures
     class MultipleLinesLiteral
       include GetText
 
-      bindtextdomain("_", :path => GetTextTestUtils.locale_path)
+      bindtextdomain("_", :path => Helper::Path.locale_path)
 
       def message
         _("multiple

data/test/fixtures/_/multiple_messages_in_same_line.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2013  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2013-2020  Sutou Kouhei <kou@clear-code.com>
 #
 # License: Ruby's or LGPL
 #
@@ -22,7 +22,7 @@ module Fixtures
     class MultipleMessagesInSameLine
       include GetText
 
-      bindtextdomain("_", :path => GetTextTestUtils.locale_path)
+      bindtextdomain("_", :path => Helper::Path.locale_path)
 
       def message
         _("multiple") + " messages " + _("in same line")

data/test/fixtures/_/multiple_same_messages.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2013  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2013-2020  Sutou Kouhei <kou@clear-code.com>
 #
 # License: Ruby's or LGPL
 #
@@ -22,7 +22,7 @@ module Fixtures
     class MultipleSameMessages
       include GetText
 
-      bindtextdomain("_", :path => GetTextTestUtils.locale_path)
+      bindtextdomain("_", :path => Helper::Path.locale_path)
 
       def message
         _("multiple same messages")

data/test/fixtures/_/one_line.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2012  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2012-2020  Sutou Kouhei <kou@clear-code.com>
 #
 # License: Ruby's or LGPL
 #
@@ -22,7 +22,7 @@ module Fixtures
     class OneLine
       include GetText
 
-      bindtextdomain("_", :path => GetTextTestUtils.locale_path)
+      bindtextdomain("_", :path => Helper::Path.locale_path)
 
       def message
         _("one line")

data/test/fixtures/_/one_new_line.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2013  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2013-2020  Sutou Kouhei <kou@clear-code.com>
 #
 # License: Ruby's or LGPL
 #
@@ -22,7 +22,7 @@ module Fixtures
     class OneNewLine
       include GetText
 
-      bindtextdomain("_", :path => GetTextTestUtils.locale_path)
+      bindtextdomain("_", :path => Helper::Path.locale_path)
 
       def message
         _("one new line\n")

data/test/{gettext-test-utils.rb → fixtures/_/percent_strings.rb}

@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2018  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2020  Kitaiti Makoto <KitaitiMakoto@gmail.com>
 #
 # License: Ruby's or LGPL
 #
@@ -15,37 +15,32 @@
 # 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 "fileutils"
-require "tmpdir"
-require "tempfile"
-require "time"
+module Fixtures
+  module Method_
+    class PercentStrings
+      include GetText
 
-require "gettext"
+      bindtextdomain("_", :path => Helper::Path.locale_path)
 
-module GetTextTestUtils
-  module_function
-  def fixture_path(*components)
-    File.join(File.dirname(__FILE__), "fixtures", *components)
-  end
+      def symbol_array
+        _(%i(hello world))
+      end
 
-  def locale_path
-    File.join(File.dirname(__FILE__), "locale")
-  end
+      def symbol
+        _(%s(hello world))
+      end
 
-  def setup_tmpdir
-    @tmpdir = Dir.mktmpdir
-  end
+      def string
+        _(%(hello world))
+      end
 
-  def teardown_tmpdir
-    FileUtils.rm_rf(@tmpdir, :secure => true) if @tmpdir
-  end
+      def string_array
+        _(%w(hello world))
+      end
 
-  def suppress_warning
-    stderr, $stderr = $stderr, StringIO.new
-    begin
-      yield
-    ensure
-      $stderr = stderr
+      def execute
+        _(%x(echo hello world))
+      end
     end
   end
 end

data/test/fixtures/_/quoted_symbol.rb

@@ -0,0 +1,34 @@
+# Copyright (C) 2020  Kitaiti Makoto <KitaitiMakoto@gmail.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/>.
+
+module Fixtures
+  module Method_
+    class QuotedSymbol
+      include GetText
+
+      bindtextdomain("_", :path => Helper::Path.locale_path)
+
+      def symbol_quoted_by_single_quote
+        _(:'hello world')
+      end
+
+      def symbol_quoted_by_double_quote
+        _(:"hello world")
+      end
+    end
+  end
+end

data/test/fixtures/gtk_builder_ui_definitions.ui

@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.22.1 -->
+<interface>
+  <requires lib="gtk+" version="3.20"/>
+  <object class="GtkWindow">
+    <property name="can_focus">False</property>
+    <child>
+      <placeholder/>
+    </child>
+    <child>
+      <object class="GtkBox">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
+        <child>
+          <object class="GtkLabel">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label" translatable="yes" context="context" comments="comment">label with context</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label" translatable="yes">label simple</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label">not trnanslatable label</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">2</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label" translatable="yes">multiple
+lines
+label</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">3</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </object>
+</interface>

data/test/fixtures/ns_/custom.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2012  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2012-2020  Sutou Kouhei <kou@clear-code.com>
 #
 # License: Ruby's or LGPL
 #
@@ -22,7 +22,7 @@ module Fixtures
     class Custom
       include GetText
 
-      bindtextdomain("ns_", :path => GetTextTestUtils.locale_path)
+      bindtextdomain("ns_", :path => Helper::Path.locale_path)
 
       def message
         ns_("context|context$message", "context|context$messages", 1, "$")

data/test/fixtures/s_/custom.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2012  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2012-2020  Sutou Kouhei <kou@clear-code.com>
 #
 # License: Ruby's or LGPL
 #
@@ -22,7 +22,7 @@ module Fixtures
     class Custom
       include GetText
 
-      bindtextdomain("s_", :path => GetTextTestUtils.locale_path)
+      bindtextdomain("s_", :path => Helper::Path.locale_path)
 
       def message
         s_("context|context$message", "$")

data/test/helper.rb

@@ -0,0 +1,99 @@
+# Copyright (C) 2012-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 "fileutils"
+require "tmpdir"
+require "tempfile"
+require "time"
+
+require "gettext"
+
+module Helper
+  module Path
+    module_function
+    def fixture_path(*components)
+      File.join(File.dirname(__FILE__), "fixtures", *components)
+    end
+
+    def locale_path
+      File.join(File.dirname(__FILE__), "locale")
+    end
+  end
+
+  module Tmpdir
+    def setup_tmpdir
+      @tmpdir = Dir.mktmpdir
+    end
+
+    def teardown_tmpdir
+      FileUtils.rm_rf(@tmpdir, :secure => true) if @tmpdir
+    end
+  end
+
+  module Warning
+    def suppress_warning
+      stderr, $stderr = $stderr, StringIO.new
+      begin
+        yield
+      ensure
+        $stderr = stderr
+      end
+    end
+  end
+
+  module Parser
+    include Helper::Path
+
+    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,
+          :msgctxt      => 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,
+          :msgctxt      => po_entry.msgctxt,
+          :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
+  end
+end

data/test/po/_.pot

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: _ 3.2.9\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-01-08 16:55+0900\n"
-"PO-Revision-Date: 2020-01-08 16:55+0900\n"
+"POT-Creation-Date: 2018-06-17 07:35+0900\n"
+"PO-Revision-Date: 2018-06-17 07:35+0900\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -92,10 +92,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/backslash.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 backslash package.
+# This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: backslash 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:58+0900\n"
+"PO-Revision-Date: 2012-08-19 22:58+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/hello.pot

@@ -6,10 +6,10 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: hello 3.2.9\n"
+"Project-Id-Version: hello 3.1.7\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: 2015-09-22 14:05+0900\n"
+"PO-Revision-Date: 2015-09-22 14:05+0900\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"