kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merged r6023 from trunk. 

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

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@6026 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA 2011-06-09 03:51:23 +00:00
parent 17ed97d580
commit 113316cf1e
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/unit/lib/redmine/export/pdf_test.rb
View 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)