RubyGems - gettext - Versions diffs - 2.3.0 → 2.3.1 - Mend

gettext 2.3.0 → 2.3.1

Files changed (74) hide show

data/.yardopts +6 -0
data/Rakefile +7 -6
data/doc/text/news.md +51 -2
data/gettext.gemspec +1 -0
data/lib/gettext/runtime/locale_path.rb +0 -1
data/lib/gettext/runtime/mofile.rb +8 -2
data/lib/gettext/runtime/textdomain.rb +19 -21
data/lib/gettext/runtime/textdomain_manager.rb +0 -1
data/lib/gettext/tools/msginit.rb +19 -9
data/lib/gettext/tools/msgmerge.rb +28 -15
data/lib/gettext/tools/parser/erb.rb +25 -5
data/lib/gettext/tools/parser/glade.rb +4 -3
data/lib/gettext/tools/parser/ruby.rb +23 -5
data/lib/gettext/tools/poparser.rb +2 -1
data/lib/gettext/tools/xgettext.rb +187 -136
data/lib/gettext/version.rb +1 -1
data/po/ja/gettext.po +82 -41
data/samples/cgi/locale/bg/LC_MESSAGES/main.mo +0 -0
data/samples/cgi/locale/bs/LC_MESSAGES/main.mo +0 -0
data/samples/cgi/locale/ca/LC_MESSAGES/main.mo +0 -0
data/samples/cgi/locale/cs/LC_MESSAGES/main.mo +0 -0
data/samples/cgi/locale/de/LC_MESSAGES/main.mo +0 -0
data/samples/cgi/locale/el/LC_MESSAGES/main.mo +0 -0
data/samples/cgi/locale/eo/LC_MESSAGES/main.mo +0 -0
data/samples/cgi/locale/es/LC_MESSAGES/main.mo +0 -0
data/samples/po/hello.pot +3 -3
data/samples/po/hello2.pot +3 -3
data/samples/po/hello_glade2.pot +3 -3
data/samples/po/hello_gtk2.pot +3 -3
data/samples/po/hello_noop.pot +3 -3
data/samples/po/hello_plural.pot +3 -3
data/samples/po/hello_tk.pot +3 -3
data/src/poparser.ry +1 -0
data/test/fixtures/_.rb +4 -4
data/test/fixtures/{erb.rhtml → erb/ascii.rhtml} +0 -0
data/test/fixtures/{erb.rxml → erb/ascii.rxml} +0 -0
data/test/fixtures/erb/non_ascii.rhtml +13 -0
data/test/fixtures/untranslated.rb +12 -0
data/test/gettext-test-utils.rb +23 -0
data/test/locale/ja/LC_MESSAGES/untranslated.mo +0 -0
data/test/parser/test_ruby.rb +48 -1
data/test/po/_.pot +4 -4
data/test/po/ascii.pot +23 -0
data/test/po/backslash.pot +3 -3
data/test/po/ja/untranslated.po +22 -0
data/test/po/no_exist_msgid.pot +20 -0
data/test/po/non_ascii.pot +3 -3
data/test/po/not_existed_msgid.pot +20 -0
data/test/po/np_.pot +3 -3
data/test/po/ns_.pot +3 -3
data/test/po/p_.pot +3 -3
data/test/po/s_.pot +3 -3
data/test/po/untranslated.pot +23 -0
data/test/run-test.rb +1 -1
data/test/test_gettext.rb +2 -2
data/test/test_mofile.rb +10 -0
data/test/test_parser.rb +45 -19
data/test/test_po_parser.rb +14 -1
data/test/tools/test_msginit.rb +52 -36
data/test/tools/test_msgmerge.rb +44 -6
data/test/tools/test_xgettext.rb +203 -5
metadata +143 -146
data/po/de/gettext.po +0 -668
data/po/de/gettext.po.bak +0 -589
data/po/el/gettext.po +0 -571
data/po/fr/gettext.po +0 -589
data/po/gettext.pot +0 -638
data/po/gettext.pot~ +0 -638
data/po/it/gettext.po +0 -589
data/po/uk/gettext.po +0 -571
data/test/locale/ja/LC_MESSAGES/npgettext.mo +0 -0
data/test/locale/ja/LC_MESSAGES/nsgettext.mo +0 -0
data/test/locale/ja/LC_MESSAGES/pgettext.mo +0 -0
data/test/locale/ja/LC_MESSAGES/sgettext.mo +0 -0

data/samples/po/hello_gtk2.pot CHANGED Viewed

@@ -6,10 +6,10 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext 2.3.0\n"
+"Project-Id-Version: gettext 2.3.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-27 16:00+0900\n"
-"PO-Revision-Date: 2012-08-27 16:00+0900\n"
+"POT-Creation-Date: 2012-09-04 18:38+0900\n"
+"PO-Revision-Date: 2012-09-04 18:38+0900\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"

data/samples/po/hello_noop.pot CHANGED Viewed

@@ -6,10 +6,10 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext 2.3.0\n"
+"Project-Id-Version: gettext 2.3.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-27 16:00+0900\n"
-"PO-Revision-Date: 2012-08-27 16:00+0900\n"
+"POT-Creation-Date: 2012-09-04 18:38+0900\n"
+"PO-Revision-Date: 2012-09-04 18:38+0900\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"

data/samples/po/hello_plural.pot CHANGED Viewed

@@ -6,10 +6,10 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext 2.3.0\n"
+"Project-Id-Version: gettext 2.3.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-27 16:00+0900\n"
-"PO-Revision-Date: 2012-08-27 16:00+0900\n"
+"POT-Creation-Date: 2012-09-04 18:38+0900\n"
+"PO-Revision-Date: 2012-09-04 18:38+0900\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"

data/samples/po/hello_tk.pot CHANGED Viewed

@@ -6,10 +6,10 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext 2.3.0\n"
+"Project-Id-Version: gettext 2.3.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-27 16:00+0900\n"
-"PO-Revision-Date: 2012-08-27 16:00+0900\n"
+"POT-Creation-Date: 2012-09-04 18:38+0900\n"
+"PO-Revision-Date: 2012-09-04 18:38+0900\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"

data/src/poparser.ry CHANGED Viewed

@@ -220,6 +220,7 @@ end
   end
   def on_message(msgid, msgstr)
+    msgstr = nil if msgstr.empty?
     @data[msgid] = msgstr
     @data.set_comment(msgid, @comments.join("\n"))

data/test/fixtures/_.rb CHANGED Viewed

@@ -23,7 +23,7 @@
 require 'gettext'
 include GetText
-class TestRubyParser
+class MessageFixture
   bindtextdomain("rubyparser", :path => "locale")
   def test_1
@@ -109,7 +109,7 @@ EOF
   end
   def about
-    puts (
+    puts(
       # 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)
@@ -118,10 +118,10 @@ EOF
       # This is an example from GNU gettext documentation.
       _("Francois Pinard"))
-    puts (
+    puts(
       _("No TRANSLATORS comment"))
-    puts (
+    puts(
       # This comment should not be extracted because it does
       # not start with 'TRANSLATORS:'
       _('self explaining'))

data/test/fixtures/{erb.rhtml → erb/ascii.rhtml} RENAMED Viewed

File without changes

data/test/fixtures/{erb.rxml → erb/ascii.rxml} RENAMED Viewed

File without changes

data/test/fixtures/erb/non_ascii.rhtml ADDED Viewed

@@ -0,0 +1,13 @@
+<%
+  require 'gettext'
+  include GetText
+  bindtextdomain("helloerb", :path => "locale")
+%>
+<html>
+<head>
+<title></title>
+</head>
+<body>
+<h1><%= _("わたし") %></h1>
+</body>
+</html>

data/test/fixtures/untranslated.rb ADDED Viewed

@@ -0,0 +1,12 @@
+# encoding: utf-8
+require 'gettext'
+class UnTranslated
+  include GetText
+  bindtextdomain("untranslated", :path => "locale")
+  def untranslated
+    _("untranslated")
+  end
+end

data/test/gettext-test-utils.rb CHANGED Viewed

@@ -22,6 +22,10 @@ require "tmpdir"
 require "tempfile"
 require "time"
+unless String.method_defined?(:encode)
+  require "iconv"
+end
 require "gettext"
 module GetTextTestUtils
@@ -41,4 +45,23 @@ module GetTextTestUtils
   def teardown_tmpdir
     FileUtils.rm_rf(@tmpdir, :secure => true) if @tmpdir
   end
+  def need_encoding
+    unless defined?(Encoding)
+      omit("This test needs encoding.")
+    end
+  end
+  def set_encoding(string, encoding)
+    return unless string.respond_to?(:force_encoding)
+    string.force_encoding(encoding)
+  end
+  def encode(string, encoding)
+    if string.respond_to?(:encode)
+      string.encode(encoding)
+    else
+      Iconv.iconv(encoding, "UTF-8", string).join("")
+    end
+  end
 end

data/test/locale/ja/LC_MESSAGES/untranslated.mo ADDED Viewed

Binary file

data/test/parser/test_ruby.rb CHANGED Viewed

@@ -23,7 +23,7 @@
 require "gettext/tools/parser/ruby"
-class TestRubyParserXXX < Test::Unit::TestCase
+class TestRubyParser < Test::Unit::TestCase
   include GetTextTestUtils
   private
@@ -65,6 +65,53 @@ class TestRubyParserXXX < Test::Unit::TestCase
     end
   end
+  class TestDetectEncoding < self
+    setup :need_encoding
+    def test_ascii_and_hyphen
+      assert_equal("euc-jp", detect_encoding("# coding: euc-jp"))
+    end
+    def test_number
+      assert_equal("cp932", detect_encoding("#coding: cp932"))
+    end
+    def test_under_bar
+      assert_equal("Shift_JIS", detect_encoding("# coding: Shift_JIS"))
+    end
+    def test_emacs_style
+      assert_equal("utf-8", detect_encoding("# -*- coding: utf-8 -*-"))
+    end
+    def test_encoding
+      assert_equal("utf-8", detect_encoding("# encoding: utf-8"))
+    end
+    def test_equal
+      assert_equal("utf-8", detect_encoding("# encoding = utf-8"))
+    end
+    private
+    def detect_encoding(content)
+      GetText::RubyParser.detect_encoding(content)
+    end
+    class NewLineStyle < self
+      def test_unix
+        assert_equal("utf-8", detect_encoding("# -*- coding: utf-8-unix -*-"))
+      end
+      def test_mac
+        assert_equal("utf-8", detect_encoding("# -*- coding: utf-8-mac -*-"))
+      end
+      def test_dos
+        assert_equal("utf-8", detect_encoding("# -*- coding: utf-8-dos -*-"))
+      end
+    end
+  end
   class Test_ < self
     def test_one_line
       assert_parse([

data/test/po/_.pot CHANGED Viewed

@@ -6,15 +6,15 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext 2.3.0\n"
+"Project-Id-Version: gettext 2.3.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-27 16:00+0900\n"
-"PO-Revision-Date: 2012-08-27 16:00+0900\n"
+"POT-Creation-Date: 2012-09-10 18:44+0900\n"
+"PO-Revision-Date: 2012-09-10 18:44+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-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"

data/test/po/ascii.pot ADDED Viewed

@@ -0,0 +1,23 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the gettext package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: gettext 2.3.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-09-11 12:32+0900\n"
+"PO-Revision-Date: 2012-09-11 12:32+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"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
+#: ../fixtures/ascii.rb:10
+msgid "gettext"
+msgstr ""

data/test/po/backslash.pot CHANGED Viewed

@@ -6,10 +6,10 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext 2.3.0\n"
+"Project-Id-Version: gettext 2.3.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-27 16:00+0900\n"
-"PO-Revision-Date: 2012-08-27 16:00+0900\n"
+"POT-Creation-Date: 2012-09-04 18:38+0900\n"
+"PO-Revision-Date: 2012-09-04 18:38+0900\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"

data/test/po/ja/untranslated.po ADDED Viewed

@@ -0,0 +1,22 @@
+# Japanese translations for gettext package.
+# Copyright (C) 2012 THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the gettext package.
+# Haruka Yoshihara <yoshihara@clear-code.com>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: gettext 2.3.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-09-11 11:11+0900\n"
+"PO-Revision-Date: 2012-09-11 11:11+0900\n"
+"Last-Translator: Haruka Yoshihara <yoshihara@clear-code.com>\n"
+"Language-Team: Japanese\n"
+"Language: ja\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+#: ../fixtures/untranslated.rb:10
+msgid "untranslated"
+msgstr ""

data/test/po/no_exist_msgid.pot ADDED Viewed

@@ -0,0 +1,20 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the gettext package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: gettext 2.3.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-09-11 11:11+0900\n"
+"PO-Revision-Date: 2012-09-11 11:11+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"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"

data/test/po/non_ascii.pot CHANGED Viewed

@@ -6,10 +6,10 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext 2.3.0\n"
+"Project-Id-Version: gettext 2.3.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-27 16:00+0900\n"
-"PO-Revision-Date: 2012-08-27 16:00+0900\n"
+"POT-Creation-Date: 2012-09-04 18:38+0900\n"
+"PO-Revision-Date: 2012-09-04 18:38+0900\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"

data/test/po/not_existed_msgid.pot ADDED Viewed

@@ -0,0 +1,20 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the gettext package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: gettext 2.3.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-09-11 12:32+0900\n"
+"PO-Revision-Date: 2012-09-11 12:32+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"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"

data/test/po/np_.pot CHANGED Viewed

@@ -6,10 +6,10 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext 2.3.0\n"
+"Project-Id-Version: gettext 2.3.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-27 16:00+0900\n"
-"PO-Revision-Date: 2012-08-27 16:00+0900\n"
+"POT-Creation-Date: 2012-09-04 18:38+0900\n"
+"PO-Revision-Date: 2012-09-04 18:38+0900\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"

data/test/po/ns_.pot CHANGED Viewed

@@ -6,10 +6,10 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext 2.3.0\n"
+"Project-Id-Version: gettext 2.3.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-27 16:00+0900\n"
-"PO-Revision-Date: 2012-08-27 16:00+0900\n"
+"POT-Creation-Date: 2012-09-04 18:38+0900\n"
+"PO-Revision-Date: 2012-09-04 18:38+0900\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"

data/test/po/p_.pot CHANGED Viewed

@@ -6,10 +6,10 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext 2.3.0\n"
+"Project-Id-Version: gettext 2.3.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-27 16:00+0900\n"
-"PO-Revision-Date: 2012-08-27 16:00+0900\n"
+"POT-Creation-Date: 2012-09-04 18:38+0900\n"
+"PO-Revision-Date: 2012-09-04 18:38+0900\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"

data/test/po/s_.pot CHANGED Viewed

@@ -6,10 +6,10 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext 2.3.0\n"
+"Project-Id-Version: gettext 2.3.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-27 16:00+0900\n"
-"PO-Revision-Date: 2012-08-27 16:00+0900\n"
+"POT-Creation-Date: 2012-09-04 18:38+0900\n"
+"PO-Revision-Date: 2012-09-04 18:38+0900\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"

data/test/po/untranslated.pot ADDED Viewed

@@ -0,0 +1,23 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the gettext package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: gettext 2.3.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-09-11 13:52+0900\n"
+"PO-Revision-Date: 2012-09-11 13:52+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"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
+#: ../fixtures/untranslated.rb:10
+msgid "untranslated"
+msgstr ""