]> source.dussan.org Git - redmine.git/commitdiff
PDF: use SJIS instead of CP932 at unit pdf test test_rdm_pdf_iconv_invalid_utf8_shoul...
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>
Thu, 9 Jun 2011 01:57:06 +0000 (01:57 +0000)
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>
Thu, 9 Jun 2011 01:57:06 +0000 (01:57 +0000)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6023 e93f8b46-1217-0410-a6f0-8f06a7374b81

test/unit/lib/redmine/export/pdf_test.rb

index 59cae2092bce72bea06f1005cb82df3a1fd9efd5..acb46ca69a4265b0942e04f2c15f10f764a8bf19 100644 (file)
@@ -95,7 +95,11 @@ class PdfTest < ActiveSupport::TestCase
     str1.force_encoding("UTF-8") if str1.respond_to?(:force_encoding)
     str2.force_encoding("ASCII-8BIT") if str2.respond_to?(:force_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
     txt_1 = Redmine::Export::PDF::RDMPdfEncoding::rdm_pdf_iconv(ic, str1)
     txt_2 = Redmine::Export::PDF::RDMPdfEncoding::rdm_pdf_iconv(ic, str2)