aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--date_locale.rb8
1 files changed, 5 insertions, 3 deletions
diff --git a/date_locale.rb b/date_locale.rb
index e3f1b71..4ab9b4d 100644
--- a/date_locale.rb
+++ b/date_locale.rb
@@ -183,9 +183,11 @@ module Date_locale
#
#What's the better solution? Check for locale, or check for the method :language?
#
- if defined?( Locale ) and lang.is_a?(Locale::TagList)
- #~ if lang.respond_to?(:language)
- Date_locale.set_target_encoding( lang.charset )
+ #if defined?( Locale ) and lang.is_a?(Locale::TagList)
+ if lang.respond_to?(:language)
+ if lang.respond_to?(:charset) && lang.charset != nil
+ Date_locale.set_target_encoding( lang.charset )
+ end
return lang.language.to_sym
end