@@ -277,7 +277,7 @@ module ActiveSupport # The iconv transliteration code doesn't function correctly # on some platforms, but it's very fast where it does function. - if "foo" != Inflector.transliterate("föö") + elsif "foo" != (Inflector.transliterate("föö") rescue nil) undef_method :transliterate def transliterate(string) string.mb_chars.normalize(:kd). # Decompose accented characters activesupport/lib/active_support/inflector.rb be4ecc2e64cee529922f5cc5a49c56e444e5d869 Michael Koziarski michael@koziarski.com http://github.com/rails/rails/commit/3c006d428b3d3d306185f620cce3821b1bdb636f 3c006d428b3d3d306185f620cce3821b1bdb636f 2009-02-05T16:34:16-08:00 2009-02-05T16:34:00-08:00 Handle every error that can come out of the Iconv branch by rescuing and returning nil [#1195 state:committed] Conflicts: activesupport/lib/active_support/inflector.rb c57cbfbb7f1eb9f04b6acd16a18ee0b107a005f5 Michael Koziarski michael@koziarski.com