msginit: Replace charset in Content-type with charset in locale

`getext` is generated with `charset=CHARSET`.
Translation as is will result in an error because `CHARSET` is an invalid value.

Changed so that `charset=CHARSET` is replaced by the locale's charset.

Author: abetomo

lib/gettext/po_parser.rb

@@ -8,7 +8,7 @@
 
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.7.1
+# This file is automatically generated by Racc 1.5.1
 # from Racc grammar file "".
 #
 
@@ -164,7 +164,7 @@ def on_comment(comment)
     if comment.start_with?(POFormat::FLAG_MARK)
       content = comment[POFormat::FLAG_MARK.size..-1]
       flags = parse_flags_line(content)
-      @fuzzy = true if flags.include?("fuzzy")
+      @fuzzy = flags.include?("fuzzy")
     end
     if @data.instance_of?(PO)
       if comment == "#"
@@ -350,7 +350,6 @@ def clear
   racc_shift_n,
   racc_reduce_n,
   racc_use_result_var ]
-Ractor.make_shareable(Racc_arg) if defined?(Ractor)
 
 Racc_token_to_s_table = [
   "$end",
@@ -372,7 +371,6 @@ def clear
   "plural_message",
   "msgstr_plural",
   "msgstr_plural_line" ]
-Ractor.make_shareable(Racc_token_to_s_table) if defined?(Ractor)
 
 Racc_debug_parser = true
 

lib/gettext/tools/msginit.rb

@@ -62,6 +62,7 @@ def initialize
         @output_file = nil
         @locale = nil
         @language = nil
+        @charset = nil
         @entry = nil
         @comment = nil
         @translator = nil
@@ -180,6 +181,11 @@ def validate
         end
         @locale = language_tag.to_simple.to_s
         @language = language_tag.language
+        if language_tag.respond_to?(:charset)
+          @charset = language_tag.charset
+        else
+          @charset = Locale.charset
+        end
 
         @output_file ||= "#{@locale}.po"
         if File.exist?(@output_file)
@@ -280,6 +286,7 @@ def replace_entry
         replace_pot_revision_date
         replace_language
         replace_plural_forms
+        replace_charset
       end
 
       def replace_comment
@@ -325,6 +332,14 @@ def replace_plural_forms
         end
       end
 
+      CONTENT_TYPE_CHARSET = /(Content-Type: .+ charset=)CHARSET/
+
+      def replace_charset
+        if CONTENT_TYPE_CHARSET =~ @entry
+          @entry = @entry.gsub(CONTENT_TYPE_CHARSET, "\\1#{@charset}")
+        end
+      end
+
       def plural_forms(language)
         converter = CLDRPluralsConverter.new(language)
         converter.convert

test/po/ja/_.po

@@ -69,8 +69,9 @@ msgstr ""
 msgid "#"
 msgstr ""
 
-msgid "\taaa'bbb\\ccc"
-msgstr ""
+#, fuzzy
+msgid "\\taaa'bbb\\ccc"
+msgstr "AAA"
 
 msgid ""
 "Here document1\n"

test/tools/test_msginit.rb

@@ -77,6 +77,7 @@ 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
+    charset = options[:charset] || "UTF-8"
     header = <<EOF
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
@@ -93,7 +94,7 @@ def pot_header(options)
 "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
@@ -109,6 +110,7 @@ def po_header(locale, language, options={})
     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
@@ -126,7 +128,7 @@ def po_header(locale, language, options={})
 "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
@@ -196,8 +198,8 @@ def test_specify_option
   end
 
   class TestLocale < self
-    def run_msginit(locale)
-      create_pot_file("test.pot")
+    def run_msginit(locale, charset = "UTF-8")
+      create_pot_file("test.pot", :charset => charset)
       po_file_path = "output.po"
       @msginit.run("--output", po_file_path,
                    "--locale", locale)
@@ -224,6 +226,50 @@ def test_language_region_charset
       assert_equal(po_header(locale, language),
                    run_msginit("#{locale}.#{charset}"))
     end
+
+    def test_language_charset_with_replace_content_type
+      locale = "en"
+      assert_equal(po_header(locale, locale),
+                   run_msginit(locale, "CHARSET"))
+    end
+
+    def test_language_region_with_replace_content_type
+      locale = "en_US"
+      language = "en"
+      assert_equal(po_header(locale, language),
+                   run_msginit(locale, "CHARSET"))
+    end
+
+    def test_language_region_charset_with_replace_content_type
+      locale = "en_US"
+      language = "en"
+      charset = "UTF-8"
+      assert_equal(po_header(locale, language),
+                   run_msginit("#{locale}.#{charset}", "CHARSET"))
+    end
+  end
+
+  class TestCurrentCharset < self
+    def run_msginit(charset)
+      create_pot_file("test.pot", :charset => 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_change
+        assert_equal(po_header(:charset => "UTF-8"),
+                     run_msginit("CHARSET"))
+    end
+
+    def test_not_change
+        assert_equal(po_header(:charset => "ASCII"),
+                     run_msginit("ASCII"))
+    end
   end
 
   class TestTranslator < self