Permalink
Browse files

Update CHANGELOG for #504. Clarify charset alias comment.

  • Loading branch information...
1 parent c299cda commit 66efb3236c8aeade7851cdab98d01af1c19b7296 @jeremy jeremy committed Feb 10, 2013
Showing with 2 additions and 3 deletions.
  1. +1 −0 CHANGELOG.rdoc
  2. +1 −3 lib/mail/version_specific/ruby_1_9.rb
View
@@ -9,6 +9,7 @@ Features:
* Setting the html_ or text_part sets a default text/html or text/plain content type (jeremy)
* Setting the html_ or text_part to nil removes it (jeremy)
* Addresses without a parsable email or display name still format as their raw text (jeremy)
+* Close pull request 504 - Alias GB2312 charset to GB18030 Ruby encoding (bpot)
* Close pull request 399 - Accept :ca_path and :ca_file options for SMTP delivery (ndbroadbent)
* Close pull request 389 - Don't add superfluous message headers to MIME parts (djmaze, jeremy)
@@ -132,9 +132,7 @@ def Ruby19.pick_encoding(charset)
when 'shift-jis'
Encoding::Shift_JIS
- # Many encoded fields which self identify as GB2312 are
- # actually GB18030. Just use GB18030 since it is a superset
- # of GB2312.
+ # GB2312 (Chinese charset) is a subset of GB18030 (its replacement)
when /gb2312/i
Encoding::GB18030

0 comments on commit 66efb32

Please sign in to comment.