Get rid of the encode test and iconv fallback
parent
afe5bb54c3
commit
a004c72068
|
@ -366,20 +366,11 @@ module Text
|
||||||
end
|
end
|
||||||
|
|
||||||
#
|
#
|
||||||
# Converts ISO-8859-1 to UTF-8
|
# Converts US-ASCII and ISO-8859-1 to UTF-8, skipping over
|
||||||
|
# any characters which don't convert cleanly.
|
||||||
#
|
#
|
||||||
def self.to_utf8(str)
|
def self.to_utf8(str)
|
||||||
|
str.encode('utf-8', { :invalid => :replace, :undef => :replace, :replace => '' })
|
||||||
if str.respond_to?(:encode)
|
|
||||||
# Skip over any bytes that fail to convert to UTF-8
|
|
||||||
return str.encode('utf-8', { :invalid => :replace, :undef => :replace, :replace => '' })
|
|
||||||
end
|
|
||||||
|
|
||||||
begin
|
|
||||||
Iconv.iconv("utf-8","iso-8859-1", str).join(" ")
|
|
||||||
rescue
|
|
||||||
raise ::RuntimeError, "Your installation does not support iconv (needed for utf8 conversion)"
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
#
|
#
|
||||||
|
|
Loading…
Reference in New Issue