From a367732d4d213736291e8a7a6e6bd1f68f96a111 Mon Sep 17 00:00:00 2001 From: Toshi MARUYAMA Date: Thu, 9 Jun 2011 01:30:05 +0000 Subject: [PATCH] scm: fix JRuby tests fail in unit changeset following test. * test_invalid_utf8_sequences_in_paths_should_be_replaced git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6021 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- lib/redmine/codeset_util.rb | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/lib/redmine/codeset_util.rb b/lib/redmine/codeset_util.rb index 20156b827..945b3ea7b 100644 --- a/lib/redmine/codeset_util.rb +++ b/lib/redmine/codeset_util.rb @@ -11,6 +11,13 @@ module Redmine str = str.encode("US-ASCII", :invalid => :replace, :undef => :replace, :replace => '?').encode("UTF-8") 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 ic = Iconv.new('UTF-8', 'UTF-8') txtar = "" -- 2.39.5