From 545e1fe086c2df69ebf45c6b2f6a61932a5b6637 Mon Sep 17 00:00:00 2001
From: telyn <telyn@bytemark.co.uk>
Date: Wed, 24 Jan 2018 12:58:35 +0000
Subject: rip out the require 'locale'

---
 lib/mauve/sender.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'lib/mauve/sender.rb')

diff --git a/lib/mauve/sender.rb b/lib/mauve/sender.rb
index e6cc4dd..29c085b 100644
--- a/lib/mauve/sender.rb
+++ b/lib/mauve/sender.rb
@@ -1,11 +1,11 @@
 # encoding: UTF-8
 require 'ipaddr'
 require 'socket'
-begin
-  require 'locale'
-rescue LoadError
+#begin
+#  require 'locale'
+#rescue LoadError
   # Do nothing -- these are bonus libraries :)
-end
+#end
 
 require 'mauve/mauve_resolv'
 require 'mauve/mauve_time'
-- 
cgit v1.2.1


From a3372ff012444a5c330e0f6865851462bcfcea01 Mon Sep 17 00:00:00 2001
From: telyn <telyn@bytemark.co.uk>
Date: Mon, 29 Jan 2018 14:33:09 +0000
Subject: remove all mention of Locale

---
 lib/mauve/sender.rb | 12 ------------
 1 file changed, 12 deletions(-)

(limited to 'lib/mauve/sender.rb')

diff --git a/lib/mauve/sender.rb b/lib/mauve/sender.rb
index 29c085b..7a965ab 100644
--- a/lib/mauve/sender.rb
+++ b/lib/mauve/sender.rb
@@ -1,11 +1,6 @@
 # encoding: UTF-8
 require 'ipaddr'
 require 'socket'
-#begin
-#  require 'locale'
-#rescue LoadError
-  # Do nothing -- these are bonus libraries :)
-#end
 
 require 'mauve/mauve_resolv'
 require 'mauve/mauve_time'
@@ -152,13 +147,6 @@ module Mauve
       # `nil` doesn't work.
       update.replace ||= false
 
-      #
-      # Check the locale charset.  This is to maximise the amout of information
-      # mauve receives, rather than provide proper sanitized data for the server.
-      #
-      from_charset = (Locale.current.charset || Locale.charset) if defined?(Locale)
-      from_charset ||= "UTF-8"
-
       #
       #
       #
-- 
cgit v1.2.1