Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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
  • Loading branch information...
commit 3c006d428b3d3d306185f620cce3821b1bdb636f 1 parent be4ecc2
@NZKoz NZKoz authored
Showing with 1 addition and 1 deletion.
  1. +1 −1  activesupport/lib/active_support/inflector.rb
View
2  activesupport/lib/active_support/inflector.rb
@@ -277,7 +277,7 @@ def transliterate(string)
# 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

2 comments on commit 3c006d4

@whatcould

Hey there Koz, from here it looks like you might want to take a second look at that: vendor/rails/activesupport/lib/active_support/inflector.rb:280: syntax error, unexpected kELSIF, expecting kEND

@rails

Fixed.

Please sign in to comment.
Something went wrong with that request. Please try again.