Permalink
Browse files

Ruby 1.9: use UTF-8 for default internal and external encodings.

  • Loading branch information...
1 parent 4e50a35 commit cf3ccd7be0caae67dfddf5bc5056dcfdaab6f369 @jeremy jeremy committed May 28, 2009
Showing with 9 additions and 3 deletions.
  1. +2 −0 railties/CHANGELOG
  2. +7 −3 railties/lib/initializer.rb
View
@@ -1,5 +1,7 @@
*Edge*
+* Ruby 1.9: use UTF-8 for default internal and external encodings. [Jeremy Kemper]
+
* Added db/seeds.rb as a default file for storing seed data for the database. Can be loaded with rake db:seed (or created alongside the db with db:setup). (This is also known as the "Stop Putting Gawd Damn Seed Data In Your Migrations" feature) [DHH]
@@ -426,10 +426,14 @@ def load_application_classes
# should override this behaviour and set the relevant +default_charset+
# on ActionController::Base.
#
- # For Ruby 1.9, this does nothing. Specify the default encoding in the Ruby
- # shebang line if you don't want UTF-8.
+ # For Ruby 1.9, UTF-8 is the default internal and external encoding.
def initialize_encoding
- $KCODE='u' if RUBY_VERSION < '1.9'
+ if RUBY_VERSION < '1.9'
+ $KCODE='u'
+ else
+ Encoding.default_internal = Encoding::UTF_8
+ Encoding.default_external = Encoding::UTF_8
+ end
end
# This initialization routine does nothing unless <tt>:active_record</tt>

0 comments on commit cf3ccd7

Please sign in to comment.