diff --git a/core/modules/field/field.install b/core/modules/field/field.install
index 1d18b4b..ce5c432 100644
--- a/core/modules/field/field.install
+++ b/core/modules/field/field.install
@@ -2,7 +2,7 @@
/**
* @file
- * Install, update and uninstall functions for the field module.
+ * Install, update, and uninstall functions for the Field module.
*/
/**
@@ -45,17 +45,13 @@ function field_update_8001(&$sandbox) {
}
}
- // Give the user the name of the prefix/suffix fields that where adjusted.
+ // Give the user the name of the prefix/suffix fields that were adjusted.
if (!empty($adjusted_prefix) || !empty($adjusted_suffix)) {
$args = [
- '@prefixes' => implode(', ', $adjusted_prefix) ?: 'none',
- '@suffixes' => implode(', ', $adjusted_suffix) ?: 'none',
+ '@prefixes' => implode(', ', $adjusted_prefix) ?: \Drupal::translation()->translate('none'),
+ '@suffixes' => implode(', ', $adjusted_suffix) ?: \Drupal::translation()->translate('none'),
];
- $msg = 'Some of your prefix/suffix fields configured pipe symbols to format singular/plural form. This is no longer supported, so the fields were adjusted. See the change record https://www.drupal.org/node/2552871 for more information.';
- $msg .= '
Prefix fields adjusted: @prefixes';
- $msg .= '
Suffix fields adjusted: @suffixes';
- $message = \Drupal::translation()->translate($msg, $args);
- return $message;
+ return \Drupal::translation()->translate('Some of your prefix/suffix fields configured pipe symbols to format singular/plural form. This is no longer supported, so the fields were adjusted. See the change record https://www.drupal.org/node/2552871 for more information. Prefix fields adjusted: @prefixes. Suffix fields adjusted: @suffixes', $args);
}
}