gettext 1.1.1 → 1.2.0

data/src/poparser.ry

@@ -6,7 +6,7 @@
 #  You may redistribute it and/or modify it under the same
 #  license terms as Ruby.
 
-class GetText::PoParser
+class GetText::PoParser 
 
   token COMMENT MSGID MSGID_PLURAL MSGSTR STRING PLURAL_NUM
 
@@ -21,7 +21,7 @@ class GetText::PoParser
   message
   : MSGID string_list MSGSTR string_list
   {
-    if @fuzzy
+    if @fuzzy and $ignore_fuzzy 
       if val[1] != ""
         $stderr.print _("Warning: fuzzy message was ignored.\n")
         $stderr.print "         msgid '#{val[1]}'\n"
@@ -36,7 +36,7 @@ class GetText::PoParser
   }
   | MSGID string_list MSGID_PLURAL string_list msgstr_plural
   {
-    if @fuzzy
+    if @fuzzy and $ignore_fuzzy
       if val[1] != ""
         $stderr.print _("Warning: fuzzy message was ignored.\n")
         $stderr.print "msgid = '#{val[1]}\n"
@@ -98,10 +98,11 @@ end
     ret
   end
   
-  def parse(str, data)
+  def parse(str, data, ignore_fuzzy = true)
     @comments = []
     @data = data
     @fuzzy = false
+    $ignore_fuzzy = ignore_fuzzy
     str.strip!
     @q = []
     until str.empty? do
@@ -158,7 +159,7 @@ end
 
   def on_message(msgid, msgstr)
     @data[msgid] = msgstr
-    
+ 
     @data.set_comment(msgid, @comments.join("\n"))
     @comments.clear
   end

data/test/gettext_runner.rb

@@ -2,6 +2,7 @@ require 'test/unit/testsuite'
 require 'gettext_test'
 require 'gettext_test_parser'
 require 'gettext_test_string'
+require 'gettext_test_locale'
 
 class GetTextTest
    def suite
@@ -9,11 +10,12 @@ class GetTextTest
      s << TestGetText.suite
      s << TestGetTextParser.suite
      s << TestGetTextString.suite
+     s << TestLocale.suite
      s
    end
 end
 
-if RUBY_VERSION >= '1.8.4'
+if RUBY_VERSION >= '1.8.3'
   Test::Unit::AutoRunner.run
 else
   Test::Unit::AutoRunner.run(GetTextTest)

data/test/gettext_test.rb

@@ -1,7 +1,6 @@
 require 'test/unit'
 
 require 'gettext.rb'
-
 require 'testlib1.rb'
 require 'testlib2.rb'
 require 'testlib3.rb'
@@ -16,14 +15,12 @@ class TestGetText < Test::Unit::TestCase
     GetText.locale = nil
     return if /linux/ !~ RUBY_PLATFORM
     GetText.bindtextdomain("libc")
-    GetText.locale = "ja_JP.eucJP"
-    GetText.charset = "euc-jp"
     assert_equal("��λ���ޤ���", GetText._("Terminated"))
 
     GetText.locale = nil
     GetText.bindtextdomain("test1", "locale")
-    assert_equal("japanese", GetText._("language"))
 
+    assert_equal("japanese", GetText._("language"))
     GetText.bindtextdomain("libc", "/usr/share/locale")
     assert_equal("��λ���ޤ���", GetText._("Terminated"))
 
@@ -33,10 +30,13 @@ class TestGetText < Test::Unit::TestCase
     GetText.bindtextdomain("libc", "/usr/share/locale/")
     assert_equal("��λ���ޤ���", GetText._("Terminated"))
 
+    GetText.locale = nil
+    GetText.charset = nil 
     GetText.bindtextdomain("libc", "/usr/share/locale", "de")
     assert_equal("Beendet", GetText._("Terminated"))
 
     GetText.bindtextdomain("test1", "locale")
+
     GetText.locale = "fr"
     assert_equal("french", GetText._("language"))
 
@@ -178,7 +178,10 @@ DDD
   def test_plural_format_invalid
     setlocale(nil)
     bindtextdomain("plural_error", "locale", "ja")
+    #If it defines msgstr[0] only, msgstr[0] is used everytime.
     assert_equal("a", n_("one", "two", 0)) 
+    assert_equal("a", n_("one", "two", 1)) 
+    assert_equal("a", n_("one", "two", 2)) 
     # Use default(plural = 0)
     setlocale("fr")
     assert_equal("fr_one", n_("one", "two", 0))   
@@ -188,40 +191,53 @@ DDD
     assert_equal("da_one", n_("one", "two", 0))   
     assert_equal("da_one", n_("one", "two", 1))
     assert_equal("da_one", n_("one", "two", 2))
+    setlocale("la")
+    assert_equal("la_one", n_("one", "two", 0))   
+    assert_equal("la_one", n_("one", "two", 1))
+    assert_equal("la_one", n_("one", "two", 2))
   end
 
-  def test_setlocale
+  def test_plural_array
     GetText.locale = nil
-    bindtextdomain("test1", "locale")
-    assert_equal("japanese", _("language"))
-    setlocale("en")
-    assert_equal("language", _("language"))
-    setlocale("fr")
-    assert_equal("french", _("language"))
+    bindtextdomain("plural", "locale", "da")
+    assert_equal("da_plural", n_(["one", "two"], 0))
+    assert_equal("da_one", n_(["one", "two"], 1))
+    assert_equal("da_plural", n_(["one", "two"], 2))
   end
 
-  def test_locale
+  def test_Nn_
     GetText.locale = nil
-    loc = Locale.set(Locale::CTYPE, "ja_JP.eucJP")
-    assert_equal("ja_JP.eucJP", loc)
-    assert_equal("ja_JP.eucJP", Locale.get)
-    assert_equal("EUC-JP", Locale.codeset)
-
-    loc = Locale.set(Locale::CTYPE, "ja_JP.UTF-8")
-    assert_equal("ja_JP.UTF-8", loc)
-    assert_equal("ja_JP.UTF-8", Locale.get)
-    assert_equal("UTF-8", Locale.codeset)
-
-    Locale.setlocale(Locale::CTYPE, "ja_JP.eucJP")
+    bindtextdomain("plural", "locale", "da")
+    assert_equal(["one", "two"], Nn_("one", "two"))
   end
 
   def test_textdomain
     GetText.locale = nil
-    Locale.setlocale(Locale::CTYPE, "ja_JP.eucJP")
+    Locale.set("ja_JP.eucJP")
     testlib = TestLib4.new
     assert_equal("japanese", testlib.test)
     assert_raises(GetText::NoboundTextDomainError) {
       GetText.textdomain("nodomainisdefined")
     }
+    default_locale_dirs = [
+      "#{Config::CONFIG['datadir']}/locale/%{locale}/LC_MESSAGES/%{name}.mo",
+      "#{Config::CONFIG['prefix']}/share/locale/%{locale}/LC_MESSAGES/%{name}.mo",
+      "#{Config::CONFIG['prefix']}/local/share/locale/%{locale}/LC_MESSAGES/%{name}.mo"
+    ].uniq
+    assert_equal(default_locale_dirs, GetText::TextDomain::DEFAULT_LOCALE_PATHS)
+    new_path = "/foo/%{locale}/%{name}.mo"
+    GetText::TextDomain.add_default_locale_path(new_path)
+    assert_equal(default_locale_dirs << new_path, GetText::TextDomain::DEFAULT_LOCALE_PATHS)
   end
+
+  def test_setlocale
+    GetText.locale = nil
+    bindtextdomain("test1", "locale")
+    assert_equal("japanese", _("language"))
+    setlocale("en")
+    assert_equal("language", _("language"))
+    setlocale("fr")
+    assert_equal("french", _("language"))
+  end
+
 end

data/test/gettext_test_cgi.rb

@@ -1,12 +1,66 @@
 require 'test/unit'
 require 'gettext/cgi'
+require 'stringio'
 
 class TestGetTextCGI < Test::Unit::TestCase
-  def test_locale_normalize
-    assert_equal("ja_JP", Locale.normalize("ja_JP"))
-    assert_equal("ja", Locale.normalize("ja,en-us;q=0.7,en;q=0.3"))
-    assert_equal("en_US", Locale.normalize("en-us,ja;q=0.7,en;q=0.3"))
-    assert_equal("ja_JP", Locale.normalize("ja-jp"))
-    assert_equal("ja", Locale.normalize("ja"))
+  def setup_cgi(str)
+    $stdin = StringIO.new(str)
+    cgi = CGI.new
+    Locale.cgi = cgi
   end
+
+  def test_system
+    #query string
+    setup_cgi("lang=ja_JP")
+    assert_equal("ja_JP", Locale.system.to_str)
+    setup_cgi("lang=ja-jp")
+    assert_equal("ja_JP", Locale.system.to_str)
+    assert_equal("ja-JP", Locale.system.to_iso3066)
+    setup_cgi("lang=ja-jp")
+    assert_equal("ja_JP", Locale.system.to_str)
+    assert_equal("ja-JP", Locale.system.to_iso3066)
+    setup_cgi("")
+    ENV["HTTP_ACCEPT_LANGUAGE"] = ""
+    ENV["HTTP_ACCEPT_CHARSET"] = ""
+    assert_equal("en", Locale.system.to_str)
+    assert_equal("en", Locale.system.to_iso3066)
+
+    #cockie
+    setup_cgi("Set-Cookie: lang=en-us")
+    assert_equal("en_US", Locale.system.to_str)
+
+    #accept language
+    setup_cgi("")
+    ENV["HTTP_ACCEPT_LANGUAGE"] = "ja,en-us;q=0.7,en;q=0.3"
+    assert_equal("ja", Locale.system.to_str)
+    assert_equal("ja", Locale.system.to_iso3066)
+    ENV["HTTP_ACCEPT_LANGUAGE"] = "en-us,ja;q=0.7,en;q=0.3"
+    assert_equal("en_US", Locale.system.to_str)
+    assert_equal("en-US", Locale.system.to_iso3066)
+    ENV["HTTP_ACCEPT_LANGUAGE"] = "en"
+    assert_equal("en", Locale.system.to_str)
+    assert_equal("en", Locale.system.to_iso3066)
+
+    #accept charset
+    ENV["HTTP_ACCEPT_CHARSET"] = "Shift_JIS"
+    assert_equal("Shift_JIS", Locale.system.charset)
+    ENV["HTTP_ACCEPT_CHARSET"] = "EUC-JP,*,utf-8"
+    assert_equal("EUC-JP", Locale.system.charset)
+    ENV["HTTP_ACCEPT_CHARSET"] = "*"
+    assert_equal("UTF-8", Locale.system.charset)
+    ENV["HTTP_ACCEPT_CHARSET"] = ""
+    assert_equal("UTF-8", Locale.system.charset)
+  end
+
+  def test_default
+    Locale.set_default(nil)
+    Locale.set_default(Locale::Object.new("ja_JP", nil, "EUC-JP"))
+    setup_cgi("")
+    ENV["HTTP_ACCEPT_LANGUAGE"] = ""
+    ENV["HTTP_ACCEPT_CHARSET"] = ""
+    assert_equal("ja_JP", Locale.default.to_str)
+    assert_equal("EUC-JP", Locale.default.charset)
+    Locale.set_default(nil)
+  end
+
 end

data/test/gettext_test_locale.rb

@@ -0,0 +1,136 @@
+require 'test/unit'
+require 'gettext/locale'
+
+class TestLocale < Test::Unit::TestCase
+  def test_locale_object
+    obj = Locale::Object.new("ja", "JP", "eucJP")
+    assert_equal("ja", obj.language)
+    assert_equal("JP", obj.country)
+    assert_equal("eucJP", obj.charset)
+    assert_equal("ja_JP", obj.to_posix)
+    assert_equal("ja_JP", obj.to_str)
+    assert_equal("ja-JP", obj.to_iso3066)
+    assert_equal(["ja", "JP", "eucJP", nil, nil, nil], obj.to_a)
+
+    obj = Locale::Object.new("ja", "JP")
+    assert_equal("ja", obj.language)
+    assert_equal("JP", obj.country)
+    assert_equal(nil, obj.charset)
+    assert_equal(nil, obj.script)
+    assert_equal(nil, obj.sort_order)
+    assert_equal(nil, obj.modifier)
+    assert_equal(["ja", "JP", nil, nil, nil, nil], obj.to_a)
+
+    obj = Locale::Object.new("ja")
+    assert_equal("ja", obj.language)
+    assert_equal(nil, obj.country)
+    assert_equal(nil, obj.charset)
+    assert_equal(nil, obj.script)
+    assert_equal(nil, obj.sort_order)
+    assert_equal(nil, obj.modifier)
+    assert_equal(["ja", nil, nil, nil, nil, nil], obj.to_a)
+
+    obj = Locale::Object.new("ja_JP.eucJP", nil, "UTF-8")
+    assert_equal("ja", obj.language)
+    assert_equal("JP", obj.country)
+    assert_equal("UTF-8", obj.charset)
+    assert_equal(nil, obj.script)
+    assert_equal(nil, obj.sort_order)
+    assert_equal(nil, obj.modifier)
+    assert_equal(["ja", "JP", "UTF-8", nil, nil, nil], obj.to_a)
+
+    obj = Locale::Object.new("en-US.iso8859-1", "CA")
+    assert_equal("en", obj.language)
+    assert_equal("CA", obj.country)
+    assert_equal("iso8859-1", obj.charset)
+    assert_equal(nil, obj.script)
+    assert_equal(nil, obj.sort_order)
+    assert_equal(nil, obj.modifier)
+    assert_equal(["en", "CA", "iso8859-1", nil, nil, nil], obj.to_a)
+
+    obj = Locale::Object.new("uz@Latn")
+    assert_equal("uz", obj.language)
+    assert_equal(nil, obj.country)
+    assert_equal(nil, obj.charset)
+    assert_equal(nil, obj.script)
+    assert_equal(nil, obj.sort_order)
+    assert_equal("Latn", obj.modifier)
+    assert_equal(["uz", nil, nil, nil, nil, "Latn"], obj.to_a)
+
+    obj = Locale::Object.new("zh_CN.GB2312@test")
+    assert_equal("zh", obj.language)
+    assert_equal("CN", obj.country)
+    assert_equal("GB2312", obj.charset)
+    assert_equal(nil, obj.script)
+    assert_equal(nil, obj.sort_order)
+    assert_equal("test", obj.modifier)
+    assert_equal(["zh", "CN", "GB2312", nil, nil, "test"], obj.to_a)
+
+    obj = Locale::Object.new("wa_BE.iso885915@euro")
+    assert_equal("wa", obj.language)
+    assert_equal("BE", obj.country)
+    assert_equal("iso885915", obj.charset)
+    assert_equal(nil, obj.script)
+    assert_equal(nil, obj.sort_order)
+    assert_equal("euro", obj.modifier)
+    assert_equal(["wa", "BE", "iso885915", nil, nil, "euro"], obj.to_a)
+
+    obj = Locale::Object.new("uz-uz-latn")
+    assert_equal("uz", obj.language)
+    assert_equal("UZ", obj.country)
+    assert_equal(nil, obj.charset)
+    assert_equal("Latn", obj.script)
+    assert_equal(nil, obj.sort_order)
+    assert_equal(nil, obj.modifier)
+    assert_equal(["uz", "UZ", nil, "Latn", nil, nil], obj.to_a)
+  end
+
+  def test_locale
+    loc = Locale.clear
+    if /win32|cygwin|mingw/ =~ RUBY_PLATFORM
+      Locale.set("ja-jp")
+      assert_equal("ja_JP", Locale.get.to_str)
+      assert_equal("CP932", Locale.get.charset)
+      Locale.clear
+      Locale.set("C")
+      assert_equal("C", Locale.get.to_str)
+      assert_equal("CP1252", Locale.get.charset)
+      Locale.set_current("as-IN")
+      assert_equal("as_IN", Locale.get.to_str)
+      assert_equal("UNICODE", Locale.get.charset)
+      Locale.set_current("az_AZ-Latn")
+      assert_equal("az-AZ", Locale.get.to_iso3066)
+      assert_equal("az-AZ-Latn", Locale.get.to_win)
+      assert_equal("CP1254", Locale.get.charset)
+      Locale.set_current("iu-CA-Cans")
+      assert_equal("iu-CA", Locale.get.to_iso3066)
+      assert_equal("iu-CA-Cans", Locale.get.to_win)
+      assert_equal("UNICODE", Locale.get.charset)
+    else
+      loc = Locale.get
+      assert_equal("ja_JP", Locale.get.to_str)
+      assert_equal("EUC-JP", Locale.codeset)
+
+      loc = Locale.set("ja_JP")
+      assert_equal("ja_JP", loc.to_str)
+      assert_equal("ja_JP", Locale.get.to_str)
+      assert_equal("EUC-JP", Locale.codeset)
+    end
+
+=begin
+    # Deprecated
+    loc = Locale.set(Locale::CTYPE, "ja_JP.eucJP")
+    assert_equal("ja_JP", loc.to_str)
+    assert_equal("ja_JP", Locale.get.to_str)
+    assert_equal("eucJP", Locale.codeset)
+
+    # Deprecated
+    loc = Locale.set(Locale::CTYPE, "ja_JP.UTF-8")
+    assert_equal("ja_JP", loc.to_str)
+    assert_equal("ja_JP", Locale.get.to_str)
+    assert_equal("UTF-8", Locale.codeset)
+=end
+
+  end
+end
+

data/test/gettext_test_parser.rb

@@ -46,18 +46,18 @@ class TestGetTextParser < Test::Unit::TestCase
   end
 
   def test_ruby_n
-    ary = GetText::RubyParser.parse('test_rubyparser_n.rb')
-    assert_equal(["aaa\000aaa2", 'test_rubyparser_n.rb:8'], ary[0])
-    assert_equal(["bbb\\n\000ccc2\\nccc2", 'test_rubyparser_n.rb:12'], ary[1])
-    assert_equal(["ddd\\nddd\000ddd2\\nddd2", 'test_rubyparser_n.rb:16'], ary[2])
-    assert_equal(["eee\\neee\\n\000eee2\\neee2\\n", 'test_rubyparser_n.rb:21'], ary[3])
-    assert_equal(["ddd\\neee\\n\000ddd\\neee2", 'test_rubyparser_n.rb:27'], ary[4])
-    assert_equal(["fff\000fff2", 'test_rubyparser_n.rb:34', 'test_rubyparser_n.rb:38'], ary[5])
-    assert_equal(["ggg\000ggg2", 'test_rubyparser_n.rb:38'], ary[6])
-    assert_equal(["ggghhhiii\000jjjkkklll", 'test_rubyparser_n.rb:42'], ary[7])
-#    assert_equal(["a"b"c"\000a"b"c"2", 'test_rubyparser_n.rb:51'], ary[8])
-    assert_equal(["mmmmmm\000mmm2mmm2", 'test_rubyparser_n.rb:59'], ary[10])
-    assert_equal(["nnn\000nnn2", 'test_rubyparser_n.rb:60'], ary[11])
+    ary = GetText::RubyParser.parse('test_rubyparser_n_.rb')
+    assert_equal(["aaa\000aaa2", 'test_rubyparser_n_.rb:8'], ary[0])
+    assert_equal(["bbb\\n\000ccc2\\nccc2", 'test_rubyparser_n_.rb:12'], ary[1])
+    assert_equal(["ddd\\nddd\000ddd2\\nddd2", 'test_rubyparser_n_.rb:16'], ary[2])
+    assert_equal(["eee\\neee\\n\000eee2\\neee2\\n", 'test_rubyparser_n_.rb:21'], ary[3])
+    assert_equal(["ddd\\neee\\n\000ddd\\neee2", 'test_rubyparser_n_.rb:27'], ary[4])
+    assert_equal(["fff\000fff2", 'test_rubyparser_n_.rb:34', 'test_rubyparser_n_.rb:38'], ary[5])
+    assert_equal(["ggg\000ggg2", 'test_rubyparser_n_.rb:38'], ary[6])
+    assert_equal(["ggghhhiii\000jjjkkklll", 'test_rubyparser_n_.rb:42'], ary[7])
+#    assert_equal(["a"b"c"\000a"b"c"2", 'test_rubyparser_n_.rb:51'], ary[8])
+    assert_equal(["mmmmmm\000mmm2mmm2", 'test_rubyparser_n_.rb:59'], ary[10])
+    assert_equal(["nnn\000nnn2", 'test_rubyparser_n_.rb:60'], ary[11])
   end
 
   def test_glade

data/test/po/la/plural_error.po

@@ -0,0 +1,21 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR ORGANIZATION
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2002-10-21 15:32:15+0900\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=US-ASCII\n"
+"Content-Transfer-Encoding: ENCODING\n"
+"Plural-Forms: nplurals=2; plural= n != 1;\n"
+
+#: hello_plural.rb:11
+msgid "one"
+msgid_plural "two"
+msgstr[0] "la_one"