Merge remote-tracking branch 'upstream/pull/5135'

[rails.git] / config / initializers / inflections.rb

diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb
index 3a842d7d59b3a7369412ef7ccb6f5ab6d192526d..3860f659ead02224f524351d612cd92aefcd5d8b 100644 (file)
--- a/config/initializers/inflections.rb
+++ b/config/initializers/inflections.rb
@@ -3,9 +3,14 @@
 # Add new inflection rules using the following format. Inflections
 # are locale specific, and you may define rules for as many different
 # locales as you wish. All of these examples are active by default:
 # Add new inflection rules using the following format. Inflections
 # are locale specific, and you may define rules for as many different
 # locales as you wish. All of these examples are active by default:

-ActiveSupport::Inflector.inflections(:en) do |inflect|
-  inflect.acronym "GPX"
-  inflect.acronym "ID"
-  inflect.acronym "OSM"
-  inflect.acronym "UTF8"
-end
+# ActiveSupport::Inflector.inflections(:en) do |inflect|
+#   inflect.plural /^(ox)$/i, "\\1en"
+#   inflect.singular /^(ox)en/i, "\\1"
+#   inflect.irregular "person", "people"
+#   inflect.uncountable %w( fish sheep )
+# end
+
+# These inflection rules are supported but not enabled by default:
+# ActiveSupport::Inflector.inflections(:en) do |inflect|
+#   inflect.acronym "RESTful"
+# end