gettext 3.4.2 → 3.5.2

data/test/tools/test_msginit.rb

@@ -1,5 +1,5 @@
 # Copyright (C) 2012  Haruka Yoshihara <yoshihara@clear-code.com>
-# Copyright (C) 2012-2021  Sutou Kouhei <kou@clear-code.com>
+# Copyright (C) 2012-2023  Sutou Kouhei <kou@clear-code.com>
 #
 # License: Ruby's or LGPL
 #
@@ -32,12 +32,10 @@ class TestToolsMsgInit < Test::Unit::TestCase
     stub(@msginit).revision_date {@po_revision_date}
 
     Locale.current = "ja_JP.UTF-8"
-  end
 
-  def run(*args, &blcok)
     Dir.mktmpdir do |dir|
       Dir.chdir(dir) do
-        super
+        yield
       end
     end
   end
@@ -51,6 +49,10 @@ class TestToolsMsgInit < Test::Unit::TestCase
     Locale.current.language
   end
 
+  def current_charset
+    Locale.current.charset
+  end
+
   def translator_name
     "me"
   end
@@ -59,6 +61,10 @@ class TestToolsMsgInit < Test::Unit::TestCase
     "me@example.com"
   end
 
+  def template_charset
+    "CHARSET"
+  end
+
   def create_pot_file(path, options=nil)
     options ||= {}
     File.open(path, "w") do |pot_file|
@@ -79,6 +85,7 @@ class TestToolsMsgInit < Test::Unit::TestCase
     options = default_po_header_options.merge(options)
     package_name = options[:package_name] || default_package_name
     have_plural_forms = options[:have_plural_forms] || true
+    charset = options[:charset] || "UTF-8"
     header = <<EOF
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
@@ -95,7 +102,7 @@ msgstr ""
 "Language: \\n"
 "Language-Team: LANGUAGE <LL@li.org>\\n"
 "MIME-Version: 1.0\\n"
-"Content-Type: text/plain; charset=UTF-8\\n"
+"Content-Type: text/plain; charset=#{charset}\\n"
 "Content-Transfer-Encoding: 8bit\\n"
 EOF
     if have_plural_forms
@@ -111,6 +118,7 @@ EOF
     name = options[:translator_name] || "FULL NAME"
     email = options[:translator_email] || "EMAIL@ADDRESS"
     language_name = Locale::Info.get_language(language).name
+    charset = options[:charset] || "UTF-8"
     plural_forms = @msginit.send(:plural_forms, language)
 
     <<EOF
@@ -128,7 +136,7 @@ msgstr ""
 "Language: #{locale}\\n"
 "Language-Team: #{language_name}\\n"
 "MIME-Version: 1.0\\n"
-"Content-Type: text/plain; charset=UTF-8\\n"
+"Content-Type: text/plain; charset=#{charset}\\n"
 "Content-Transfer-Encoding: 8bit\\n"
 "Plural-Forms: #{plural_forms}\\n"
 EOF
@@ -171,9 +179,11 @@ EOF
 
   class TestOutput < self
     def setup
-      super
-      @pot_file_path = "test.pot"
-      create_pot_file(@pot_file_path)
+      super do
+        @pot_file_path = "test.pot"
+        create_pot_file(@pot_file_path)
+        yield
+      end
     end
 
     def test_default
@@ -196,8 +206,8 @@ EOF
   end
 
   class TestLocale < self
-    def run_msginit(locale)
-      create_pot_file("test.pot")
+    def run_msginit(locale, pot_charset=nil)
+      create_pot_file("test.pot", charset: pot_charset)
       po_file_path = "output.po"
       @msginit.run("--output", po_file_path,
                    "--locale", locale)
@@ -224,6 +234,50 @@ EOF
       assert_equal(po_header(locale, language),
                    run_msginit("#{locale}.#{charset}"))
     end
+
+    def test_language_charset_with_template_charset
+      locale = "en"
+      assert_equal(po_header(locale, locale),
+                   run_msginit(locale, template_charset))
+    end
+
+    def test_language_region_with_template_charset
+      locale = "en_US"
+      language = "en"
+      assert_equal(po_header(locale, language),
+                   run_msginit(locale, template_charset))
+    end
+
+    def test_language_region_charset_with_template_charset
+      locale = "en_US"
+      language = "en"
+      charset = "UTF-8"
+      assert_equal(po_header(locale, language),
+                   run_msginit("#{locale}.#{charset}", template_charset))
+    end
+  end
+
+  class TestCurrentCharset < self
+    def run_msginit(pot_charset)
+      create_pot_file("test.pot", charset: pot_charset)
+      po_file_path = "output.po"
+      @msginit.run("--output", po_file_path)
+      File.read(po_file_path)
+    end
+
+    def po_header(options)
+      super(current_locale, current_language, options)
+    end
+
+    def test_template_charset
+      assert_equal(po_header(charset: current_charset),
+                   run_msginit(template_charset))
+    end
+
+    def test_no_template_charset
+      assert_equal(po_header(charset: "ASCII"),
+                   run_msginit("ASCII"))
+    end
   end
 
   class TestTranslator < self
@@ -313,8 +367,10 @@ EOF
 
   class TestPluralForms < self
     def setup
-      super
       omit("Red Datasets is required") unless defined?(Datasets::CLDRPlurals)
+      super do
+        yield
+      end
     end
 
     def run_msginit(pot_header_options={})
@@ -364,7 +420,7 @@ EOF
     def test_ro
       assert_equal("nplurals=3; " +
                    "plural=(n == 1) ? 0 : " +
-                   "(n == 0) || ((n % 100) >= 2 && (n % 100) <= 19) ? 1 : 2;",
+                   "(n == 0) || (n != 1) && ((n % 100) >= 1 && (n % 100) <= 19) ? 1 : 2;",
                    @msginit.__send__(:plural_forms, "ro"))
     end
 

data/test/tools/test_msgmerge.rb

@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright (C) 2012-2020  Sutou Kouhei <kou@clear-code.com>
+# Copyright (C) 2012-2023  Sutou Kouhei <kou@clear-code.com>
 # Copyright (C) 2010  Eddie Lau <tatonlto@gmail.com>
 #
 # License: Ruby's or LGPL
@@ -654,6 +652,46 @@ msgstr ""
       end
     end
 
+    class TestUseOneLinePerReference < self
+      def pot_content
+        super + <<-POT
+
+#: hello.rb:10
+#: hello.rb:20
+#: hello.rb:30
+msgid "Good morning"
+msgstr ""
+        POT
+      end
+
+      def test_with_wrap
+        @msgmerge.run("--update",
+                      "--wrap",
+                      "--use-one-line-per-reference",
+                      @po_file_path, @pot_file_path)
+        assert_equal(<<-PO, File.read(@po_file_path))
+#{po_header(@pot_formatted_time, @po_formatted_time)}
+#: hello.rb:1
+msgid "Hello"
+msgstr ""
+
+#: hello.rb:2
+msgid "World"
+msgstr "Translated World"
+
+#: hello.rb:3
+msgid "Good-bye"
+msgstr ""
+
+#: hello.rb:10
+#: hello.rb:20
+#: hello.rb:30
+msgid "Good morning"
+msgstr ""
+        PO
+      end
+    end
+
     class TestWidth < self
       def pot_content
         <<-POT

data/test/tools/test_xgettext.rb

@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright (C) 2012-2020  Sutou Kouhei <kou@clear-code.com>
+# Copyright (C) 2012-2023  Sutou Kouhei <kou@clear-code.com>
 # Copyright (C) 2012  Haruka Yoshihara <yoshihara@clear-code.com>
 #
 # License: Ruby's or LGPL
@@ -116,6 +114,105 @@ msgid "Hello"
 msgstr ""
 EOP
     end
+
+    def test_use_one_line_per_reference
+      pot_content = generate(<<-RUBY, "--use-one-line-per-reference")
+_("Hello")
+_("Hello")
+      RUBY
+      assert_equal(<<-POT, pot_content)
+#{header}
+#: ../lib/xgettext.rb:1
+#: ../lib/xgettext.rb:2
+msgid "Hello"
+msgstr ""
+      POT
+    end
+  end
+
+  class TestParser < self
+    # Default ERB parser (don't find anything after "case")
+    def test_erb
+      rhtml = <<-EOR
+<div>
+  <%= _('Hello') %>
+  <% case 1 %>
+  <% end %>
+  <%= _('World') %>
+</div>
+EOR
+
+      File.open(@rhtml_file_path, "w") do |rhtml_file|
+        rhtml_file.puts(rhtml)
+      end
+
+      @xgettext.run(
+        "--output", @pot_file_path,
+        @rhtml_file_path
+      )
+
+      pot_content = File.read(@pot_file_path)
+
+      if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.0.0')
+        expected_content = <<-EOP
+#{header}
+#: ../templates/xgettext.rhtml:2
+msgid "Hello"
+msgstr ""
+
+#: ../templates/xgettext.rhtml:5
+msgid "World"
+msgstr ""
+EOP
+      else
+        # "World" not detected. see PR #91
+        expected_content = <<-EOP
+#{header}
+#: ../templates/xgettext.rhtml:2
+msgid "Hello"
+msgstr ""
+EOP
+      end
+
+      assert_equal(expected_content, pot_content)
+    end
+
+    # Optional Erubi parser (find text after "case")
+    def test_erubi
+      rhtml = <<-EOR
+<div>
+  <%= _('Hello') %>
+  <% case 1 %>
+  <% end %>
+  <%= _('World') %>
+</div>
+EOR
+
+      File.open(@rhtml_file_path, "w") do |rhtml_file|
+        rhtml_file.puts(rhtml)
+      end
+
+      @xgettext.run(
+        "--output", @pot_file_path,
+        '--require', 'gettext/tools/parser/erubi',
+        '--parser', 'GetText::ErubiParser',
+        @rhtml_file_path
+      )
+
+      pot_content = File.read(@pot_file_path)
+      expected_content = <<-EOP
+#{header}
+#: ../templates/xgettext.rhtml:2
+msgid "Hello"
+msgstr ""
+
+#: ../templates/xgettext.rhtml:5
+msgid "World"
+msgstr ""
+EOP
+
+      assert_equal(expected_content, pot_content)
+    end
   end
 
   class TestEncoding < self