summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorSaito <saitowu@gmail.com>2011-12-29 11:51:33 +0800
committerSaito <saitowu@gmail.com>2011-12-29 11:52:28 +0800
commita25a85b9396cbc07bf2bfcd12d3c0a6685df66d6 (patch)
tree753393aee8de4de186679ee672d46beb270f9dbb /lib
parent6e5caa19856a683e5e9ead5cda907cb4119762d6 (diff)
downloadgitlab-ce-a25a85b9396cbc07bf2bfcd12d3c0a6685df66d6.tar.gz
merge charlock_holmes to master
Diffstat (limited to 'lib')
-rw-r--r--lib/utils.rb14
1 files changed, 6 insertions, 8 deletions
diff --git a/lib/utils.rb b/lib/utils.rb
index 2de14761444..8e5d4694cac 100644
--- a/lib/utils.rb
+++ b/lib/utils.rb
@@ -17,15 +17,13 @@ module Utils
end
module CharEncode
- def encode(string)
- return '' unless string
- cd = CharDet.detect(string)
- if cd.confidence > 0.6
- string.force_encoding(cd.encoding)
+ def encode(content)
+ content ||= ''
+ detection = CharlockHolmes::EncodingDetector.detect(content)
+ if hash = detection
+ content = CharlockHolmes::Converter.convert(content, hash[:encoding], 'UTF-8') if hash[:encoding]
end
- string.encode("utf-8", :undef => :replace, :replace => "?", :invalid => :replace)
- rescue
- "Invalid Encoding"
+ content
end
end