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

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
This commit is contained in:
Toshi MARUYAMA 2011-06-09 03:50:35 +00:00
parent 19c52bc671
commit 17ed97d580
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

@ -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"