gettext 3.0.6 → 3.0.7

data/po/zh_TW/gettext.po

@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ruby-gettext 2.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-02 23:46+0900\n"
+"POT-Creation-Date: 2014-02-09 21:39+0900\n"
 "PO-Revision-Date: 2006-08-21 09:39+0800\n"
 "Last-Translator: Yang Bob <bob.yang.dev at gmail.com>\n"
 "Language-Team: zh_TW <xmarsh at gmail.com>\n"
@@ -28,7 +28,7 @@ msgstr ""
 msgid "ngettext: 3rd parmeter is wrong: value = %{number}"
 msgstr "第三个参数錯誤：value = %{number}"
 
-#: ../lib/gettext/text_domain_manager.rb:154
+#: ../lib/gettext/text_domain_manager.rb:155
 msgid "ngettext: 3rd parameter should be a number, not nil."
 msgstr ""
 
@@ -41,7 +41,7 @@ msgid "Concatenates and merges PO files."
 msgstr ""
 
 #: ../lib/gettext/tools/msgcat.rb:176 ../lib/gettext/tools/msgfmt.rb:86
-#: ../lib/gettext/tools/msginit.rb:89 ../lib/gettext/tools/msgmerge.rb:329
+#: ../lib/gettext/tools/msginit.rb:92 ../lib/gettext/tools/msgmerge.rb:329
 #: ../lib/gettext/tools/xgettext.rb:248
 msgid "Specific options:"
 msgstr "特殊選項:"
@@ -123,32 +123,32 @@ msgstr "輸出到指定檔案"
 msgid "display version information and exit"
 msgstr "秀出版本資訊後退出"
 
-#: ../lib/gettext/tools/msginit.rb:85
+#: ../lib/gettext/tools/msginit.rb:88
 msgid ""
 "Create a new .po file from initializing .pot file with user's environment and "
 "input."
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:91
+#: ../lib/gettext/tools/msginit.rb:94
 msgid ""
 "Use INPUT as a .pot file. If INPUT is not specified, INPUT is a .pot file exis"
 "ting the current directory."
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:98
+#: ../lib/gettext/tools/msginit.rb:101
 msgid ""
 "Use OUTPUT as a created .po file. If OUTPUT is not specified, OUTPUT depend on"
 " LOCALE or the current locale on your environment."
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:105
+#: ../lib/gettext/tools/msginit.rb:108
 msgid ""
 "Use LOCALE as target locale. If LOCALE is not specified, LOCALE is the current"
 " locale on your environment."
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:112 ../lib/gettext/tools/msgmerge.rb:398
-msgid "Display this help and exit"
+#: ../lib/gettext/tools/msginit.rb:116
+msgid "Don't set translator information"
 msgstr ""
 
 #: ../lib/gettext/tools/msginit.rb:117
@@ -156,8 +156,16 @@ msgstr ""
 msgid "Display version and exit"
 msgstr "秀出版本資訊後退出"
 
-#: ../lib/gettext/tools/msginit.rb:135
-msgid ".pot file does not exist in the current directory."
+#: ../lib/gettext/tools/msginit.rb:121
+msgid "Use NAME as translator name"
+msgstr ""
+
+#: ../lib/gettext/tools/msginit.rb:126
+msgid "Use EMAIL as translator email address"
+msgstr ""
+
+#: ../lib/gettext/tools/msginit.rb:130 ../lib/gettext/tools/msgmerge.rb:398
+msgid "Display this help and exit"
 msgstr ""
 
 #: ../lib/gettext/tools/msginit.rb:140
@@ -165,10 +173,8 @@ msgstr ""
 msgid "file '%s' does not exist."
 msgstr "檔案 '%s' 已經存在"
 
-#: ../lib/gettext/tools/msginit.rb:152
-msgid ""
-"\"Locale '#{language_tag}' is invalid. \"Please check if your specified locale i"
-"s usable."
+#: ../lib/gettext/tools/msginit.rb:153
+msgid ".pot file does not exist in the current directory."
 msgstr ""
 
 #: ../lib/gettext/tools/msginit.rb:161
@@ -176,11 +182,17 @@ msgstr ""
 msgid "file '%s' has already existed."
 msgstr "檔案 '%s' 已經存在"
 
-#: ../lib/gettext/tools/msginit.rb:202
+#: ../lib/gettext/tools/msginit.rb:170
+msgid ""
+"\"Locale '#{language_tag}' is invalid. \"Please check if your specified locale i"
+"s usable."
+msgstr ""
+
+#: ../lib/gettext/tools/msginit.rb:221
 msgid "Please enter your full name"
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:231
+#: ../lib/gettext/tools/msginit.rb:250
 msgid "Please enter your email address"
 msgstr ""
 

data/test/tools/test_msginit.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # Copyright (C) 2012  Haruka Yoshihara <yoshihara@clear-code.com>
-# Copyright (C) 2012  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2012-2014  Kouhei Sutou <kou@clear-code.com>
 #
 # License: Ruby's or LGPL
 #
@@ -23,8 +23,8 @@ require "gettext/tools/msginit"
 class TestToolsMsgInit < Test::Unit::TestCase
   def setup
     @msginit = GetText::Tools::MsgInit.new
-    stub(@msginit).read_translator_full_name {translator_full_name}
-    stub(@msginit).read_translator_mail {translator_mail}
+    stub(@msginit).read_translator_name {translator_name}
+    stub(@msginit).read_translator_email {translator_email}
 
     @year             = "2012"
     @po_revision_date = "2012-09-11 13:19+0900"
@@ -36,219 +36,10 @@ class TestToolsMsgInit < Test::Unit::TestCase
     Locale.current = "ja_JP.UTF-8"
   end
 
-  def test_all_options
-    Dir.mktmpdir do |dir|
-      pot_file_path = File.join(dir, "test.pot")
-      create_pot_file(pot_file_path)
-      po_file_path = File.join(dir, "test.po")
-      locale = "en"
-      language = locale
-
-      @msginit.run("--input", pot_file_path,
-                   "--output", po_file_path,
-                   "--locale", locale)
-
-      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
-
-  def test_locale_including_language
-    Dir.mktmpdir do |dir|
-      Dir.chdir(dir) do
-        create_pot_file("test.pot")
-        locale = "en"
-        language = locale
-        po_file_path = "#{locale}.po"
-
-        @msginit.run("--locale", locale)
-
-        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
-
-  def test_locale_including_language_and_region
-    Dir.mktmpdir do |dir|
-      Dir.chdir(dir) do
-        create_pot_file("test.pot")
-        locale = "en_US"
-        language = "en"
-        po_file_path = "#{locale}.po"
-
-        @msginit.run("--locale", locale)
-
-        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
-
-  def test_locale_including_language_and_region_with_charset
-    Dir.mktmpdir do |dir|
-      Dir.chdir(dir) do
-        create_pot_file("test.pot")
-        locale = "en_US"
-        language = "en"
-        charset = "UTF-8"
-        po_file_path = "en_US.po"
-
-        @msginit.run("--locale", "#{locale}.#{charset}")
-
-        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
-
-  def test_pot_file_and_po_file
-    Dir.mktmpdir do |dir|
-      pot_file_path = File.join(dir, "test.pot")
-      create_pot_file(pot_file_path)
-      locale = current_locale
-      language = current_language
-      po_file_path = File.join(dir, "test.po")
-
-      @msginit.run("--input", pot_file_path, "--output", 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
-  end
-
-  def test_pot_file
-    Dir.mktmpdir do |dir|
-      Dir.chdir(dir) do
-        pot_file_path = "test.pot"
-        create_pot_file(pot_file_path)
-        locale = current_locale
-        language = current_language
-        po_file_path = "#{locale}.po"
-
-        @msginit.run("--input", pot_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
-    end
-  end
-
-  def test_no_options
-    Dir.mktmpdir do |dir|
-      Dir.chdir(dir) do
-        create_pot_file("test.pot")
-        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
-
-  def test_no_translator
-    stub(@msginit).read_translator_full_name {nil}
-    stub(@msginit).read_translator_mail {nil}
-
-    Dir.mktmpdir do |dir|
-      Dir.chdir(dir) do
-        create_pot_file("test.pot")
-        locale = current_locale
-        language = current_language
-        po_file_path = "#{locale}.po"
-
-        @msginit.run
-
-        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
-    end
-  end
-
-  def test_no_translator_full_name
-    stub(@msginit).read_translator_full_name {nil}
-
-    Dir.mktmpdir do |dir|
-      Dir.chdir(dir) do
-        create_pot_file("test.pot")
-        locale = current_locale
-        language = current_language
-        po_file_path = "#{locale}.po"
-
-        @msginit.run
-
-        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
-    end
-  end
-
-  def test_no_translator_mail
-    stub(@msginit).read_translator_mail {nil}
-
+  def run(*args, &blcok)
     Dir.mktmpdir do |dir|
       Dir.chdir(dir) do
-        create_pot_file("test.pot")
-        locale = current_locale
-        language = current_language
-        po_file_path = "#{locale}.po"
-
-        @msginit.run
-
-        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
-    end
-  end
-
-  def test_package_name_specified_in_project_id_version
-    Dir.mktmpdir do |dir|
-      Dir.chdir(dir) do
-        pot_file_name = "test.pot"
-        options = {:package_name => "test-package"}
-        create_pot_file(pot_file_name, options)
-        locale = current_locale
-        language = current_language
-        po_file_path = "#{locale}.po"
-
-        @msginit.run("--input", pot_file_name)
-
-        expected_po_header = po_header(locale, language, options)
-        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
+        super
       end
     end
   end
@@ -262,11 +53,11 @@ class TestToolsMsgInit < Test::Unit::TestCase
     Locale.current.language
   end
 
-  def translator_full_name
+  def translator_name
     "me"
   end
 
-  def translator_mail
+  def translator_email
     "me@example.com"
   end
 
@@ -277,7 +68,17 @@ class TestToolsMsgInit < Test::Unit::TestCase
     end
   end
 
+  def default_po_header_options
+    {
+      :package_name          => default_package_name,
+      :first_translator_name => translator_name,
+      :translator_name       => translator_name,
+      :translator_email      => translator_email,
+    }
+  end
+
   def pot_header(options)
+    options = default_po_header_options.merge(options)
     package_name = options[:package_name] || default_package_name
     have_plural_forms = options[:have_plural_forms] || true
     header = <<EOF
@@ -305,11 +106,12 @@ EOF
     header
   end
 
-  def po_header(locale, language, options=nil)
-    options ||= {}
-    package_name = options[:package_name] || default_package_name
-    full_name = translator_full_name
-    mail = translator_mail
+  def po_header(locale, language, options={})
+    options = default_po_header_options.merge(options)
+    package_name = options[:package_name]
+    first_translator_name = options[:first_translator_name] || "FIRST AUTHOR"
+    name = options[:translator_name] || "FULL NAME"
+    email = options[:translator_email] || "EMAIL@ADDRESS"
     language_name = Locale::Info.get_language(language).name
     plural_forms = @msginit.send(:plural_forms, language)
 
@@ -317,14 +119,14 @@ EOF
 # #{language_name} translations for #{package_name} package.
 # Copyright (C) #{@year} THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# #{full_name} <#{mail}>, #{@year}.
+# #{first_translator_name} <#{email}>, #{@year}.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: #{package_name} VERSION\\n"
 "POT-Creation-Date: #{@pot_create_date}\\n"
 "PO-Revision-Date: #{@po_revision_date}\\n"
-"Last-Translator: #{full_name} <#{mail}>\\n"
+"Last-Translator: #{name} <#{email}>\\n"
 "Language: #{locale}\\n"
 "Language-Team: #{language_name}\\n"
 "MIME-Version: 1.0\\n"
@@ -338,28 +140,192 @@ EOF
     "PACKAGE"
   end
 
-  def no_translator_po_header(locale, language)
-    language_name = Locale::Info.get_language(language).name
-    plural_forms = @msginit.send(:plural_forms, language)
+  class TestInput < self
+    def test_specify_option
+      pot_dir = "sub"
+      FileUtils.mkdir_p(pot_dir)
+      pot_file_path = File.join(pot_dir, "test.pot")
+      create_pot_file(pot_file_path)
+      @msginit.run("--input", pot_file_path)
+      po_file_path = "#{current_locale}.po"
+      assert_path_exist(po_file_path)
+    end
 
-    <<EOF
-# #{language_name} translations for PACKAGE package.
-# 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}.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\\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"
-"MIME-Version: 1.0\\n"
-"Content-Type: text/plain; charset=UTF-8\\n"
-"Content-Transfer-Encoding: 8bit\\n"
-"Plural-Forms: #{plural_forms}\\n"
-EOF
+    def test_find_pot
+      pot_in_current_directory = "test.pot"
+      create_pot_file(pot_in_current_directory)
+      @msginit.run
+      po_file_path = "#{current_locale}.po"
+      assert_path_exist(po_file_path)
+    end
+
+    def test_pot_not_found
+      pot_dir = "sub"
+      FileUtils.mkdir_p(pot_dir)
+      pot_file_path = File.join(pot_dir, "test.pot")
+      create_pot_file(pot_file_path)
+
+      assert_raise(GetText::Tools::MsgInit::ValidationError) do
+        @msginit.run
+      end
+    end
+  end
+
+  class TestOutput < self
+    def setup
+      super
+      @pot_file_path = "test.pot"
+      create_pot_file(@pot_file_path)
+    end
+
+    def test_default
+      @msginit.run("--input", @pot_file_path)
+
+      po_file_path = "#{current_locale}.po"
+      assert_path_exist(po_file_path)
+    end
+
+    def test_specify_option
+      po_dir = "sub"
+      FileUtils.mkdir_p(po_dir)
+      po_file_path = File.join(po_dir, "test.po")
+
+      @msginit.run("--input", @pot_file_path,
+                   "--output", po_file_path)
+
+      assert_path_exist(po_file_path)
+    end
+  end
+
+  class TestLocale < self
+    def run_msginit(locale)
+      create_pot_file("test.pot")
+      po_file_path = "output.po"
+      @msginit.run("--output", po_file_path,
+                   "--locale", locale)
+      File.read(po_file_path)
+    end
+
+    def test_language
+      locale = "en"
+      assert_equal(po_header(locale, locale),
+                   run_msginit(locale))
+    end
+
+    def test_language_region
+      locale = "en_US"
+      language = "en"
+      assert_equal(po_header(locale, language),
+                   run_msginit(locale))
+    end
+
+    def test_language_region_charset
+      locale = "en_US"
+      language = "en"
+      charset = "UTF-8"
+      assert_equal(po_header(locale, language),
+                   run_msginit("#{locale}.#{charset}"))
+    end
+  end
+
+  class TestTranslator < self
+    def run_msginit(*arguments)
+      create_pot_file("test.pot")
+      po_file_path = "output.po"
+      @msginit.run("--output", po_file_path,
+                   *arguments)
+      File.read(po_file_path)
+    end
+
+    class TestChanged < self
+      def po_header(options)
+        super(current_locale, current_language, options)
+      end
+
+      def test_name
+        name = "Custom Translator"
+        assert_equal(po_header(:first_translator_name => name,
+                               :translator_name => name),
+                     run_msginit("--translator-name", name))
+      end
+
+      def test_email
+        email = "custom-translator@example.com"
+        assert_equal(po_header(:translator_email => email),
+                     run_msginit("--translator-email", email))
+      end
+    end
+
+    class TestNotChanged < self
+      def no_translator_po_header
+        po_header(current_locale, current_language,
+                  :first_translator_name => nil,
+                  :translator_name => nil,
+                  :translator_email => nil)
+      end
+
+      def test_no_name_no_email
+        stub(@msginit).read_translator_name {nil}
+        stub(@msginit).read_translator_email {nil}
+
+        assert_equal(no_translator_po_header,
+                     run_msginit)
+      end
+
+      def test_no_name
+        stub(@msginit).read_translator_name {nil}
+
+        assert_equal(no_translator_po_header,
+                     run_msginit)
+      end
+
+      def test_no_email
+        stub(@msginit).read_translator_email {nil}
+
+        assert_equal(no_translator_po_header,
+                     run_msginit)
+      end
+
+      def test_no_translator
+        assert_equal(no_translator_po_header,
+                     run_msginit("--no-translator"))
+      end
+    end
+  end
+
+  class TestPackage < self
+    def run_msginit
+      create_pot_file("test.pot")
+      po_file_path = "output.po"
+      @msginit.run("--output", po_file_path)
+      File.read(po_file_path)
+    end
+
+    class TestCustomPackageName < self
+      def default_po_header_options
+        super.merge(:package_name => "test-package")
+      end
+
+      def test_not_change
+        assert_equal(po_header(current_locale, current_language),
+                     run_msginit)
+      end
+    end
+  end
+
+  class TestPluralForms < self
+    def run_msginit(pot_header_options={})
+      create_pot_file("test.pot", pot_header_options)
+      po_file_path = "output.po"
+      @msginit.run("--output", po_file_path)
+      File.read(po_file_path)
+    end
+
+    class TestNoInPot < self
+      def test_no_plural_forms_in_pot
+        assert_equal(po_header(current_locale, current_language),
+                     run_msginit(:have_plural_forms => false))
+      end
+    end
   end
 end