diff options
| author | Yuji Yaginuma <yuuji.yaginuma@gmail.com> | 2017-11-22 11:13:39 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-22 11:13:39 +0900 |
| commit | 858baa099b26f6b3e9eb8376d9c09559fe5cc599 (patch) | |
| tree | 818bd1c171b77c75ec1420b8601bd47e1b604322 /railties/lib/rails | |
| parent | 4d5f0bb30b5ac76407c9864b83b69b8a83ac3dd6 (diff) | |
| parent | 424debb096c670404428141b13de2af0185c9675 (diff) | |
| download | rails-858baa099b26f6b3e9eb8376d9c09559fe5cc599.tar.gz rails-858baa099b26f6b3e9eb8376d9c09559fe5cc599.tar.bz2 rails-858baa099b26f6b3e9eb8376d9c09559fe5cc599.zip | |
Merge pull request #29887 from willnet/generator-suggestion-locale
Fix generator suggestion raise error when I18n.available_locales don’t include :en
Diffstat (limited to 'railties/lib/rails')
| -rw-r--r-- | railties/lib/rails/generators.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/railties/lib/rails/generators.rb b/railties/lib/rails/generators.rb index 5592e8d78e..6c9c109f17 100644 --- a/railties/lib/rails/generators.rb +++ b/railties/lib/rails/generators.rb @@ -274,8 +274,9 @@ module Rails else options = sorted_groups.flat_map(&:last) suggestions = options.sort_by { |suggested| levenshtein_distance(namespace.to_s, suggested) }.first(3) + suggestions.map! { |s| "'#{s}'" } msg = "Could not find generator '#{namespace}'. ".dup - msg << "Maybe you meant #{ suggestions.map { |s| "'#{s}'" }.to_sentence(last_word_connector: " or ", locale: :en) }\n" + msg << "Maybe you meant #{ suggestions[0...-1].join(', ')} or #{suggestions[-1]}\n" msg << "Run `rails generate --help` for more options." puts msg end |