mongoid 7.0.2 → 8.1.1

data/lib/config/locales/en.yml

@@ -1,4 +1,8 @@
 en:
+  errors:
+    messages:
+      taken: "has already been taken"
+
   mongoid:
     errors:
       messages:
@@ -7,16 +11,17 @@ en:
         message_title: "message"
         summary_title: "summary"
         resolution_title: "resolution"
+
         ambiguous_relationship:
-          message: "Ambiguous relations %{candidates} defined on %{klass}."
+          message: "Ambiguous associations %{candidates} defined on %{klass}."
           summary:
-            "When Mongoid attempts to set an inverse document of a relation
-            in memory, it needs to know which relation it belongs to. When
+            "When Mongoid attempts to set an inverse document of an association
+            in memory, it needs to know which association it belongs to. When
             setting %{name}, Mongoid looked on the class %{inverse}
-            for a matching relation, but multiples were found that could
+            for a matching association, but multiples were found that could
             potentially match: %{candidates}."
-          resolution: "On the %{name} relation on %{inverse} you must add an
-            :inverse_of option to specify the exact relationship on %{klass}
+          resolution: "On the %{name} association on %{inverse} you must add an
+            :inverse_of option to specify the exact association on %{klass}
             that is the opposite of %{name}."
         callbacks:
           message: "Calling %{method} on %{klass} resulted in a false return
@@ -26,6 +31,26 @@ en:
             since the document did not actually get saved."
           resolution: "Double check all before callbacks to make sure they are
             not unintentionally returning false."
+        create_collection_failure:
+          message: "Cannot create collection %{collection_name}
+            with options %{collection_options}. The following error was raised:
+            %{error}."
+          summary: "The server rejected createCollection command with given collection
+            options. This may happen when some of the options are invalid, or not
+            supported by your version of the server."
+          resolution: "Double check that collection options for the collection
+            %{collection_name} are valid. Consult with Ruby driver documentation
+            and MongoDB documentation if the desired options are supported by
+            your version of the server."
+        criteria_argument_required:
+          message: "Calling Criteria methods with nil arguments is not allowed."
+          summary: "Arguments to Criteria methods cannot be nil, and most
+            Criteria methods require at least one argument. Only logical
+            operations (and, or, nor and not), `all' and `where' can be called
+            without arguments.
+            The method that was called with nil argument was: %{query_method}."
+          resolution: "Invoke Criteria methods with non-nil arguments or omit
+            the respective invocations."
         calling_document_find_with_nil_is_invalid:
           message: "Calling Document.find with nil is invalid."
           summary: "Document.find expects the parameters to be 1 or more ids, and
@@ -34,6 +59,8 @@ en:
           resolution: "Most likely this is caused by passing parameters directly
             through to the find, and the parameter either is not present or the
             key from which it is accessed is incorrect."
+        destroy_restrict_with_error_dependencies_exist:
+          "is not empty and prevents the document from being destroyed"
         document_not_destroyed:
           message: "%{klass} with id %{id} was not destroyed."
           summary: "When calling %{klass}#destroy! and a callback halts the destroy
@@ -49,7 +76,7 @@ en:
             and the following ids were not found: %{missing}."
           resolution: "Search for an id that is in the database or set
             the Mongoid.raise_not_found_error configuration option to false,
-            which will cause a nil to be returned instead of raising this error when
+            which will cause nil to be returned instead of raising this error when
             searching for a single id, or only the matched documents when searching
             for multiples."
         document_with_attributes_not_found:
@@ -59,15 +86,35 @@ en:
             will be raised."
           resolution: "Search for attributes that are in the database or set
             the Mongoid.raise_not_found_error configuration option to false,
-            which will cause a nil to be returned instead of raising this error."
-        eager_load:
-          message: "Eager loading :%{name} is not supported since it is a
-            polymorphic belongs_to relation."
-          summary: "Mongoid cannot currently determine the classes it needs to
-            eager load when the relation is polymorphic. The parents reside in
-            different collections so a simple id lookup is not sufficient enough."
-          resolution: "Don't attempt to perform this action and have patience,
-            maybe this will be supported in the future."
+            which will cause nil to be returned instead of raising this error."
+        document_with_shard_key_not_found:
+          message: "Document not found for class %{klass} with id %{missing} and
+            shard key %{shard_key}."
+          summary: "When calling %{klass}.find with an id and a shard key, each
+            parameter must match a document in the database or this error will
+            be raised. The search was for the id: %{missing} with
+            shard_key: %{shard_key} and it was not found."
+          resolution: "Search for an id/shard key that is in the database or set
+            the Mongoid.raise_not_found_error configuration option to false,
+            which will cause nil to be returned instead of raising this error."
+        drop_collection_failure:
+          message: "Cannot drop collection %{collection_name}."
+          summary: "Mongoid tried to drop collection %{collection_name}, but the
+            collection still exists in the database."
+          resolution: "Try to drop the collection manually using Ruby driver or
+            mongo shell."
+        empty_config_file:
+          message: "Empty configuration file: %{path}."
+          summary: "Your mongoid.yml configuration file appears to be empty."
+          resolution: "Ensure your configuration file contains the correct contents.
+            Refer to: https://www.mongodb.com/docs/mongoid/current/reference/configuration/"
+        immutable_attribute:
+          message: "Attempted to change the immutable attribute '%{name}' with
+            the value: %{value}."
+          summary: "Immutable attributes can only have values set when the
+            document is a new record."
+          resolution: "Do not attempt to update the value of '%{name}' after
+            the document is persisted."
         invalid_collection:
           message: "Access to the collection for %{klass} is not allowed."
           summary: "%{klass}.collection was called, and %{klass} is an embedded
@@ -82,6 +129,20 @@ en:
             A collation option is only supported if the query is executed on a MongoDB server
             with version >= 3.4."
           resolution: "Remove the collation option from the query."
+        invalid_async_query_executor:
+          message: "Invalid async_query_executor option: %{executor}."
+          summary: "A invalid async query executor was specified.
+            The valid options are: %{options}."
+          resolution: "Pick an allowed option or fix the typo. If you were
+            expecting the option to be there, please consult the following page
+            with respect to Mongoid's configuration:\n\n
+            \_\_https://www.mongodb.com/docs/mongoid/current/reference/configuration/#mongoid-configuration-options"
+        invalid_config_file:
+          message: "Invalid configuration file: %{path}."
+          summary: "Your mongoid.yml configuration file does not contain the
+            correct file structure."
+          resolution: "Ensure your configuration file contains the correct contents.
+            Refer to: https://www.mongodb.com/docs/mongoid/current/reference/configuration/"
         invalid_config_option:
           message: "Invalid configuration option: %{name}."
           summary: "A invalid configuration option was provided in your
@@ -89,15 +150,52 @@ en:
             options are: %{options}."
           resolution: "Remove the invalid option or fix the typo. If you were
             expecting the option to be there, please consult the following page
-            with repect to Mongoid's configuration:\n\n
+            with respect to Mongoid's configuration:\n\n
             \_\_http://mongoid.org/en/mongoid/docs/installation.html"
         invalid_dependent_strategy:
           message: "Invalid dependent strategy: %{invalid_strategy}."
           summary: "An invalid dependent strategy was defined for the association:
             %{association}. The valid strategies are: %{valid_strategies}."
           resolution: "Change the dependent strategy to one of the valid types."
+        invalid_discriminator_key_target:
+          message: "Setting the discriminator key on a child class is not allowed."
+          summary: "The discriminator key on the class %{class_name} was attempted
+            to be changed. Changing the discriminator key on a child class is not
+            allowed."
+          resolution: "Try setting the discriminator key on %{superclass} or one of %{class_name}'s
+            ancestors."
+        invalid_dot_dollar_assignment:
+          message: "Cannot set the %{attr} attribute on the %{klass} class."
+          summary: "Calling the setters for fields that start with a dollar
+            sign ($) or contain a dot/period (.) is prohibited. See the
+            Mongoid documentation on Field Names with Dots/Periods (.) and
+            Dollar Signs ($) for more information."
+          resolution: "In order to set fields that start with a dollar
+            sign ($) or contain a dot/period (.), the aggregation pipeline can
+            be used. MongoDB provides specific operators for working with these
+            fields. Refer to the MongoDB documentation here:
+            https://www.mongodb.com/docs/manual/core/dot-dollar-considerations/"
+        invalid_elem_match_operator:
+          message: "Invalid $elemMatch operator '%{operator}'."
+          summary: "You misspelled an operator or are using an operator that
+            Mongoid does not support."
+          resolution: "Valid field operators are: %{valid_operators}.
+            Ensure you are using one of these operators."
+        invalid_estimated_count_criteria:
+          message: "Invalid criteria for estimated_count."
+          summary: "Estimated count is strictly a collection-level operation and cannot be called
+            on a filtered criteria."
+          resolution: "Try calling estimated_count directly on the class: %{class_name}.estimated_count.\n\n
+            \_If the class defines a default scope, use unscoped: %{class_name}.unscoped.estimated_count."
+        invalid_expression_operator:
+          message: "Invalid expression operator '%{operator}'."
+          summary: "You misspelled an operator, are using an operator that
+            Mongoid does not support, or are trying to use a field-level
+            operator on expression level."
+          resolution: "Valid expression operators are: %{valid_operators}.
+            Ensure you are using one of these operators."
         invalid_field:
-          message: "Defining a field named '%{name}' is not allowed."
+          message: "Defining a field named '%{field}' is not allowed."
           summary: "Defining this field would override the method '%{name}',
             which would cause issues with expectations around the original
             method and cause extremely hard to debug issues. The original
@@ -109,26 +207,49 @@ en:
             allowed, and don't use these names. These include names that also
             conflict with core Ruby methods on Object, Module, Enumerable, or
             included gems that inject methods into these or Mongoid internals."
+        invalid_field_operator:
+          message: "Invalid field operator '%{operator}'."
+          summary: "You misspelled an operator, are using an operator that
+            Mongoid does not support, or are trying to use an expression-level
+            operator on field level."
+          resolution: "Valid field operators are: %{valid_operators}.
+            Ensure you are using one of these operators."
         invalid_field_option:
           message: "Invalid option :%{option} provided for field :%{name}."
           summary: "Mongoid requires that you only provide valid options on each
-            field definition in order to prevent unexpected behaviour later on."
+            field definition in order to prevent unexpected behavior later on."
           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 like so:\n\n
+            meant to define a custom field option, please do so first as follows:\n\n
             \_\_Mongoid::Fields.option :%{option} do |model, field, value|\n
             \_\_\_\_# Your logic here...\n
             \_\_end\n
             \_\_class %{klass}\n
             \_\_\_\_include Mongoid::Document\n
             \_\_\_\_field :%{name}, %{option}: true\n
-            \_\_end\n\n"
+            \_\_end\n\n
+            Refer to:
+            https://www.mongodb.com/docs/mongoid/current/reference/fields/#custom-field-options"
+        invalid_field_type:
+          message: "Invalid field type %{type_inspection} for field '%{field}' on model '%{klass}'."
+          summary: "Model '%{klass}' defines a field '%{field}' with an unknown type value
+            %{type_inspection}."
+          resolution: "Please provide a valid type value for the field.
+            Refer to:
+            https://www.mongodb.com/docs/mongoid/current/reference/fields/#using-symbols-or-strings-instead-of-classes"
+        invalid_global_executor_concurrency:
+          message: "Invalid global_executor_concurrency option."
+          summary: "You set global_executor_concurrency while async_query_executor
+            option is not set to :global_thread_pool. The global_executor_concurrency is
+            allowed only for the global thread pool executor."
+          resolution: "Set global_executor_concurrency option to :global_thread_pool
+            or remove global_executor_concurrency option."
         invalid_includes:
           message: "Invalid includes directive: %{klass}.includes(%{args})"
           summary: "Eager loading in Mongoid only supports providing arguments
-            to %{klass}.includes that are the names of relations on the %{klass}."
+            to %{klass}.includes that are the names of associations on the %{klass}."
           resolution: "Ensure that each parameter passed to %{klass}.includes is
-            a valid name of a relation on the %{klass} model. These are: %{relations}."
+            a valid name of an association on the %{klass} model. These are: %{relations}."
         invalid_index:
           message: "Invalid index specification on %{klass}: %{spec}, %{options}"
           summary: "Indexes in Mongoid are defined as a hash of field name and
@@ -138,7 +259,6 @@ en:
             Valid options are:\n
             \_\_background: true|false\n
             \_\_database: 'database_name'\n
-            \_\_drop_dups: true|false\n
             \_\_name: 'index_name'\n
             \_\_sparse: true|false\n
             \_\_unique: true|false\n
@@ -157,7 +277,8 @@ en:
             \_\_language_override\n
             \_\_default_language\n
             \_\_collation\n
-            Valid types are: 1, -1, '2d', '2dsphere', 'geoHaystack', 'text', 'hashed'\n\n
+            \_\_wildcard_projection: { 'path.to.field.a': 1, 'path.to.field.b': 0 }\n
+            Valid types are: 1, -1, '2d', '2dsphere', 'geoHaystack (deprecated)', 'text', 'hashed'\n\n
             Example:\n
             \_\_class Band\n
             \_\_\_\_include Mongoid::Document\n
@@ -165,8 +286,8 @@ en:
             \_\_\_\_index({ location: '2d' }, { background: true })\n
             \_\_end\n\n"
         invalid_options:
-          message: "Invalid option :%{invalid} provided to relation :%{name}."
-          summary: "Mongoid checks the options that are passed to the relation
+          message: "Invalid option :%{invalid} provided to association :%{name}."
+          summary: "Mongoid checks the options that are passed to the association
             macros to ensure that no ill side effects occur by letting something
             slip by."
           resolution: "Valid options are: %{valid}, make sure these are the ones
@@ -179,7 +300,7 @@ en:
             root path assigned."
           resolution: "Most likely your embedded model, %{klass} is also
             referenced via a has_many from a root document in another
-            collection. Double check the relation definitions and fix any
+            collection. Double check the association definitions and fix any
             instances where embedded documents are improperly referenced
             from other collections."
         invalid_persistence_option:
@@ -189,8 +310,8 @@ en:
           resolution: "Valid options are: %{valid}, make sure these are the ones
              you are using."
         invalid_relation:
-          message: "Defining a relation named '%{name}' is not allowed."
-          summary: "Defining this relation would override the method '%{name}',
+          message: "Defining an association named '%{name}' is not allowed."
+          summary: "Defining this association would override the method '%{name}',
             which would cause issues with expectations around the original
             method and cause extremely hard to debug issues. The original
             method was defined in:\n
@@ -202,15 +323,15 @@ en:
             conflict with core Ruby methods on Object, Module, Enumerable, or
             included gems that inject methods into these or Mongoid internals."
         invalid_relation_option:
-          message: "Invalid relation option :%{option} for relation '%{name}' on class
+          message: "Invalid association option :%{option} for association '%{name}' on class
             %{klass}."
-          summary: "An invalid option was provided for a relation."
+          summary: "An invalid option was provided for an association."
           resolution: "Valid options are: %{valid_options}, make sure you use only those."
         invalid_scope:
           message: "Defining a scope of value %{value} on %{klass} is not
             allowed."
           summary: "Scopes in Mongoid must be procs that wrap criteria objects."
-          resolution: "Change the scope to be a proc wrapped critera.\n\n
+          resolution: "Change the scope to be a proc wrapped criteria.\n\n
             Example:\n
             \_\_class Band\n
             \_\_\_\_include Mongoid::Document\n
@@ -233,21 +354,15 @@ en:
         invalid_storage_options:
           message: "Invalid options passed to %{klass}.store_in: %{options}."
           summary: "The :store_in macro takes only a hash of parameters with
-            the keys :database, :collection, or :client."
+            the keys :database, :collection, :collection_options, or :client."
           resolution: "Change the options passed to store_in to match the
             documented API, and ensure all keys in the options hash are
             symbols.\n\n
             Example:\n
             \_\_class Band\n
             \_\_\_\_include Mongoid::Document\n
-            \_\_\_\_store_in collection: 'artists', database: 'secondary'\n
+            \_\_\_\_store_in collection: 'artists', database: 'music'\n
             \_\_end\n\n"
-        invalid_storage_parent:
-          message: "Invalid store_in call on class %{klass}."
-          summary: "The :store_in macro can only be called on a base Mongoid Document"
-          resolution: "Remove the store_in call on class %{klass}, as it will use its
-            parent store configuration. Or remove the hierarchy extension for this
-            class."
         invalid_time:
           message: "'%{value}' is not a valid Time."
           summary: "Mongoid tries to serialize the values for Date, DateTime, and
@@ -261,43 +376,39 @@ en:
           message: "When adding a(n) %{klass} to %{base}#%{name}, Mongoid could
             not determine the inverse foreign key to set. The attempted key was
             '%{inverse}'."
-          summary: "When adding a document to a relation, Mongoid attempts
-            to link the newly added document to the base of the relation in
+          summary: "When adding a document to an association, Mongoid attempts
+            to link the newly added document to the base of the association in
             memory, as well as set the foreign key to link them on the
             database side. In this case Mongoid could not determine what the
             inverse foreign key was."
           resolution: "If an inverse is not required, like a belongs_to or
             has_and_belongs_to_many, ensure that :inverse_of => nil is set
-            on the relation. If the inverse is needed, most likely the
-            inverse cannot be figured out from the names of the relations and
-            you will need to explicitly tell Mongoid on the relation what
+            on the association. If the inverse is needed, most likely the
+            inverse cannot be figured out from the names of the associations and
+            you will need to explicitly tell Mongoid on the association what
             the inverse is.\n\n
             Example:\n
-            \_\_class Lush\n
+            \_\_class Car\n
             \_\_\_\_include Mongoid::Document\n
-            \_\_\_\_has_one :whiskey, class_name: \"Drink\", inverse_of: :alcoholic\n
+            \_\_\_\_has_one :engine, class_name: \"Motor\", inverse_of: :machine\n
             \_\_end\n\n
-            \_\_class Drink\n
+            \_\_class Motor\n
             \_\_\_\_include Mongoid::Document\n
-            \_\_\_\_belongs_to :alcoholic, class_name: \"Lush\", inverse_of: :whiskey\n
+            \_\_\_\_belongs_to :machine, class_name: \"Car\", inverse_of: :engine\n
             \_\_end"
         invalid_set_polymorphic_relation:
           message: "The %{name} attribute can't be set to an instance of
-            %{other_klass} as %{other_klass} has multiple relations referencing
+            %{other_klass} as %{other_klass} has multiple associations referencing
             %{klass} as %{name}."
-          summary: "If the parent class of a polymorphic relation has multiple
-            definitions for the same relation, the values must be set from the
+          summary: "If the parent class of a polymorphic association has multiple
+            definitions for the same association, the values must be set from the
             parent side and not the child side since Mongoid cannot determine
-            from the child side which relation to go in."
-          resolution: "Set the values from the parent, or redefine the relation
+            from the child side which association to go in."
+          resolution: "Set the values from the parent, or redefine the association
             with only a single definition in the parent."
-        invalid_value:
-          message: "Value of type %{value_class} cannot be written to a field of type %{field_class}"
-          summary: "Tried to set a value of type %{value_class} to a field of type %{field_class}"
-          resolution: "Verify if the value to be set correspond to field definition"
         mixed_relations:
           message: "Referencing a(n) %{embedded} document from the %{root}
-            document via a relational association is not allowed since the
+            document via a non-embedded association is not allowed since the
             %{embedded} is embedded."
           summary: "In order to properly access a(n) %{embedded} from %{root}
             the reference would need to go through the root document of
@@ -317,15 +428,15 @@ en:
           resolution: "Provide either only a uri as configuration or only
             standard options."
         nested_attributes_metadata_not_found:
-          message: "Could not find metadata for relation '%{name}' on model:
+          message: "Could not find metadata for association '%{name}' on model:
             %{klass}."
-          summary: "When defining nested attributes for a relation, Mongoid
-            needs to access the metadata for the relation '%{name}' in order
+          summary: "When defining nested attributes for an association, Mongoid
+            needs to access the metadata for the association '%{name}' in order
             if add autosave functionality to it, if applicable. Either no
-            relation named '%{name}' could be found, or the relation had not
+            association named '%{name}' could be found, or the association had not
             been defined yet."
-          resolution: "Make sure that there is a relation defined named
-            '%{name}' on %{klass} or that the relation definition comes before
+          resolution: "Make sure that there is an association defined named
+            '%{name}' on %{klass} or that the association definition comes before
             the accepts_nested_attributes_for macro in the model - order
             matters so that Mongoid has access to the metadata.\n\n
             Example:\n
@@ -346,17 +457,23 @@ en:
             \_\_\_\_\_\_default:\n
             \_\_\_\_\_\_\_\_hosts:\n
             \_\_\_\_\_\_\_\_\_\_- localhost:27017\n\n"
+        no_documents_found:
+          message: "Could not find a document of class %{klass}."
+          summary: "Mongoid attempted to find a document of the class %{klass}
+            but none exist."
+          resolution: "Create a document of class %{klass} or use a finder
+            method that does not raise an exception when no documents are
+            found."
         no_environment:
           message: "Could not load the configuration since no environment
             was defined."
-          summary: "Mongoid attempted to find the appropriate environment
-            but no Rails.env, Sinatra::Base.environment, RACK_ENV, or
-            MONGOID_ENV could be found."
-          resolution: "Make sure some environment is set from the mentioned
-            options. Mongoid cannot load configuration from the yaml without
-            knowing which environment it is in, and we have considered
-            defaulting to development an undesireable side effect of this not
-            being defined."
+          summary: "Mongoid could not determine the environment to use because
+            it was not specified in any of the following locations:
+            Rails.env, Sinatra::Base.environment,
+            ENV[\"RACK_ENV\"], ENV[\"MONGOID_ENV\"]. Without knowing the
+            environment, Mongoid cannot load its configuration."
+          resolution: "Please ensure an environment is set in one of the
+            listed locations. The environment must be explicitly set."
         no_map_reduce_output:
           message: "No output location was specified for the map/reduce
             operation."
@@ -373,16 +490,16 @@ en:
             \_\_reduce:  'collection-name'\n\n"
         no_metadata:
           message: "Metadata not found for document of type %{klass}."
-          summary: "Mongoid sets the metadata of a relation on the document
-            when it is either loaded from within the relation, or added to
+          summary: "Mongoid sets the metadata of an association on the document
+            when it is either loaded from within the association, or added to
             one. The presence of the metadata is required in order to
-            provide various functionality around relations. Most likely you
+            provide various functionality around associations. Most likely you
             are getting this error because the document is embedded and was
             attempted to be persisted without being associated with a parent,
-            or the relation was not properly defined."
-          resolution: "Ensure that your relations on the %{klass} model
-            are all properly defined, and that the inverse relations
-            are also properly defined. Embedded relations must have both the
+            or the association was not properly defined."
+          resolution: "Ensure that your associations on the %{klass} model
+            are all properly defined, and that the inverse associations
+            are also properly defined. Embedded associations must have both the
             parent (embeds_one/embeds_many) and the inverse (embedded_in)
             present in order to work properly."
         no_parent:
@@ -393,9 +510,9 @@ en:
             most likely caused by either calling %{klass}.create or
             %{klass}.create! without setting the parent document as an
             attribute."
-          resolution: "Ensure that you've set the parent relation if
+          resolution: "Ensure that you've set the parent association if
             instantiating the embedded document directly, or always create new
-            embedded documents via the parent relation."
+            embedded documents via the parent association."
         no_client_config:
           message: "No configuration could be found for a client named
             '%{name}'."
@@ -405,7 +522,7 @@ en:
             to connect."
           resolution: "Double check your mongoid.yml to make sure under the
             clients key that a configuration exists for '%{name}'. If you
-            have set the configuration programatically, ensure that '%{name}'
+            have set the configuration programmatically, ensure that '%{name}'
             exists in the configuration hash."
         no_clients_config:
           message: "No clients configuration provided."
@@ -461,9 +578,8 @@ en:
           resolution: "Don't define '%{name}' as readonly, or do not attempt
             to update its value after the document is persisted."
         readonly_document:
-          message: "Attempted to persist the readonly document '%{klass}'."
-          summary: "Documents loaded from the database using #only
-            cannot be persisted."
+          message: "Attempted to persist a readonly document of class '%{klass}'."
+          summary: "Documents that are marked readonly cannot be persisted."
           resolution: "Don't attempt to persist documents that are flagged as
             readonly."
         scope_overwrite:
@@ -483,11 +599,9 @@ en:
             server versions 3.6 and higher."
           resolution: "Verify that all servers in your deployment are at least
             version 3.6 or don't attempt to use sessions with older server versions."
-        taken:
-          "is already taken"
         too_many_nested_attribute_records:
           message: "Accepting nested attributes for %{association} is limited
-            to %{limit} records."
+            to %{limit} documents."
           summary: "More documents were sent to be processed than the allowed
             limit."
           resolution: "The limit is set as an option to the macro, for example:
@@ -497,24 +611,25 @@ en:
         unknown_attribute:
           message: "Attempted to set a value for '%{name}' which is not
             allowed on the model %{klass}."
-          summary: "Without including Mongoid::Attributes::Dynamic in your model
-            and the attribute does not already exist in the attributes hash,
-            attempting to call %{klass}#%{name}= for it is not allowed. This is
-            also triggered by passing the attribute to any method that accepts an
-            attributes hash, and is raised instead of getting a NoMethodError."
-          resolution: "You can include Mongoid::Attributes::Dynamic if you
-            expect to be writing values for undefined fields often."
+          summary: "%{klass}#%{name}= was called but there is no '%{name}'
+            field defined in the model, and Mongoid::Attributes::Dynamic is
+            not included. This error is also raised instead of NoMethodError
+            if the unknown attribute is passed to any method that accepts an
+            attributes hash, such as #attributes=."
+          resolution: "Define the field '%{name}' in %{klass}, or include
+            Mongoid::Attributes::Dynamic in %{klass} if you intend to
+            store values in fields that are not explicitly defined."
         unknown_model:
-          message: "Attempted to instantiate an object of the unknown Model '%{klass}'."
+          message: "Attempted to instantiate an object of the unknown model '%{klass}'."
           summary: "A document with the value '%{value}' at the key '_type' was used to
             instantiate a model object but Mongoid cannot find this Class."
           resolution: "The _type field is a reserved one used by Mongoid to determine the
             class for instantiating an object. Please don't save data in this field or ensure
-            that any values in this field correspond to valid Models."
+            that any values in this field correspond to valid models."
         unsaved_document:
           message: "Attempted to save %{document} before the parent %{base}."
           summary: "You cannot call create or create! through the
-            relation (%{document}) whose parent (%{base}) is
+            association (%{document}) whose parent (%{base}) is
             not already saved. This would cause the database to be out of sync
             since the child could potentially reference a nonexistent parent."
           resolution: "Make sure to only use create or create! when the parent
@@ -526,16 +641,16 @@ en:
             #where criterion on embedded documents. Since %{klass} is embedded,
             the expression %{javascript} is not allowed."
           resolution: "Please provide a standard hash to #where when the criteria
-            is for an embedded relation."
+            is for an embedded association."
         validations:
           message: "Validation of %{document} failed."
           summary: "The following errors were found: %{errors}"
           resolution: "Try persisting the document with valid data or remove
             the validations."
         delete_restriction:
-          message: "Cannot delete %{document} because of dependent '%{relation}'."
-          summary: "When defining '%{relation}' with a :dependent => :restrict,
-            Mongoid will raise an error when attempting to delete the
+          message: "Cannot destroy %{document} because of dependent '%{relation}'."
+          summary: "When defining '%{relation}' with a :dependent => :restrict_with_error,
+            Mongoid will raise an error when attempting to destroy the
             %{document} when the child '%{relation}' still has documents in it."
           resolution: "Don't attempt to delete the parent %{document} when
-            it has children, or change the dependent option on the relation."
+            it has children, or change the dependent option on the association."