diff --git a/modules/field/field.form.inc b/modules/field/field.form.inc
index d9652e8..e7e193a 100644
--- a/modules/field/field.form.inc
+++ b/modules/field/field.form.inc
@@ -223,7 +223,7 @@ function field_multiple_value_form($field, $instance, $langcode, $items, &$form,
// For multiple fields, title and description are handled by the wrapping
// table.
if ($multiple) {
- $element['#title'] = $title . ' ' . t('(value @number)', array('@number' => $delta + 1));
+ $element['#title'] = t('!title (value @number)', array('@number' => $delta + 1, '!title' => $title));
$element['#title_display'] = 'invisible';
$element['#description'] = '';
}
diff --git a/modules/field/tests/field.test b/modules/field/tests/field.test
index 186fed7..ff3c21d 100644
--- a/modules/field/tests/field.test
+++ b/modules/field/tests/field.test
@@ -1823,15 +1823,12 @@ class FieldFormTestCase extends FieldTestCase {
// Display creation form -> 1 widget.
$this->drupalGet('test-entity/add/test-bundle');
-
- $required = '*';
- // Check that the Required symbol is present for the multifield label.
- $this->assertRaw(format_string('', array('@label' => $this->instance['label'], '!required' => $required)),
- 'Required symbol added field label.');
+ $result = $this->xpath("//label[not(contains(@class, 'element-invisible')) and contains(text(), :label)]/span/text()", array(':label' => $this->instance['label']));
+ $this->assertEqual($result[0], '*', t('Required symbol added to field label.'));
// Check that the label of the field input is visually hidden and contains
// the field title and an indication of the delta for a11y.
- $this->assertRaw(format_string('', array('@fieldname' => strtr($this->field_name, '_', '-'),'@label' => $this->instance['label'], '!required' => $required)),
- 'Required symbol not added for field input.');
+ $result = $this->xpath("//label[contains(@class, 'element-invisible') and contains(text(), :label)]/span/text()", array(':label' => $this->instance['label'] . ' (value 1)'));
+ $this->assertEqual($result[0], '*', t('Required symbol and field label are visually hidden'));
}
/**