commit 2f4d892aaa51da20df9ebaaea24401e71d826321
parent e46eb6be10617eb75cbc426de82f9f7e49d921bc
Author: William Morgan <wmorgan-sup@masanjin.net>
Date: Tue, 15 Jan 2008 19:06:48 -0800
Merge branch 'master' into next
Conflicts:
lib/sup.rb
Diffstat:
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Rakefile b/Rakefile
@@ -20,7 +20,7 @@ Hoe.new('sup', version) do |p|
p.url = p.paragraphs_of('README.txt', 0).first.split(/\n/)[2].gsub(/^\s+/, "")
p.changes = p.paragraphs_of('History.txt', 0..0).join("\n\n")
p.email = "wmorgan-sup@masanjin.net"
- p.extra_deps = [['ferret', '>= 0.10.13'], ['ncurses', '>= 0.9.1'], ['rmail', '>= 0.17'], 'highline', 'net-ssh', ['trollop', '>= 1.7'], 'lockfile', 'mime-types']
+ p.extra_deps = [['ferret', '>= 0.10.13'], ['ncurses', '>= 0.9.1'], ['rmail', '>= 0.17'], 'highline', 'net-ssh', ['trollop', '>= 1.7'], 'lockfile', 'mime-types', 'gettext']
end
rule 'ss?.png' => 'ss?-small.png' do |t|
diff --git a/lib/sup.rb b/lib/sup.rb
@@ -3,6 +3,7 @@ require 'yaml'
require 'zlib'
require 'thread'
require 'fileutils'
+require 'gettext'
require 'curses'
class Object
@@ -225,9 +226,8 @@ module Redwood
module_function :log
end
-## determine encoding and character set. there MUST be a better way to
-## do this.
- $encoding = `locale -c LC_CTYPE|head -6|tail -1`.chomp
+## determine encoding and character set
+ $encoding = Locale.current.charset
if $encoding
Redwood::log "using character set encoding #{$encoding.inspect}"
else