Merge r6021 from trunk (#8825).
scm: fix JRuby tests fail in unit changeset following test. * test_invalid_utf8_sequences_in_paths_should_be_replaced Following Subversion functional tests fail on Japanese Windows + JRuby 1.6.2 (ruby-1.8.7-p330). * test_directory_diff * test_revision_diff git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@6453 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
parent
90f83db148
commit
2302955bc5
@ -11,6 +11,13 @@ module Redmine
|
|||||||
str = str.encode("US-ASCII", :invalid => :replace,
|
str = str.encode("US-ASCII", :invalid => :replace,
|
||||||
:undef => :replace, :replace => '?').encode("UTF-8")
|
:undef => :replace, :replace => '?').encode("UTF-8")
|
||||||
end
|
end
|
||||||
|
elsif RUBY_PLATFORM == 'java'
|
||||||
|
begin
|
||||||
|
ic = Iconv.new('UTF-8', 'UTF-8')
|
||||||
|
str = ic.iconv(str)
|
||||||
|
rescue
|
||||||
|
str = str.gsub(%r{[^\r\n\t\x20-\x7e]}, '?')
|
||||||
|
end
|
||||||
else
|
else
|
||||||
ic = Iconv.new('UTF-8', 'UTF-8')
|
ic = Iconv.new('UTF-8', 'UTF-8')
|
||||||
txtar = ""
|
txtar = ""
|
||||||
|
Loading…
x
Reference in New Issue
Block a user