diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-05-26 07:06:13 -0700 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-05-26 07:06:13 -0700 |
| commit | 50e89373c5e0b6ad2878346286277666752497b6 (patch) | |
| tree | ed7cb2605023d05186ea8fd2b9c2845b8d526877 /activesupport/lib/active_support | |
| parent | ddaeb1105bae4946e915ff83713aa28b6df11560 (diff) | |
| parent | 7f02cabc374aa168e387639b44e5ce1a1968de6b (diff) | |
| download | rails-50e89373c5e0b6ad2878346286277666752497b6.tar.gz rails-50e89373c5e0b6ad2878346286277666752497b6.tar.bz2 rails-50e89373c5e0b6ad2878346286277666752497b6.zip | |
Merge pull request #10762 from vipulnsward/change_compatibility
compatability => compatibility
Diffstat (limited to 'activesupport/lib/active_support')
| -rw-r--r-- | activesupport/lib/active_support/multibyte/unicode.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/activesupport/lib/active_support/multibyte/unicode.rb b/activesupport/lib/active_support/multibyte/unicode.rb index f1dfff738c..04e6b71580 100644 --- a/activesupport/lib/active_support/multibyte/unicode.rb +++ b/activesupport/lib/active_support/multibyte/unicode.rb @@ -145,7 +145,7 @@ module ActiveSupport ncp << (HANGUL_TBASE + tindex) unless tindex == 0 decomposed.concat ncp # if the codepoint is decomposable in with the current decomposition type - elsif (ncp = database.codepoints[cp].decomp_mapping) and (!database.codepoints[cp].decomp_type || type == :compatability) + elsif (ncp = database.codepoints[cp].decomp_mapping) and (!database.codepoints[cp].decomp_type || type == :compatibility) decomposed.concat decompose(type, ncp.dup) else decomposed << cp @@ -263,9 +263,9 @@ module ActiveSupport when :c compose(reorder_characters(decompose(:canonical, codepoints))) when :kd - reorder_characters(decompose(:compatability, codepoints)) + reorder_characters(decompose(:compatibility, codepoints)) when :kc - compose(reorder_characters(decompose(:compatability, codepoints))) + compose(reorder_characters(decompose(:compatibility, codepoints))) else raise ArgumentError, "#{form} is not a valid normalization variant", caller end.pack('U*') |