gettext 3.4.9 → 3.5.1

data/po/sv/gettext.edit.po

@@ -35,7 +35,7 @@ msgstr ""
 msgid "Concatenates and merges PO files."
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:247 ../lib/gettext/tools/msgfmt.rb:86 ../lib/gettext/tools/msginit.rb:98 ../lib/gettext/tools/msgmerge.rb:368 ../lib/gettext/tools/xgettext.rb:247
+#: ../lib/gettext/tools/msgcat.rb:247 ../lib/gettext/tools/msgfmt.rb:86 ../lib/gettext/tools/msginit.rb:99 ../lib/gettext/tools/msgmerge.rb:368 ../lib/gettext/tools/xgettext.rb:247
 msgid "Specific options:"
 msgstr ""
 
@@ -147,67 +147,67 @@ msgstr ""
 msgid "display version information and exit"
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:94
+#: ../lib/gettext/tools/msginit.rb:95
 msgid "Create a new .po file from initializing .pot file with user's environment and input."
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:100
+#: ../lib/gettext/tools/msginit.rb:101
 msgid "Use INPUT as a .pot file. If INPUT is not specified, INPUT is a .pot file existing the current directory."
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:107
+#: ../lib/gettext/tools/msginit.rb:108
 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:114
+#: ../lib/gettext/tools/msginit.rb:115
 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:122
+#: ../lib/gettext/tools/msginit.rb:123
 msgid "Whether set translator information or not"
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:123
+#: ../lib/gettext/tools/msginit.rb:124
 msgid "(set)"
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:128
+#: ../lib/gettext/tools/msginit.rb:129
 msgid "Use NAME as translator name"
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:133
+#: ../lib/gettext/tools/msginit.rb:134
 msgid "Use EMAIL as translator email address"
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:137 ../lib/gettext/tools/msgmerge.rb:448
+#: ../lib/gettext/tools/msginit.rb:138 ../lib/gettext/tools/msgmerge.rb:448
 msgid "Display this help and exit"
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:142
+#: ../lib/gettext/tools/msginit.rb:143
 msgid "Display version and exit"
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:160
+#: ../lib/gettext/tools/msginit.rb:161
 msgid ".pot file does not exist in the current directory."
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:165
+#: ../lib/gettext/tools/msginit.rb:166
 msgid "file '%s' does not exist."
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:177
+#: ../lib/gettext/tools/msginit.rb:178
 msgid "Locale '%s' is invalid. Please check if your specified locale is usable."
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:187
+#: ../lib/gettext/tools/msginit.rb:193
 msgid "file '%s' has already existed."
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:229
+#: ../lib/gettext/tools/msginit.rb:235
 msgid "Please enter your full name"
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:258
+#: ../lib/gettext/tools/msginit.rb:264
 msgid "Please enter your email address"
 msgstr ""
 

data/po/uk/gettext.edit.po

@@ -41,7 +41,7 @@ msgstr ""
 msgid "Concatenates and merges PO files."
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:247 ../lib/gettext/tools/msgfmt.rb:86 ../lib/gettext/tools/msginit.rb:98 ../lib/gettext/tools/msgmerge.rb:368 ../lib/gettext/tools/xgettext.rb:247
+#: ../lib/gettext/tools/msgcat.rb:247 ../lib/gettext/tools/msgfmt.rb:86 ../lib/gettext/tools/msginit.rb:99 ../lib/gettext/tools/msgmerge.rb:368 ../lib/gettext/tools/xgettext.rb:247
 msgid "Specific options:"
 msgstr "Додаткові параметри:"
 
@@ -155,70 +155,70 @@ msgstr "записати результат у вказаний файл"
 msgid "display version information and exit"
 msgstr "показати інформацію про версію і завершити роботу"
 
-#: ../lib/gettext/tools/msginit.rb:94
+#: ../lib/gettext/tools/msginit.rb:95
 msgid "Create a new .po file from initializing .pot file with user's environment and input."
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:100
+#: ../lib/gettext/tools/msginit.rb:101
 msgid "Use INPUT as a .pot file. If INPUT is not specified, INPUT is a .pot file existing the current directory."
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:107
+#: ../lib/gettext/tools/msginit.rb:108
 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:114
+#: ../lib/gettext/tools/msginit.rb:115
 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:122
+#: ../lib/gettext/tools/msginit.rb:123
 msgid "Whether set translator information or not"
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:123
+#: ../lib/gettext/tools/msginit.rb:124
 msgid "(set)"
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:128
+#: ../lib/gettext/tools/msginit.rb:129
 msgid "Use NAME as translator name"
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:133
+#: ../lib/gettext/tools/msginit.rb:134
 msgid "Use EMAIL as translator email address"
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:137 ../lib/gettext/tools/msgmerge.rb:448
+#: ../lib/gettext/tools/msginit.rb:138 ../lib/gettext/tools/msgmerge.rb:448
 msgid "Display this help and exit"
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:142
+#: ../lib/gettext/tools/msginit.rb:143
 #, fuzzy
 msgid "Display version and exit"
 msgstr "показати інформацію про версію і завершити роботу"
 
-#: ../lib/gettext/tools/msginit.rb:160
+#: ../lib/gettext/tools/msginit.rb:161
 msgid ".pot file does not exist in the current directory."
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:165
+#: ../lib/gettext/tools/msginit.rb:166
 #, fuzzy
 msgid "file '%s' does not exist."
 msgstr "Файл '%s' уже існує."
 
-#: ../lib/gettext/tools/msginit.rb:177
+#: ../lib/gettext/tools/msginit.rb:178
 msgid "Locale '%s' is invalid. Please check if your specified locale is usable."
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:187
+#: ../lib/gettext/tools/msginit.rb:193
 #, fuzzy
 msgid "file '%s' has already existed."
 msgstr "Файл '%s' уже існує."
 
-#: ../lib/gettext/tools/msginit.rb:229
+#: ../lib/gettext/tools/msginit.rb:235
 msgid "Please enter your full name"
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:258
+#: ../lib/gettext/tools/msginit.rb:264
 msgid "Please enter your email address"
 msgstr ""
 

data/po/vi/gettext.edit.po

@@ -37,7 +37,7 @@ msgstr ""
 msgid "Concatenates and merges PO files."
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:247 ../lib/gettext/tools/msgfmt.rb:86 ../lib/gettext/tools/msginit.rb:98 ../lib/gettext/tools/msgmerge.rb:368 ../lib/gettext/tools/xgettext.rb:247
+#: ../lib/gettext/tools/msgcat.rb:247 ../lib/gettext/tools/msgfmt.rb:86 ../lib/gettext/tools/msginit.rb:99 ../lib/gettext/tools/msgmerge.rb:368 ../lib/gettext/tools/xgettext.rb:247
 msgid "Specific options:"
 msgstr "Tùy chọn cụ thể:"
 
@@ -151,70 +151,70 @@ msgstr "ghi ra tập tin được chỉ định"
 msgid "display version information and exit"
 msgstr "hiện thông tin về phiên bản rồi thoát"
 
-#: ../lib/gettext/tools/msginit.rb:94
+#: ../lib/gettext/tools/msginit.rb:95
 msgid "Create a new .po file from initializing .pot file with user's environment and input."
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:100
+#: ../lib/gettext/tools/msginit.rb:101
 msgid "Use INPUT as a .pot file. If INPUT is not specified, INPUT is a .pot file existing the current directory."
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:107
+#: ../lib/gettext/tools/msginit.rb:108
 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:114
+#: ../lib/gettext/tools/msginit.rb:115
 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:122
+#: ../lib/gettext/tools/msginit.rb:123
 msgid "Whether set translator information or not"
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:123
+#: ../lib/gettext/tools/msginit.rb:124
 msgid "(set)"
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:128
+#: ../lib/gettext/tools/msginit.rb:129
 msgid "Use NAME as translator name"
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:133
+#: ../lib/gettext/tools/msginit.rb:134
 msgid "Use EMAIL as translator email address"
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:137 ../lib/gettext/tools/msgmerge.rb:448
+#: ../lib/gettext/tools/msginit.rb:138 ../lib/gettext/tools/msgmerge.rb:448
 msgid "Display this help and exit"
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:142
+#: ../lib/gettext/tools/msginit.rb:143
 #, fuzzy
 msgid "Display version and exit"
 msgstr "hiện thông tin về phiên bản rồi thoát"
 
-#: ../lib/gettext/tools/msginit.rb:160
+#: ../lib/gettext/tools/msginit.rb:161
 msgid ".pot file does not exist in the current directory."
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:165
+#: ../lib/gettext/tools/msginit.rb:166
 #, fuzzy
 msgid "file '%s' does not exist."
 msgstr "Tập tin '%s' đã tồn tại."
 
-#: ../lib/gettext/tools/msginit.rb:177
+#: ../lib/gettext/tools/msginit.rb:178
 msgid "Locale '%s' is invalid. Please check if your specified locale is usable."
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:187
+#: ../lib/gettext/tools/msginit.rb:193
 #, fuzzy
 msgid "file '%s' has already existed."
 msgstr "Tập tin '%s' đã tồn tại."
 
-#: ../lib/gettext/tools/msginit.rb:229
+#: ../lib/gettext/tools/msginit.rb:235
 msgid "Please enter your full name"
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:258
+#: ../lib/gettext/tools/msginit.rb:264
 msgid "Please enter your email address"
 msgstr ""
 

data/po/zh/gettext.edit.po

@@ -40,7 +40,7 @@ msgstr ""
 msgid "Concatenates and merges PO files."
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:247 ../lib/gettext/tools/msgfmt.rb:86 ../lib/gettext/tools/msginit.rb:98 ../lib/gettext/tools/msgmerge.rb:368 ../lib/gettext/tools/xgettext.rb:247
+#: ../lib/gettext/tools/msgcat.rb:247 ../lib/gettext/tools/msgfmt.rb:86 ../lib/gettext/tools/msginit.rb:99 ../lib/gettext/tools/msgmerge.rb:368 ../lib/gettext/tools/xgettext.rb:247
 msgid "Specific options:"
 msgstr "具体选项："
 
@@ -154,70 +154,70 @@ msgstr "输出到指定文件"
 msgid "display version information and exit"
 msgstr "显示版本信息并退出"
 
-#: ../lib/gettext/tools/msginit.rb:94
+#: ../lib/gettext/tools/msginit.rb:95
 msgid "Create a new .po file from initializing .pot file with user's environment and input."
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:100
+#: ../lib/gettext/tools/msginit.rb:101
 msgid "Use INPUT as a .pot file. If INPUT is not specified, INPUT is a .pot file existing the current directory."
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:107
+#: ../lib/gettext/tools/msginit.rb:108
 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:114
+#: ../lib/gettext/tools/msginit.rb:115
 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:122
+#: ../lib/gettext/tools/msginit.rb:123
 msgid "Whether set translator information or not"
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:123
+#: ../lib/gettext/tools/msginit.rb:124
 msgid "(set)"
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:128
+#: ../lib/gettext/tools/msginit.rb:129
 msgid "Use NAME as translator name"
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:133
+#: ../lib/gettext/tools/msginit.rb:134
 msgid "Use EMAIL as translator email address"
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:137 ../lib/gettext/tools/msgmerge.rb:448
+#: ../lib/gettext/tools/msginit.rb:138 ../lib/gettext/tools/msgmerge.rb:448
 msgid "Display this help and exit"
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:142
+#: ../lib/gettext/tools/msginit.rb:143
 #, fuzzy
 msgid "Display version and exit"
 msgstr "显示版本信息并退出"
 
-#: ../lib/gettext/tools/msginit.rb:160
+#: ../lib/gettext/tools/msginit.rb:161
 msgid ".pot file does not exist in the current directory."
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:165
+#: ../lib/gettext/tools/msginit.rb:166
 #, fuzzy
 msgid "file '%s' does not exist."
 msgstr "文件'%s'已经存在。"
 
-#: ../lib/gettext/tools/msginit.rb:177
+#: ../lib/gettext/tools/msginit.rb:178
 msgid "Locale '%s' is invalid. Please check if your specified locale is usable."
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:187
+#: ../lib/gettext/tools/msginit.rb:193
 #, fuzzy
 msgid "file '%s' has already existed."
 msgstr "文件'%s'已经存在。"
 
-#: ../lib/gettext/tools/msginit.rb:229
+#: ../lib/gettext/tools/msginit.rb:235
 msgid "Please enter your full name"
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:258
+#: ../lib/gettext/tools/msginit.rb:264
 msgid "Please enter your email address"
 msgstr ""
 

data/po/zh_TW/gettext.edit.po

@@ -39,7 +39,7 @@ msgstr ""
 msgid "Concatenates and merges PO files."
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:247 ../lib/gettext/tools/msgfmt.rb:86 ../lib/gettext/tools/msginit.rb:98 ../lib/gettext/tools/msgmerge.rb:368 ../lib/gettext/tools/xgettext.rb:247
+#: ../lib/gettext/tools/msgcat.rb:247 ../lib/gettext/tools/msgfmt.rb:86 ../lib/gettext/tools/msginit.rb:99 ../lib/gettext/tools/msgmerge.rb:368 ../lib/gettext/tools/xgettext.rb:247
 msgid "Specific options:"
 msgstr "特殊選項:"
 
@@ -153,70 +153,70 @@ msgstr "輸出到指定檔案"
 msgid "display version information and exit"
 msgstr "秀出版本資訊後退出"
 
-#: ../lib/gettext/tools/msginit.rb:94
+#: ../lib/gettext/tools/msginit.rb:95
 msgid "Create a new .po file from initializing .pot file with user's environment and input."
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:100
+#: ../lib/gettext/tools/msginit.rb:101
 msgid "Use INPUT as a .pot file. If INPUT is not specified, INPUT is a .pot file existing the current directory."
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:107
+#: ../lib/gettext/tools/msginit.rb:108
 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:114
+#: ../lib/gettext/tools/msginit.rb:115
 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:122
+#: ../lib/gettext/tools/msginit.rb:123
 msgid "Whether set translator information or not"
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:123
+#: ../lib/gettext/tools/msginit.rb:124
 msgid "(set)"
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:128
+#: ../lib/gettext/tools/msginit.rb:129
 msgid "Use NAME as translator name"
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:133
+#: ../lib/gettext/tools/msginit.rb:134
 msgid "Use EMAIL as translator email address"
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:137 ../lib/gettext/tools/msgmerge.rb:448
+#: ../lib/gettext/tools/msginit.rb:138 ../lib/gettext/tools/msgmerge.rb:448
 msgid "Display this help and exit"
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:142
+#: ../lib/gettext/tools/msginit.rb:143
 #, fuzzy
 msgid "Display version and exit"
 msgstr "秀出版本資訊後退出"
 
-#: ../lib/gettext/tools/msginit.rb:160
+#: ../lib/gettext/tools/msginit.rb:161
 msgid ".pot file does not exist in the current directory."
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:165
+#: ../lib/gettext/tools/msginit.rb:166
 #, fuzzy
 msgid "file '%s' does not exist."
 msgstr "檔案 '%s' 已經存在"
 
-#: ../lib/gettext/tools/msginit.rb:177
+#: ../lib/gettext/tools/msginit.rb:178
 msgid "Locale '%s' is invalid. Please check if your specified locale is usable."
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:187
+#: ../lib/gettext/tools/msginit.rb:193
 #, fuzzy
 msgid "file '%s' has already existed."
 msgstr "檔案 '%s' 已經存在"
 
-#: ../lib/gettext/tools/msginit.rb:229
+#: ../lib/gettext/tools/msginit.rb:235
 msgid "Please enter your full name"
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:258
+#: ../lib/gettext/tools/msginit.rb:264
 msgid "Please enter your email address"
 msgstr ""
 

data/test/tools/test_msginit.rb

@@ -32,12 +32,10 @@ class TestToolsMsgInit < Test::Unit::TestCase
     stub(@msginit).revision_date {@po_revision_date}
 
     Locale.current = "ja_JP.UTF-8"
-  end
 
-  def run(*args, &blcok)
     Dir.mktmpdir do |dir|
       Dir.chdir(dir) do
-        super
+        yield
       end
     end
   end
@@ -51,6 +49,10 @@ class TestToolsMsgInit < Test::Unit::TestCase
     Locale.current.language
   end
 
+  def current_charset
+    Locale.current.charset
+  end
+
   def translator_name
     "me"
   end
@@ -59,6 +61,10 @@ class TestToolsMsgInit < Test::Unit::TestCase
     "me@example.com"
   end
 
+  def template_charset
+    "CHARSET"
+  end
+
   def create_pot_file(path, options=nil)
     options ||= {}
     File.open(path, "w") do |pot_file|
@@ -79,6 +85,7 @@ class TestToolsMsgInit < Test::Unit::TestCase
     options = default_po_header_options.merge(options)
     package_name = options[:package_name] || default_package_name
     have_plural_forms = options[:have_plural_forms] || true
+    charset = options[:charset] || "UTF-8"
     header = <<EOF
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
@@ -95,7 +102,7 @@ msgstr ""
 "Language: \\n"
 "Language-Team: LANGUAGE <LL@li.org>\\n"
 "MIME-Version: 1.0\\n"
-"Content-Type: text/plain; charset=UTF-8\\n"
+"Content-Type: text/plain; charset=#{charset}\\n"
 "Content-Transfer-Encoding: 8bit\\n"
 EOF
     if have_plural_forms
@@ -111,6 +118,7 @@ EOF
     name = options[:translator_name] || "FULL NAME"
     email = options[:translator_email] || "EMAIL@ADDRESS"
     language_name = Locale::Info.get_language(language).name
+    charset = options[:charset] || "UTF-8"
     plural_forms = @msginit.send(:plural_forms, language)
 
     <<EOF
@@ -128,7 +136,7 @@ msgstr ""
 "Language: #{locale}\\n"
 "Language-Team: #{language_name}\\n"
 "MIME-Version: 1.0\\n"
-"Content-Type: text/plain; charset=UTF-8\\n"
+"Content-Type: text/plain; charset=#{charset}\\n"
 "Content-Transfer-Encoding: 8bit\\n"
 "Plural-Forms: #{plural_forms}\\n"
 EOF
@@ -171,9 +179,11 @@ EOF
 
   class TestOutput < self
     def setup
-      super
-      @pot_file_path = "test.pot"
-      create_pot_file(@pot_file_path)
+      super do
+        @pot_file_path = "test.pot"
+        create_pot_file(@pot_file_path)
+        yield
+      end
     end
 
     def test_default
@@ -196,8 +206,8 @@ EOF
   end
 
   class TestLocale < self
-    def run_msginit(locale)
-      create_pot_file("test.pot")
+    def run_msginit(locale, pot_charset=nil)
+      create_pot_file("test.pot", charset: pot_charset)
       po_file_path = "output.po"
       @msginit.run("--output", po_file_path,
                    "--locale", locale)
@@ -224,6 +234,50 @@ EOF
       assert_equal(po_header(locale, language),
                    run_msginit("#{locale}.#{charset}"))
     end
+
+    def test_language_charset_with_template_charset
+      locale = "en"
+      assert_equal(po_header(locale, locale),
+                   run_msginit(locale, template_charset))
+    end
+
+    def test_language_region_with_template_charset
+      locale = "en_US"
+      language = "en"
+      assert_equal(po_header(locale, language),
+                   run_msginit(locale, template_charset))
+    end
+
+    def test_language_region_charset_with_template_charset
+      locale = "en_US"
+      language = "en"
+      charset = "UTF-8"
+      assert_equal(po_header(locale, language),
+                   run_msginit("#{locale}.#{charset}", template_charset))
+    end
+  end
+
+  class TestCurrentCharset < self
+    def run_msginit(pot_charset)
+      create_pot_file("test.pot", charset: pot_charset)
+      po_file_path = "output.po"
+      @msginit.run("--output", po_file_path)
+      File.read(po_file_path)
+    end
+
+    def po_header(options)
+      super(current_locale, current_language, options)
+    end
+
+    def test_template_charset
+      assert_equal(po_header(charset: current_charset),
+                   run_msginit(template_charset))
+    end
+
+    def test_no_template_charset
+      assert_equal(po_header(charset: "ASCII"),
+                   run_msginit("ASCII"))
+    end
   end
 
   class TestTranslator < self
@@ -313,8 +367,10 @@ EOF
 
   class TestPluralForms < self
     def setup
-      super
       omit("Red Datasets is required") unless defined?(Datasets::CLDRPlurals)
+      super do
+        yield
+      end
     end
 
     def run_msginit(pot_header_options={})