From 17ed97d580ef2ca0902bfa40312144870d92b152 Mon Sep 17 00:00:00 2001 From: Toshi MARUYAMA Date: Thu, 9 Jun 2011 03:50:35 +0000 Subject: [PATCH] Merged r6022 from trunk. PDF: use SJIS instead of CP932 at unit pdf test test_rdm_pdf_iconv_cannot_convert_ja_cp932 in JRuby. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@6025 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- test/unit/lib/redmine/export/pdf_test.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/test/unit/lib/redmine/export/pdf_test.rb b/test/unit/lib/redmine/export/pdf_test.rb index 3c2c87ed9..59cae2092 100644 --- a/test/unit/lib/redmine/export/pdf_test.rb +++ b/test/unit/lib/redmine/export/pdf_test.rb @@ -38,7 +38,11 @@ class PdfTest < ActiveSupport::TestCase set_language_if_valid 'ja' assert_equal 'CP932', l(:general_pdf_encoding) if RUBY_VERSION < '1.9' - ic = Iconv.new(l(:general_pdf_encoding), 'UTF-8') + if RUBY_PLATFORM == 'java' + ic = Iconv.new("SJIS", 'UTF-8') + else + ic = Iconv.new(l(:general_pdf_encoding), 'UTF-8') + end end utf8_txt_1 = "\xe7\x8b\x80\xe6\x85\x8b" utf8_txt_2 = "\xe7\x8b\x80\xe6\x85\x8b\xe7\x8b\x80" -- 2.39.5