gettext 2.1.0 → 2.2.0

data/test/test_parser.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'testlib/helper.rb'
 require 'gettext/tools/parser/ruby'
 require 'gettext/tools/parser/glade'
@@ -7,77 +9,77 @@ require 'gettext/tools/rgettext'
 
 class TestGetTextParser < Test::Unit::TestCase
   def test_ruby
-    @ary = GetText::RGetText.parse('testlib/gettext.rb')
-
-    assert_target 'aaa', ['testlib/gettext.rb:8']
-    assert_target 'aaa\n', ['testlib/gettext.rb:12']
-    assert_target 'bbb\nccc', ['testlib/gettext.rb:16']
-    assert_target 'bbb\nccc\nddd\n', ['testlib/gettext.rb:20']
-    assert_target 'eee', ['testlib/gettext.rb:27', 'testlib/gettext.rb:31']
-    assert_target 'fff', ['testlib/gettext.rb:31']
-    assert_target 'ggghhhiii', ['testlib/gettext.rb:35']
-    assert_target 'a"b"c"', ['testlib/gettext.rb:41']
-    assert_target 'd"e"f"', ['testlib/gettext.rb:45']
-    assert_target 'jjj', ['testlib/gettext.rb:49']
-    assert_target 'kkk', ['testlib/gettext.rb:50']
-    assert_target 'lllmmm', ['testlib/gettext.rb:54']
-    assert_target 'nnn\nooo', ['testlib/gettext.rb:62']
-    assert_target "\#", ['testlib/gettext.rb:66', 'testlib/gettext.rb:70']
-    assert_target "\\taaa", ['testlib/gettext.rb:74']
-    assert_target "Here document1\\nHere document2\\n", ['testlib/gettext.rb:78']
-    assert_target "Francois Pinard", ['testlib/gettext.rb:97'] do |t|
+    @ary = GetText::RGetText.parse(['testlib/gettext.rb'])
+
+    assert_target 'aaa', ['testlib/gettext.rb:10']
+    assert_target 'aaa\n', ['testlib/gettext.rb:14']
+    assert_target 'bbb\nccc', ['testlib/gettext.rb:18']
+    assert_target 'bbb\nccc\nddd\n', ['testlib/gettext.rb:22']
+    assert_target 'eee', ['testlib/gettext.rb:29', 'testlib/gettext.rb:33']
+    assert_target 'fff', ['testlib/gettext.rb:33']
+    assert_target 'ggghhhiii', ['testlib/gettext.rb:37']
+    assert_target 'a"b"c"', ['testlib/gettext.rb:43']
+    assert_target 'd"e"f"', ['testlib/gettext.rb:47']
+    assert_target 'jjj', ['testlib/gettext.rb:51']
+    assert_target 'kkk', ['testlib/gettext.rb:52']
+    assert_target 'lllmmm', ['testlib/gettext.rb:56']
+    assert_target 'nnn\nooo', ['testlib/gettext.rb:64']
+    assert_target "\#", ['testlib/gettext.rb:68', 'testlib/gettext.rb:72']
+    assert_target "\\taaa", ['testlib/gettext.rb:76']
+    assert_target "Here document1\\nHere document2\\n", ['testlib/gettext.rb:80']
+    assert_target "Francois Pinard", ['testlib/gettext.rb:99'] do |t|
       assert_match /proper name/, t.comment
       assert_match /Pronunciation/, t.comment
     end
-    assert_target "self explaining", ['testlib/gettext.rb:102'] do |t|
+    assert_target "self explaining", ['testlib/gettext.rb:104'] do |t|
       assert_nil t.comment
     end
-    # TODO: assert_target "in_quote", ['testlib/gettext.rb:96']
+    # TODO: assert_target "in_quote", ['testlib/gettext.rb:98']
   end
 
   def test_ruby_N
-    @ary = GetText::RGetText.parse('testlib/N_.rb')
-
-    assert_target 'aaa', ['testlib/N_.rb:8']
-    assert_target 'aaa\n', ['testlib/N_.rb:12']
-    assert_target 'bbb\nccc', ['testlib/N_.rb:16']
-    assert_target 'bbb\nccc\nddd\n', ['testlib/N_.rb:20']
-    assert_target 'eee', ['testlib/N_.rb:27', 'testlib/N_.rb:31']
-    assert_target 'fff', ['testlib/N_.rb:31']
-    assert_target 'ggghhhiii', ['testlib/N_.rb:35']
-    assert_target 'a"b"c"', ['testlib/N_.rb:41']
-    assert_target 'd"e"f"', ['testlib/N_.rb:45']
-    assert_target 'jjj', ['testlib/N_.rb:49']
-    assert_target 'kkk', ['testlib/N_.rb:50']
-    assert_target 'lllmmm', ['testlib/N_.rb:54']
-    assert_target 'nnn\nooo', ['testlib/N_.rb:62']
+    @ary = GetText::RGetText.parse(['testlib/N_.rb'])
+
+    assert_target 'aaa', ['testlib/N_.rb:10']
+    assert_target 'aaa\n', ['testlib/N_.rb:14']
+    assert_target 'bbb\nccc', ['testlib/N_.rb:18']
+    assert_target 'bbb\nccc\nddd\n', ['testlib/N_.rb:22']
+    assert_target 'eee', ['testlib/N_.rb:29', 'testlib/N_.rb:33']
+    assert_target 'fff', ['testlib/N_.rb:33']
+    assert_target 'ggghhhiii', ['testlib/N_.rb:37']
+    assert_target 'a"b"c"', ['testlib/N_.rb:43']
+    assert_target 'd"e"f"', ['testlib/N_.rb:47']
+    assert_target 'jjj', ['testlib/N_.rb:51']
+    assert_target 'kkk', ['testlib/N_.rb:52']
+    assert_target 'lllmmm', ['testlib/N_.rb:56']
+    assert_target 'nnn\nooo', ['testlib/N_.rb:64']
   end
 
   def test_ruby_n
-    @ary = GetText::RGetText.parse('testlib/ngettext.rb')
-    assert_plural_target "aaa", "aaa2", ['testlib/ngettext.rb:8']
-    assert_plural_target "bbb\\n", "ccc2\\nccc2", ['testlib/ngettext.rb:12']
-    assert_plural_target "ddd\\nddd", "ddd2\\nddd2", ['testlib/ngettext.rb:16']
-    assert_plural_target "eee\\neee\\n", "eee2\\neee2\\n", ['testlib/ngettext.rb:21']
-    assert_plural_target "ddd\\neee\\n", "ddd\\neee2", ['testlib/ngettext.rb:27']
-    assert_plural_target "fff", "fff2", ['testlib/ngettext.rb:34', 'testlib/ngettext.rb:38']
-    assert_plural_target "ggg", "ggg2", ['testlib/ngettext.rb:38']
-    assert_plural_target "ggghhhiii", "jjjkkklll", ['testlib/ngettext.rb:42']
-    assert_plural_target "a\"b\"c\"", "a\"b\"c\"2", ['testlib/ngettext.rb:51']
-    assert_plural_target "mmmmmm", "mmm2mmm2", ['testlib/ngettext.rb:59']
-    assert_plural_target "nnn", "nnn2", ['testlib/ngettext.rb:60']
-    assert_plural_target "comment", "comments", ['testlib/ngettext.rb:76'] do |t|
-      assert_equal "please provide translations for all \n the plural forms!", t.comment
+    @ary = GetText::RGetText.parse(['testlib/ngettext.rb'])
+    assert_plural_target "aaa", "aaa2", ['testlib/ngettext.rb:10']
+    assert_plural_target "bbb\\n", "ccc2\\nccc2", ['testlib/ngettext.rb:14']
+    assert_plural_target "ddd\\nddd", "ddd2\\nddd2", ['testlib/ngettext.rb:18']
+    assert_plural_target "eee\\neee\\n", "eee2\\neee2\\n", ['testlib/ngettext.rb:23']
+    assert_plural_target "ddd\\neee\\n", "ddd\\neee2", ['testlib/ngettext.rb:29']
+    assert_plural_target "fff", "fff2", ['testlib/ngettext.rb:36', 'testlib/ngettext.rb:40']
+    assert_plural_target "ggg", "ggg2", ['testlib/ngettext.rb:40']
+    assert_plural_target "ggghhhiii", "jjjkkklll", ['testlib/ngettext.rb:44']
+    assert_plural_target "a\"b\"c\"", "a\"b\"c\"2", ['testlib/ngettext.rb:53']
+    assert_plural_target "mmmmmm", "mmm2mmm2", ['testlib/ngettext.rb:61']
+    assert_plural_target "nnn", "nnn2", ['testlib/ngettext.rb:62']
+    assert_plural_target "comment", "comments", ['testlib/ngettext.rb:78'] do |t|
+      assert_equal "please provide translations for all\n the plural forms!", t.comment
     end
   end
-  
+
   def test_ruby_p
-    @ary = GetText::RGetText.parse('testlib/pgettext.rb')
-    assert_target_in_context "AAA", "BBB", ["testlib/pgettext.rb:8", "testlib/pgettext.rb:12"]
-    assert_target_in_context "AAA|BBB", "CCC", ["testlib/pgettext.rb:16"]
-    assert_target_in_context "AAA", "CCC", ["testlib/pgettext.rb:20"]
-    assert_target_in_context "CCC", "BBB", ["testlib/pgettext.rb:24"]
-    assert_target_in_context "program", "name", ['testlib/pgettext.rb:34'] do |t|
+    @ary = GetText::RGetText.parse(['testlib/pgettext.rb'])
+    assert_target_in_context "AAA", "BBB", ["testlib/pgettext.rb:10", "testlib/pgettext.rb:14"]
+    assert_target_in_context "AAA|BBB", "CCC", ["testlib/pgettext.rb:18"]
+    assert_target_in_context "AAA", "CCC", ["testlib/pgettext.rb:22"]
+    assert_target_in_context "CCC", "BBB", ["testlib/pgettext.rb:26"]
+    assert_target_in_context "program", "name", ['testlib/pgettext.rb:36'] do |t|
       assert_equal "please translate 'name' in the context of 'program'.\n Hint: the translation should NOT contain the translation of 'program'.", t.comment
     end
   end
@@ -119,8 +121,8 @@ class TestGetTextParser < Test::Unit::TestCase
     assert_plural_target "ccc1", "ccc2", ['testlib/erb.rxml:14']
 
     @ary = GetText::RGetText.parse(['testlib/ngettext.rb'])
-    assert_plural_target "ooo", "ppp", ['testlib/ngettext.rb:64', 'testlib/ngettext.rb:65']
-    assert_plural_target "qqq", "rrr", ['testlib/ngettext.rb:69', 'testlib/ngettext.rb:70']
+    assert_plural_target "ooo", "ppp", ['testlib/ngettext.rb:66', 'testlib/ngettext.rb:67']
+    assert_plural_target "qqq", "rrr", ['testlib/ngettext.rb:71', 'testlib/ngettext.rb:72']
   end
 
   private

data/test/test_po_generation.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'testlib/helper.rb'
 require 'gettext'
 require 'gettext/tools/rgettext.rb'
@@ -6,7 +8,7 @@ require 'stringio'
 class TestPoGeneration < Test::Unit::TestCase
   def test_extracted_comments
     GetText::RGetText.run(
-      File.join(File.dirname(__FILE__), 'testlib/gettext.rb'), 
+      File.join(File.dirname(__FILE__), 'testlib/gettext.rb'),
       out = StringIO.new)
     res = out.string
 

data/test/test_pomessage.rb

@@ -1,8 +1,10 @@
+# encoding: utf-8
+
 require 'testlib/helper.rb'
 require 'gettext/tools/parser/ruby'
 
-# Most functionality of PoMessage is thoroughly tested together 
-# with the parser and po file generator. Here only tests for some special 
+# Most functionality of PoMessage is thoroughly tested together
+# with the parser and po file generator. Here only tests for some special
 # functionality.
 class TestPoMessage < Test::Unit::TestCase
 

data/test/test_string.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'testlib/helper.rb'
 
 class TestGetTextString < Test::Unit::TestCase

data/test/test_textdomain_bind.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'testlib/helper.rb'
 
 class Foo

data/test/test_textdomain_multi.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'testlib/helper.rb'
 require 'testlib/multi_textdomain.rb'
 

data/test/test_textdomain_toplevel.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'testlib/helper.rb'
 include GetText
 

data/test/test_thread.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'testlib/helper.rb'
 require 'thread'
 
@@ -19,7 +21,7 @@ class TestThread < Test::Unit::TestCase
       }
       (1..10).each do |v|
         @mutex.synchronize{
-          assert_equal Thread.current["language"], _("language") 
+          assert_equal Thread.current["language"], _("language")
         }
         print "."
         $stdout.flush
@@ -34,7 +36,7 @@ class TestThread < Test::Unit::TestCase
     th3 = invoke_thread("en", "language", 0.1)
     th4 = invoke_thread("zh_CN", "language", 0.2) # No translation.
     th1.join
-    th2.join   
+    th2.join
     th3.join
     th4.join
   end

data/test/testlib/N_.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'gettext'
 include GetText
 
@@ -46,7 +48,7 @@ ddd
   end
 
   def testN_10
-    N_("jjj") + 
+    N_("jjj") +
     N_("kkk")
   end
 
@@ -59,8 +61,8 @@ ddd
   end
 
   def testN_13
-    N_("nnn\n" + 
+    N_("nnn\n" +
       "ooo")
   end
 end
-    
+

data/test/testlib/gettext.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'gettext'
 include GetText
 
@@ -46,7 +48,7 @@ ddd
   end
 
   def test_10
-    _("jjj") + 
+    _("jjj") +
     _("kkk")
   end
 
@@ -59,7 +61,7 @@ ddd
   end
 
   def test_13
-    _("nnn\n" + 
+    _("nnn\n" +
       "ooo")
   end
   def test_14

data/test/testlib/helper.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 $LOAD_PATH.unshift File.expand_path("../../lib", File.dirname(__FILE__))
 require 'test/unit'
 

data/test/testlib/multi_textdomain.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 class C11
   include GetText
   def initialize

data/test/testlib/ngettext.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'gettext'
 include GetText
 
@@ -13,13 +15,13 @@ class TestRubyParser_n
   end
 
   def test_3_1
-    n_("ddd\nddd", 
-	"ddd2\nddd2", 
-	1)
+    n_("ddd\nddd",
+  "ddd2\nddd2",
+  1)
   end
   def test_3_2
     n_("eee\neee\n" ,
-       "eee2\neee2\n" , 
+       "eee2\neee2\n" ,
        1)
   end
 
@@ -56,7 +58,7 @@ eee2", 1)
   end
 
   def test_9
-    n_("mmm" + "mmm","mmm2" + "mmm2",1) + 
+    n_("mmm" + "mmm","mmm2" + "mmm2",1) +
     n_("nnn" ,"nnn2" ,1)
   end
 
@@ -66,14 +68,14 @@ eee2", 1)
   end
 
   def test_11
-    n_("qqq", "rrr", 1) 
+    n_("qqq", "rrr", 1)
     n_("qqq", "sss", 1)  # This is merged to "qqq" with plural form "rrr".
   end
 
   def extracted_comments
-    # TRANSLATORS:please provide translations for all 
+    # TRANSLATORS:please provide translations for all
     # the plural forms!
     n_('comment', 'comments', 2)
   end
 end
-    
+

data/test/testlib/npgettext.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'gettext'
 
 class TestNPGetText
@@ -5,27 +7,27 @@ class TestNPGetText
   bindtextdomain("npgettext", :path => "locale")
 
   def test_1
-    [np_("Magazine", "a book", "%{num} books", 1), 
+    [np_("Magazine", "a book", "%{num} books", 1),
      np_("Magazine", "a book", "%{num} books", 2)]
   end
-  
+
   def test_2
-    [npgettext("Magazine", "a book", "%{num} books", 1), 
+    [npgettext("Magazine", "a book", "%{num} books", 1),
      npgettext("Magazine", "a book", "%{num} books", 2)]
   end
-  
+
   def test_3
-    [np_("Hardcover", "a book", "%{num} books", 1), 
+    [np_("Hardcover", "a book", "%{num} books", 1),
      np_("Hardcover", "a book", "%{num} books", 2)]
   end
 
   def test_4
-    [np_("Magaine", "I have a magazine", "I have %{num} magazines", 1), 
+    [np_("Magaine", "I have a magazine", "I have %{num} magazines", 1),
      np_("Magaine", "I have a magazine", "I have %{num} magazines", 2)]
   end
 
   def test_5
-    [np_("Hardcover", "a picture", "%{num} pictures", 1), 
+    [np_("Hardcover", "a picture", "%{num} pictures", 1),
      np_("Hardcover", "a picture", "%{num} pictures", 2)]  #not found.
   end
 end

data/test/testlib/nsgettext.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'gettext'
 
 class TestNSGetText
@@ -7,11 +9,11 @@ class TestNSGetText
   def test_1
     [ns_("AAA|BBB", "CCC", 1), ns_("AAA|BBB", "CCC", 2)]
   end
-  
+
   def test_2
     [nsgettext("AAA|BBB", "CCC", 1), nsgettext("AAA|BBB", "CCC", 2)]
   end
-  
+
   def test_3
     [ns_("AAA", "BBB", 1), ns_("AAA", "BBB", 2)] #not found
   end

data/test/testlib/pgettext.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'gettext'
 
 class TestPGetText
@@ -7,7 +9,7 @@ class TestPGetText
   def test_1
     p_("AAA", "BBB")
   end
-  
+
   def test_2
     pgettext("AAA", "BBB")
   end
@@ -15,7 +17,7 @@ class TestPGetText
   def test_3
     pgettext("AAA|BBB", "CCC")
   end
-  
+
   def test_4
     p_("AAA", "CCC") #not found
   end

data/test/testlib/sgettext.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'gettext'
 
 class TestSGetText
@@ -7,11 +9,11 @@ class TestSGetText
   def test_1
     s_("AAA|BBB")
   end
-  
+
   def test_2
     sgettext("AAA|BBB")
   end
-  
+
   def test_3
     s_("AAA") #not found
   end