Merged r6013 from trunk.

PDF: use SJIS instead of CP932 at unit pdf test_fix_text_encoding_nil in JRuby.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@6017 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA 2011-06-08 23:53:42 +00:00
parent 006c82267e
commit d15de8ee12
1 changed files with 6 additions and 2 deletions

View File

@ -24,8 +24,12 @@ class PdfTest < ActiveSupport::TestCase
def test_fix_text_encoding_nil
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_VERSION < '1.9'
if RUBY_PLATFORM == 'java'
ic = Iconv.new("SJIS", 'UTF-8')
else
ic = Iconv.new(l(:general_pdf_encoding), 'UTF-8')
end
end
assert_equal '', Redmine::Export::PDF::RDMPdfEncoding::rdm_pdf_iconv(ic, nil)
end