Merge branch 'MONGOID-5336' of https://github.com/johnnyshields/mongoid into MONGOID-5336

Author: johnnyshields

lib/config/locales/en.yml

@@ -189,8 +189,8 @@ en:
           resolution: "When defining the field :%{name} on '%{klass}', please provide
             valid options for the field. These are currently: %{valid}. If you
             meant to define a custom field option, please do so first as follows:\n\n
-            \_\_Mongoid::Fields.configure do\n
-            \_\_\_\_option :%{option} do |model, field, value|\n
+            \_\_Mongoid.configure do |config|\n
+            \_\_\_\_config.define_field_option :%{option} do |model, field, value|\n
             \_\_\_\_\_\_# Your logic here...\n
             \_\_\_\_end\n
             \_\_end\n
@@ -601,8 +601,8 @@ en:
             nor defined in a custom field type mapping."
           resolution: "Please provide a known type value for the field. If you
             meant to define a custom field type, please do so first as follows:\n\n
-            \_\_Mongoid::Fields.configure do\n
-            \_\_\_\_define_type %{type_inspection}, YourTypeClass
+            \_\_Mongoid.configure do |config|\n
+            \_\_\_\_config.define_field_type %{type_inspection}, YourTypeClass
             \_\_end\n
             \_\_class %{klass}\n
             \_\_\_\_include Mongoid::Document\n