diff --git a/core/modules/config_translation/src/FormElement/PluralVariants.php b/core/modules/config_translation/src/FormElement/PluralVariants.php
index e13e628..0735a59 100644
--- a/core/modules/config_translation/src/FormElement/PluralVariants.php
+++ b/core/modules/config_translation/src/FormElement/PluralVariants.php
@@ -38,9 +38,8 @@ protected function getSourceElement(LanguageInterface $source_language, $source_
for ($i = 0; $i < $plurals; $i++) {
$element[$i] = array(
'#type' => 'inline_template',
- '#template' => '
{{ value }}
',
+ '#template' => '{{ value }}
',
'#context' => array(
- 'id' => 'edit-source-config-format-plural-string-' . $i,
// @todo Should use better labels https://www.drupal.org/node/2499639
'label' => $i == 0 ? $this->t('Singular form') : $this->formatPlural($i, 'First plural form', '@count. plural form'),
'langcode' => $source_language->getId(),
diff --git a/core/modules/config_translation/src/Tests/ConfigTranslationUiTest.php b/core/modules/config_translation/src/Tests/ConfigTranslationUiTest.php
index 5914820..9116c01 100644
--- a/core/modules/config_translation/src/Tests/ConfigTranslationUiTest.php
+++ b/core/modules/config_translation/src/Tests/ConfigTranslationUiTest.php
@@ -640,9 +640,9 @@ public function testPluralConfigStringsSourceElements() {
// Languages to test, with various number of plural forms.
$languages = array(
- 'vi' => array('plurals' => 1, 'expected' => array(TRUE, FALSE, FALSE, FALSE)),
- 'fr' => array('plurals' => 2, 'expected' => array(TRUE, TRUE, FALSE, FALSE)),
- 'sl' => array('plurals' => 4, 'expected' => array(TRUE, TRUE, TRUE, TRUE)),
+ 'vi' => array('plurals' => 1),
+ 'fr' => array('plurals' => 2),
+ 'sl' => array('plurals' => 4),
);
foreach ($languages as $langcode => $data) {
@@ -664,14 +664,8 @@ public function testPluralConfigStringsSourceElements() {
$this->drupalGet($translation_url);
// Check if the expected number of source elements are present.
- foreach ($data['expected'] as $index => $expected) {
- if ($expected) {
- $this->assertRaw('edit-source-config-format-plural-string-' . $index);
- }
- else {
- $this->assertNoRaw('edit-source-config-format-plural-string-' . $index);
- }
- }
+ $source_elements = $this->xpath('//fieldset[@id="edit-source-config-names-viewsviewfiles-display-default-display-options-fields-count-format-plural-string"]/div[@class="fieldset-wrapper"]/div[@class="form-item"]');
+ $this->assertEqual($data['plurals'], count($source_elements));
}
}