gettext 2.3.0 → 2.3.1

data/test/run-test.rb

@@ -17,7 +17,7 @@
 # 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/>.
 
-# $VERBOSE = true
+$VERBOSE = true
 
 $KCODE = "utf8" unless "".respond_to?(:encoding)
 

data/test/test_gettext.rb

@@ -52,7 +52,7 @@ class TestGetText < Test::Unit::TestCase
     set_locale("ja")
     assert_equal("JAPANESE", _("LANGUAGE")) # influence of previous line
     assert_equal("japanese", test.test)
- end
+  end
 
   def test_no_msgstr
     bindtextdomain("test1", :path => "locale")
@@ -77,7 +77,7 @@ EOH
   end
 
   def test_gettext
-    test = TestRubyParser.new
+    test = MessageFixture.new
     assert_equal("AAA", test.test_1)
     assert_equal("AAA\n", test.test_2)
     assert_equal("BBB\nCCC", test.test_3)

data/test/test_mofile.rb

@@ -3,6 +3,16 @@
 require 'gettext/runtime/mofile'
 
 class TestMoFile < Test::Unit::TestCase
+  def test_not_exist_msgid
+    mo = load_mo("_.mo")
+    assert_equal(nil, mo["notexistent"])
+  end
+
+  def test_untranslated
+    mo = load_mo("untranslated.mo")
+    assert_equal(nil, mo["untranslated"])
+  end
+
   def test_non_ascii
     mo = load_mo("non_ascii.mo")
     assert_equal("Hello in Japanese", mo["こんにちは"])

data/test/test_parser.rb

@@ -21,6 +21,7 @@
 # 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 "tempfile"
 require 'gettext/tools/parser/ruby'
 require 'gettext/tools/parser/glade'
 require 'gettext/tools/parser/erb'
@@ -51,8 +52,8 @@ class TestGetTextParser < Test::Unit::TestCase
     assert_target "\\taaa", ['fixtures/_.rb:96']
     assert_target "Here document1\\nHere document2\\n", ['fixtures/_.rb:100']
     assert_target "Francois Pinard", ['fixtures/_.rb:119'] do |t|
-      assert_match /proper name/, t.comment
-      assert_match /Pronunciation/, t.comment
+      assert_match(/proper name/, t.comment)
+      assert_match(/Pronunciation/, t.comment)
     end
 
     assert_target("No TRANSLATORS comment", ["fixtures/_.rb:122"]) do |t|
@@ -128,28 +129,53 @@ class TestGetTextParser < Test::Unit::TestCase
     assert_equal(['duplicated', 'fixtures/gladeparser.glade:137', 'fixtures/gladeparser.glade:158'], ary[6])
   end
 
-  def fixtures_erb
-    @ary = GetText::ErbParser.parse('fixtures/erb.rhtml')
+  class TestErbParser < self
+    include GetTextTestUtils
 
-    assert_target 'aaa', ['fixtures/erb.rhtml:8']
-    assert_target 'aaa\n', ['fixtures/erb.rhtml:11']
-    assert_target 'bbb', ['fixtures/erb.rhtml:12']
-    assert_plural_target "ccc1", "ccc2", ['fixtures/erb.rhtml:13']
+    def test_detect_encoding
+      need_encoding
+
+      euc_file = Tempfile.new("euc-jp.rhtml")
+      euc_file.open
+      euc_file.puts("<%#-*- coding: euc-jp -*-%>")
+      euc_file.close
+
+      erb_source = ERB.new(File.read(euc_file.path)).src
+      encoding = GetText::ErbParser.detect_encoding(erb_source)
+
+      assert_equal("EUC-JP", encoding)
+    end
+
+    def test_ascii
+      @ary = GetText::ErbParser.parse('fixtures/erb/ascii.rhtml')
+
+      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']
+    end
+
+    def test_non_ascii
+      fixture_path = "fixtures/erb/non_ascii.rhtml"
+      @ary = GetText::ErbParser.parse(fixture_path)
+
+      assert_target('わたし', ["#{fixture_path}:11"])
+    end
   end
 
   def test_xgettext_parse
     GetText::ErbParser.init(:extnames => ['.rhtml', '.rxml'])
-    @ary = @xgettext.parse(['fixtures/erb.rhtml'])
-    assert_target 'aaa', ['fixtures/erb.rhtml:8']
-    assert_target 'aaa\n', ['fixtures/erb.rhtml:11']
-    assert_target 'bbb', ['fixtures/erb.rhtml:12']
-    assert_plural_target "ccc1", "ccc2", ['fixtures/erb.rhtml:13']
-
-    @ary = @xgettext.parse(['fixtures/erb.rxml'])
-    assert_target 'aaa', ['fixtures/erb.rxml:9']
-    assert_target 'aaa\n', ['fixtures/erb.rxml:12']
-    assert_target 'bbb', ['fixtures/erb.rxml:13']
-    assert_plural_target "ccc1", "ccc2", ['fixtures/erb.rxml:14']
+    @ary = @xgettext.parse(['fixtures/erb/ascii.rhtml'])
+    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']
+
+    @ary = @xgettext.parse(['fixtures/erb/ascii.rxml'])
+    assert_target 'aaa', ['fixtures/erb/ascii.rxml:9']
+    assert_target 'aaa\n', ['fixtures/erb/ascii.rxml:12']
+    assert_target 'bbb', ['fixtures/erb/ascii.rxml:13']
+    assert_plural_target "ccc1", "ccc2", ['fixtures/erb/ascii.rxml:14']
 
     @ary = @xgettext.parse(['fixtures/n_.rb'])
     assert_plural_target "ooo", "ppp", ['fixtures/n_.rb:85', 'fixtures/n_.rb:86']

data/test/test_po_parser.rb

@@ -28,7 +28,20 @@ msgstr ""
 EOP
     messages = parse_po_file(po_file)
 
-    assert_equal("", messages["Hello"])
+    assert_equal(nil, messages["Hello"])
+  end
+
+  def test_empty_msgstr_for_msgid_plural
+    po_file = create_po_file(<<-EOP)
+msgid "He"
+msgid_plural "They"
+msgstr[0] ""
+msgstr[1] ""
+EOP
+    messages = parse_po_file(po_file)
+
+    assert_true(messages.has_key?("He\000They"))
+    assert_equal(nil, messages["He\000They"])
   end
 
   private

data/test/tools/test_msginit.rb

@@ -26,9 +26,14 @@ class TestToolsMsgInit < Test::Unit::TestCase
     stub(@msginit).read_translator_full_name {translator_full_name}
     stub(@msginit).read_translator_mail {translator_mail}
 
+    @year             = "2012"
+    @po_revision_date = "2012-09-11 13:19+0900"
+    @pot_create_date  = "2012-08-24 11:35+0900"
+
+    stub(@msginit).year          {@year}
+    stub(@msginit).revision_date {@po_revision_date}
+
     Locale.current = "ja_JP.UTF-8"
-    @pot_create_date = "2012-08-24 11:35+0900"
-    @po_revision_date = Time.now.strftime("%Y-%m-%d %H:%M%z")
   end
 
   def test_all_options
@@ -43,7 +48,7 @@ class TestToolsMsgInit < Test::Unit::TestCase
                    "--output", po_file_path,
                    "--locale", locale)
 
-      actual_po_header = normalize_po_header(po_file_path)
+      actual_po_header = File.read(po_file_path)
       expected_po_header = po_header(locale, language)
       assert_equal(expected_po_header, actual_po_header)
     end
@@ -59,7 +64,7 @@ class TestToolsMsgInit < Test::Unit::TestCase
 
         @msginit.run("--locale", locale)
 
-        actual_po_header = normalize_po_header(po_file_path)
+        actual_po_header = File.read(po_file_path)
         expected_po_header = po_header(locale, language)
         assert_equal(expected_po_header, actual_po_header)
       end
@@ -76,7 +81,7 @@ class TestToolsMsgInit < Test::Unit::TestCase
 
         @msginit.run("--locale", locale)
 
-        actual_po_header = normalize_po_header(po_file_path)
+        actual_po_header = File.read(po_file_path)
         expected_po_header = po_header(locale, language)
         assert_equal(expected_po_header, actual_po_header)
       end
@@ -94,7 +99,7 @@ class TestToolsMsgInit < Test::Unit::TestCase
 
         @msginit.run("--locale", "#{locale}.#{charset}")
 
-        actual_po_header = normalize_po_header(po_file_path)
+        actual_po_header = File.read(po_file_path)
         expected_po_header = po_header(locale, language)
         assert_equal(expected_po_header, actual_po_header)
       end
@@ -111,7 +116,7 @@ class TestToolsMsgInit < Test::Unit::TestCase
 
       @msginit.run("--input", pot_file_path, "--output", po_file_path)
 
-      actual_po_header = normalize_po_header(po_file_path)
+      actual_po_header = File.read(po_file_path)
       expected_po_header = po_header(locale, language)
       assert_equal(expected_po_header, actual_po_header)
     end
@@ -128,7 +133,7 @@ class TestToolsMsgInit < Test::Unit::TestCase
 
         @msginit.run("--input", pot_file_path)
 
-        actual_po_header = normalize_po_header(po_file_path)
+        actual_po_header = File.read(po_file_path)
         expected_po_header = po_header(locale, language)
         assert_equal(expected_po_header, actual_po_header)
       end
@@ -145,7 +150,7 @@ class TestToolsMsgInit < Test::Unit::TestCase
 
         @msginit.run
 
-        actual_po_header = normalize_po_header(po_file_path)
+        actual_po_header = File.read(po_file_path)
         expected_po_header = po_header(locale, language)
         assert_equal(expected_po_header, actual_po_header)
       end
@@ -165,7 +170,7 @@ class TestToolsMsgInit < Test::Unit::TestCase
 
         @msginit.run
 
-        actual_po_header = normalize_po_header(po_file_path)
+        actual_po_header = File.read(po_file_path)
         expected_po_header = no_translator_po_header(locale, language)
         assert_equal(expected_po_header, actual_po_header)
       end
@@ -184,7 +189,7 @@ class TestToolsMsgInit < Test::Unit::TestCase
 
         @msginit.run
 
-        actual_po_header = normalize_po_header(po_file_path)
+        actual_po_header = File.read(po_file_path)
         expected_po_header = no_translator_po_header(locale, language)
         assert_equal(expected_po_header, actual_po_header)
       end
@@ -203,7 +208,7 @@ class TestToolsMsgInit < Test::Unit::TestCase
 
         @msginit.run
 
-        actual_po_header = normalize_po_header(po_file_path)
+        actual_po_header = File.read(po_file_path)
         expected_po_header = no_translator_po_header(locale, language)
         assert_equal(expected_po_header, actual_po_header)
       end
@@ -215,7 +220,7 @@ class TestToolsMsgInit < Test::Unit::TestCase
       Dir.chdir(dir) do
         pot_file_name = "test.pot"
         options = {:package_name => "test-package"}
-        pot_file = create_pot_file(pot_file_name, options)
+        create_pot_file(pot_file_name, options)
         locale = current_locale
         language = current_language
         po_file_path = "#{locale}.po"
@@ -223,11 +228,29 @@ class TestToolsMsgInit < Test::Unit::TestCase
         @msginit.run("--input", pot_file_name)
 
         expected_po_header = po_header(locale, language, options)
-        actual_po_header = normalize_po_header(po_file_path)
+        actual_po_header = File.read(po_file_path)
 
         assert_equal(expected_po_header, actual_po_header)
       end
     end
+
+    def test_no_plural_forms
+      Dir.mktmpdir do |dir|
+        Dir.chdir(dir) do
+          options = {:have_plural_forms => false}
+          create_pot_file("test.pot", options)
+          locale = current_locale
+          language = current_language
+          po_file_path = "#{locale}.po"
+
+          @msginit.run
+
+          actual_po_header = File.read(po_file_path)
+          expected_po_header = po_header(locale, language)
+          assert_equal(expected_po_header, actual_po_header)
+        end
+      end
+    end
   end
 
   private
@@ -256,7 +279,8 @@ class TestToolsMsgInit < Test::Unit::TestCase
 
   def pot_header(options)
     package_name = options[:package_name] || default_package_name
-    <<EOF
+    have_plural_forms = options[:have_plural_forms] || true
+    header = <<EOF
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
@@ -274,21 +298,11 @@ msgstr ""
 "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"
 EOF
-  end
-
-  def normalize_po_header(po_file_path)
-    po_file = ""
-    File.open(po_file_path) do |file|
-      po_file = file.read
+    if have_plural_forms
+      header << "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\\n"
     end
-
-    po_file = po_file.gsub(/#{Regexp.escape(@pot_create_date)}/,
-                           "XXXX-XX-XX XX:XX+XXXX")
-    po_file = po_file.gsub(/#{Regexp.escape(@po_revision_date)}/,
-                           "YYYY-YY-YY YY:YY+YYYY")
-    po_file.gsub(/#{Time.now.year}/, "YEAR")
+    header
   end
 
   def po_header(locale, language, options=nil)
@@ -301,15 +315,15 @@ EOF
 
     <<EOF
 # #{language_name} translations for #{package_name} package.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# Copyright (C) #{@year} THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# #{full_name} <#{mail}>, YEAR.
+# #{full_name} <#{mail}>, #{@year}.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: #{package_name} VERSION\\n"
-"POT-Creation-Date: XXXX-XX-XX XX:XX+XXXX\\n"
-"PO-Revision-Date: YYYY-YY-YY YY:YY+YYYY\\n"
+"POT-Creation-Date: #{@pot_create_date}\\n"
+"PO-Revision-Date: #{@po_revision_date}\\n"
 "Last-Translator: #{full_name} <#{mail}>\\n"
 "Language: #{locale}\\n"
 "Language-Team: #{language_name}\\n"
@@ -317,6 +331,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\\n"
 "Content-Transfer-Encoding: 8bit\\n"
 "Plural-Forms: #{plural_forms}\\n"
+
 EOF
   end
 
@@ -330,15 +345,15 @@ EOF
 
     <<EOF
 # #{language_name} translations for PACKAGE package.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# Copyright (C) #{@year} THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# FIRST AUTHOR <EMAIL@ADDRESS>, #{@year}.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\\n"
-"POT-Creation-Date: XXXX-XX-XX XX:XX+XXXX\\n"
-"PO-Revision-Date: YYYY-YY-YY YY:YY+YYYY\\n"
+"POT-Creation-Date: #{@pot_create_date}\\n"
+"PO-Revision-Date: #{@po_revision_date}\\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\\n"
 "Language: #{locale}\\n"
 "Language-Team: #{language_name}\\n"
@@ -346,6 +361,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\\n"
 "Content-Transfer-Encoding: 8bit\\n"
 "Plural-Forms: #{plural_forms}\\n"
+
 EOF
   end
 end

data/test/tools/test_msgmerge.rb

@@ -37,6 +37,7 @@ class TestToolsMsgMerge < Test::Unit::TestCase
 msgid \"\"
 msgstr \"\"
 \"#{header_entry}\\n\"
+
 #{comment}
 msgid \"#{msgid}\"
 msgstr \"#{msgstr}\"
@@ -66,6 +67,7 @@ EOC
 msgid \"\"
 msgstr \"\"
 \"#{header_entry}\\n\"
+
 #{obsolete_comment}
 EOP
 
@@ -77,18 +79,53 @@ EOP
       assert_equal(expected_po, po.generate_po)
     end
 
-    def test_msgctxt
-      msg_id = "Context\004Translation"
-      @po_data[msg_id] = "Translated"
-      @po_data.set_comment(msg_id, "#no comment")
+    def test_generate_po_msgid_plural_and_empty_msgstr
+      msgid = "Singular message\000Plural message"
+
+      @po_data[""] = "Plural-Forms: nplurals=2; plural=n != 1;\\n"
+      @po_data[msgid] = ""
+      @po_data.set_comment(msgid, "# plural message")
+      actual_po = @po_data.generate_po_entry(msgid)
+      expected_po = <<'EOE'
+# plural message
+msgid "Singular message"
+msgid_plural "Plural message"
+msgstr[0] ""
+msgstr[1] ""
+EOE
+      assert_equal(expected_po, actual_po)
+    end
+
+    class TestGeneratePoEntry < self
+      def test_msgid_plural
+        msgid = "Singular message\000Plural message"
+
+        @po_data[msgid] = "Singular translation\000Plural translation"
+        @po_data.set_comment(msgid, "#plural message")
+        actual_po = @po_data.generate_po_entry(msgid)
+        expected_po = <<'EOE'
+#plural message
+msgid "Singular message"
+msgid_plural "Plural message"
+msgstr[0] "Singular translation"
+msgstr[1] "Plural translation"
+EOE
+        assert_equal(expected_po, actual_po)
+      end
+
+      def test_msgctxt
+        msg_id = "Context\004Translation"
+        @po_data[msg_id] = "Translated"
+        @po_data.set_comment(msg_id, "#no comment")
 
-      entry = @po_data.generate_po_entry(msg_id)
-      assert_equal(<<-'EOE', entry)
+        entry = @po_data.generate_po_entry(msg_id)
+        assert_equal(<<-'EOE', entry)
 #no comment
 msgctxt "Context"
 msgid "Translation"
 msgstr "Translated"
 EOE
+      end
     end
   end
 
@@ -177,6 +214,7 @@ EOH
     def po_content
       <<-EOP
 #{po_header(@po_formatted_time, @po_formatted_time)}
+
 #: hello.rb:1
 msgid "World"
 msgstr "Translated World"