' . format_plural(count($blocks), '%label is used by 1 custom block on your site. You can not remove this block type until you have removed all of the %label blocks.', '%label is used by @count custom blocks on your site. You may not remove %label until you have removed all of the %label custom blocks.', array('%label' => $this->entity->label())) . '
'; + $caption = '' . \Drupal::translation()->formatPlural(count($blocks), '%label is used by 1 custom block on your site. You can not remove this block type until you have removed all of the %label blocks.', '%label is used by @count custom blocks on your site. You may not remove %label until you have removed all of the %label custom blocks.', array('%label' => $this->entity->label())) . '
'; $form['description'] = array('#markup' => $caption); return $form; } diff --git a/core/modules/block_content/src/Tests/BlockContentCreationTest.php b/core/modules/block_content/src/Tests/BlockContentCreationTest.php index 7956d1d..c10a2ac 100644 --- a/core/modules/block_content/src/Tests/BlockContentCreationTest.php +++ b/core/modules/block_content/src/Tests/BlockContentCreationTest.php @@ -183,7 +183,7 @@ public function testBlockDelete() { // Delete the block. $this->drupalGet('block/1/delete'); - $this->assertText(format_plural(1, 'This will also remove 1 placed block instance.', 'This will also remove @count placed block instance.')); + $this->assertText(\Drupal::translation()->formatPlural(1, 'This will also remove 1 placed block instance.', 'This will also remove @count placed block instance.')); $this->drupalPostForm(NULL, array(), 'Delete'); $this->assertRaw(t('Custom block %name has been deleted.', array('%name' => $edit['info[0][value]']))); diff --git a/core/modules/comment/comment.module b/core/modules/comment/comment.module index 08cfb36..ac0a49c 100644 --- a/core/modules/comment/comment.module +++ b/core/modules/comment/comment.module @@ -533,7 +533,7 @@ function comment_node_search_result(EntityInterface $node) { // Do not make a string if there are no comment fields, or no comments exist // or all comment fields are hidden. if ($comments > 0 || $open) { - return array('comment' => format_plural($comments, '1 comment', '@count comments')); + return array('comment' => \Drupal::translation()->formatPlural($comments, '1 comment', '@count comments')); } } diff --git a/core/modules/comment/config/install/views.view.comments_recent.yml b/core/modules/comment/config/install/views.view.comments_recent.yml index 7a4b559..98b0ce1 100644 --- a/core/modules/comment/config/install/views.view.comments_recent.yml +++ b/core/modules/comment/config/install/views.view.comments_recent.yml @@ -45,7 +45,6 @@ display: row_class: '' default_row_class: true type: ul - wrapper_class: item-list class: '' provider: views row: diff --git a/core/modules/comment/src/Form/ConfirmDeleteMultiple.php b/core/modules/comment/src/Form/ConfirmDeleteMultiple.php index f6c8a6e..adbb4ad 100644 --- a/core/modules/comment/src/Form/ConfirmDeleteMultiple.php +++ b/core/modules/comment/src/Form/ConfirmDeleteMultiple.php @@ -122,7 +122,7 @@ public function submitForm(array &$form, FormStateInterface $form_state) { $this->commentStorage->delete($this->comments); $count = count($form_state->getValue('comments')); $this->logger('content')->notice('Deleted @count comments.', array('@count' => $count)); - drupal_set_message(format_plural($count, 'Deleted 1 comment.', 'Deleted @count comments.')); + drupal_set_message(\Drupal::translation()->formatPlural($count, 'Deleted 1 comment.', 'Deleted @count comments.')); } $form_state->setRedirectUrl($this->getCancelUrl()); } diff --git a/core/modules/comment/src/Tests/CommentNonNodeTest.php b/core/modules/comment/src/Tests/CommentNonNodeTest.php index 15eb7b7..59e5598 100644 --- a/core/modules/comment/src/Tests/CommentNonNodeTest.php +++ b/core/modules/comment/src/Tests/CommentNonNodeTest.php @@ -205,7 +205,7 @@ function performCommentOperation($comment, $operation, $approval = FALSE) { if ($operation == 'delete') { $this->drupalPostForm(NULL, array(), t('Delete comments')); - $this->assertRaw(format_plural(1, 'Deleted 1 comment.', 'Deleted @count comments.'), format_string('Operation "@operation" was performed on comment.', array('@operation' => $operation))); + $this->assertRaw(\Drupal::translation()->formatPlural(1, 'Deleted 1 comment.', 'Deleted @count comments.'), format_string('Operation "@operation" was performed on comment.', array('@operation' => $operation))); } else { $this->assertText(t('The update has been performed.'), format_string('Operation "@operation" was performed on comment.', array('@operation' => $operation))); diff --git a/core/modules/comment/src/Tests/CommentTestBase.php b/core/modules/comment/src/Tests/CommentTestBase.php index d86e3d4..26e1720 100644 --- a/core/modules/comment/src/Tests/CommentTestBase.php +++ b/core/modules/comment/src/Tests/CommentTestBase.php @@ -345,7 +345,7 @@ function performCommentOperation(CommentInterface $comment, $operation, $approva if ($operation == 'delete') { $this->drupalPostForm(NULL, array(), t('Delete comments')); - $this->assertRaw(format_plural(1, 'Deleted 1 comment.', 'Deleted @count comments.'), format_string('Operation "@operation" was performed on comment.', array('@operation' => $operation))); + $this->assertRaw(\Drupal::translation()->formatPlural(1, 'Deleted 1 comment.', 'Deleted @count comments.'), format_string('Operation "@operation" was performed on comment.', array('@operation' => $operation))); } else { $this->assertText(t('The update has been performed.'), format_string('Operation "@operation" was performed on comment.', array('@operation' => $operation))); diff --git a/core/modules/config/src/Form/ConfigSync.php b/core/modules/config/src/Form/ConfigSync.php index f73de96..f9aba22 100644 --- a/core/modules/config/src/Form/ConfigSync.php +++ b/core/modules/config/src/Form/ConfigSync.php @@ -238,19 +238,19 @@ public function buildForm(array $form, FormStateInterface $form_state) { ); switch ($config_change_type) { case 'create': - $form[$collection][$config_change_type]['heading']['#value'] = format_plural(count($config_names), '@count new', '@count new'); + $form[$collection][$config_change_type]['heading']['#value'] = \Drupal::translation()->formatPlural(count($config_names), '@count new', '@count new'); break; case 'update': - $form[$collection][$config_change_type]['heading']['#value'] = format_plural(count($config_names), '@count changed', '@count changed'); + $form[$collection][$config_change_type]['heading']['#value'] = \Drupal::translation()->formatPlural(count($config_names), '@count changed', '@count changed'); break; case 'delete': - $form[$collection][$config_change_type]['heading']['#value'] = format_plural(count($config_names), '@count removed', '@count removed'); + $form[$collection][$config_change_type]['heading']['#value'] = \Drupal::translation()->formatPlural(count($config_names), '@count removed', '@count removed'); break; case 'rename': - $form[$collection][$config_change_type]['heading']['#value'] = format_plural(count($config_names), '@count renamed', '@count renamed'); + $form[$collection][$config_change_type]['heading']['#value'] = \Drupal::translation()->formatPlural(count($config_names), '@count renamed', '@count renamed'); break; } $form[$collection][$config_change_type]['list'] = array( diff --git a/core/modules/file/file.field.inc b/core/modules/file/file.field.inc index 3e88433..57c402e 100644 --- a/core/modules/file/file.field.inc +++ b/core/modules/file/file.field.inc @@ -175,7 +175,7 @@ function template_preprocess_file_upload_help(&$variables) { $descriptions[] = t('Unlimited number of files can be uploaded to this field.'); } else { - $descriptions[] = format_plural($cardinality, 'One file only.', 'Maximum @count files.'); + $descriptions[] = \Drupal::translation()->formatPlural($cardinality, 'One file only.', 'Maximum @count files.'); } } if (isset($upload_validators['file_validate_size'])) { diff --git a/core/modules/file/src/Tests/FileManagedTestBase.php b/core/modules/file/src/Tests/FileManagedTestBase.php index 3147f73..031a1a7 100644 --- a/core/modules/file/src/Tests/FileManagedTestBase.php +++ b/core/modules/file/src/Tests/FileManagedTestBase.php @@ -80,7 +80,7 @@ function assertFileHookCalled($hook, $expected_count = 1, $message = NULL) { $message = format_string('hook_file_@name was called correctly.', array('@name' => $hook)); } elseif ($expected_count == 0) { - $message = format_plural($actual_count, 'hook_file_@name was not expected to be called but was actually called once.', 'hook_file_@name was not expected to be called but was actually called @count times.', array('@name' => $hook, '@count' => $actual_count)); + $message = \Drupal::translation()->formatPlural($actual_count, 'hook_file_@name was not expected to be called but was actually called once.', 'hook_file_@name was not expected to be called but was actually called @count times.', array('@name' => $hook, '@count' => $actual_count)); } else { $message = format_string('hook_file_@name was expected to be called %expected times but was called %actual times.', array('@name' => $hook, '%expected' => $expected_count, '%actual' => $actual_count)); diff --git a/core/modules/file/src/Tests/FileManagedUnitTestBase.php b/core/modules/file/src/Tests/FileManagedUnitTestBase.php index 051601a..c770202 100644 --- a/core/modules/file/src/Tests/FileManagedUnitTestBase.php +++ b/core/modules/file/src/Tests/FileManagedUnitTestBase.php @@ -92,7 +92,7 @@ function assertFileHookCalled($hook, $expected_count = 1, $message = NULL) { $message = format_string('hook_file_@name was called correctly.', array('@name' => $hook)); } elseif ($expected_count == 0) { - $message = format_plural($actual_count, 'hook_file_@name was not expected to be called but was actually called once.', 'hook_file_@name was not expected to be called but was actually called @count times.', array('@name' => $hook, '@count' => $actual_count)); + $message = \Drupal::translation()->formatPlural($actual_count, 'hook_file_@name was not expected to be called but was actually called once.', 'hook_file_@name was not expected to be called but was actually called @count times.', array('@name' => $hook, '@count' => $actual_count)); } else { $message = format_string('hook_file_@name was expected to be called %expected times but was called %actual times.', array('@name' => $hook, '%expected' => $expected_count, '%actual' => $actual_count)); diff --git a/core/modules/forum/forum.module b/core/modules/forum/forum.module index 1b15b3e..3760168 100644 --- a/core/modules/forum/forum.module +++ b/core/modules/forum/forum.module @@ -563,7 +563,7 @@ function template_preprocess_forums(&$variables) { $page_number = \Drupal::entityManager()->getStorage('comment') ->getNewCommentPageNumber($topic->comment_count, $topic->new_replies, $topic, 'comment_forum'); $query = $page_number ? array('page' => $page_number) : NULL; - $variables['topics'][$id]->new_text = format_plural($topic->new_replies, '1 new post in topic %title', '@count new posts in topic %title', array('%title' => $variables['topics'][$id]->label())); + $variables['topics'][$id]->new_text = \Drupal::translation()->formatPlural($topic->new_replies, '1 new post in topic %title', '@count new posts in topic %title', array('%title' => $variables['topics'][$id]->label())); $variables['topics'][$id]->new_url = \Drupal::url('entity.node.canonical', ['node' => $topic->id()], ['query' => $query, 'fragment' => 'new']); } @@ -645,7 +645,7 @@ function template_preprocess_forum_list(&$variables) { if ($user->isAuthenticated()) { $variables['forums'][$id]->new_topics = \Drupal::service('forum_manager')->unreadTopics($forum->id(), $user->id()); if ($variables['forums'][$id]->new_topics) { - $variables['forums'][$id]->new_text = format_plural($variables['forums'][$id]->new_topics, '1 new post in forum %title', '@count new posts in forum %title', array('%title' => $variables['forums'][$id]->label())); + $variables['forums'][$id]->new_text = \Drupal::translation()->formatPlural($variables['forums'][$id]->new_topics, '1 new post in forum %title', '@count new posts in forum %title', array('%title' => $variables['forums'][$id]->label())); $variables['forums'][$id]->new_url = \Drupal::url('forum.page', ['taxonomy_term' => $forum->id()], ['fragment' => 'new']); $variables['forums'][$id]->icon_class = 'new'; $variables['forums'][$id]->icon_title = t('New posts'); diff --git a/core/modules/forum/src/Tests/ForumTest.php b/core/modules/forum/src/Tests/ForumTest.php index ebda138..c33d7a7 100644 --- a/core/modules/forum/src/Tests/ForumTest.php +++ b/core/modules/forum/src/Tests/ForumTest.php @@ -163,7 +163,7 @@ function testForum() { // Verify the number of unread topics. $unread_topics = $this->container->get('forum_manager')->unreadTopics($this->forum['tid'], $this->edit_any_topics_user->id()); - $unread_topics = format_plural($unread_topics, '1 new post', '@count new posts'); + $unread_topics = \Drupal::translation()->formatPlural($unread_topics, '1 new post', '@count new posts'); $xpath = $this->buildXPathQuery('//tr[@id=:forum]//td[@class="topics"]//a', $forum_arg); $this->assertFieldByXPath($xpath, $unread_topics, 'Number of unread topics found.'); // Verify that the forum name is in the unread topics text. diff --git a/core/modules/locale/locale.batch.inc b/core/modules/locale/locale.batch.inc index 67ce5d8..eb57555 100644 --- a/core/modules/locale/locale.batch.inc +++ b/core/modules/locale/locale.batch.inc @@ -94,15 +94,15 @@ function locale_translation_batch_status_finished($success, $results) { if ($success) { if (isset($results['failed_files'])) { if (\Drupal::moduleHandler()->moduleExists('dblog') && \Drupal::currentUser()->hasPermission('access site reports')) { - $message = format_plural(count($results['failed_files']), 'One translation file could not be checked. See the log for details.', '@count translation files could not be checked. See the log for details.', array('@url' => \Drupal::url('dblog.overview'))); + $message = \Drupal::translation()->formatPlural(count($results['failed_files']), 'One translation file could not be checked. See the log for details.', '@count translation files could not be checked. See the log for details.', array('@url' => \Drupal::url('dblog.overview'))); } else { - $message = format_plural(count($results['failed_files']), 'One translation files could not be checked. See the log for details.', '@count translation files could not be checked. See the log for details.'); + $message = \Drupal::translation()->formatPlural(count($results['failed_files']), 'One translation files could not be checked. See the log for details.', '@count translation files could not be checked. See the log for details.'); } drupal_set_message($message, 'error'); } if (isset($results['files'])) { - drupal_set_message(format_plural( + drupal_set_message(\Drupal::translation()->formatPlural( count($results['files']), 'Checked available interface translation updates for one project.', 'Checked available interface translation updates for @count projects.' diff --git a/core/modules/locale/locale.bulk.inc b/core/modules/locale/locale.bulk.inc index 83cd425..7a3ed12 100644 --- a/core/modules/locale/locale.bulk.inc +++ b/core/modules/locale/locale.bulk.inc @@ -350,10 +350,10 @@ function locale_translate_batch_finished($success, $results) { $additions = $updates = $deletes = $skips = $config = 0; if (isset($results['failed_files'])) { if (\Drupal::moduleHandler()->moduleExists('dblog') && \Drupal::currentUser()->hasPermission('access site reports')) { - $message = format_plural(count($results['failed_files']), 'One translation file could not be imported. See the log for details.', '@count translation files could not be imported. See the log for details.', array('@url' => \Drupal::url('dblog.overview'))); + $message = \Drupal::translation()->formatPlural(count($results['failed_files']), 'One translation file could not be imported. See the log for details.', '@count translation files could not be imported. See the log for details.', array('@url' => \Drupal::url('dblog.overview'))); } else { - $message = format_plural(count($results['failed_files']), 'One translation file could not be imported. See the log for details.', '@count translation files could not be imported. See the log for details.'); + $message = \Drupal::translation()->formatPlural(count($results['failed_files']), 'One translation file could not be imported. See the log for details.', '@count translation files could not be imported. See the log for details.'); } drupal_set_message($message, 'error'); } @@ -372,7 +372,7 @@ function locale_translate_batch_finished($success, $results) { } } } - drupal_set_message(format_plural(count($results['files']), + drupal_set_message(\Drupal::translation()->formatPlural(count($results['files']), 'One translation file imported. %number translations were added, %update translations were updated and %delete translations were removed.', '@count translation files imported. %number translations were added, %update translations were updated and %delete translations were removed.', array('%number' => $additions, '%update' => $updates, '%delete' => $deletes) @@ -381,10 +381,10 @@ function locale_translate_batch_finished($success, $results) { if ($skips) { if (\Drupal::moduleHandler()->moduleExists('dblog') && \Drupal::currentUser()->hasPermission('access site reports')) { - $message = format_plural($skips, 'One translation string was skipped because of disallowed or malformed HTML. See the log for details.', '@count translation strings were skipped because of disallowed or malformed HTML. See the log for details.', array('@url' => \Drupal::url('dblog.overview'))); + $message = \Drupal::translation()->formatPlural($skips, 'One translation string was skipped because of disallowed or malformed HTML. See the log for details.', '@count translation strings were skipped because of disallowed or malformed HTML. See the log for details.', array('@url' => \Drupal::url('dblog.overview'))); } else { - $message = format_plural($skips, 'One translation string was skipped because of disallowed or malformed HTML. See the log for details.', '@count translation strings were skipped because of disallowed or malformed HTML. See the log for details.'); + $message = \Drupal::translation()->formatPlural($skips, 'One translation string was skipped because of disallowed or malformed HTML. See the log for details.', '@count translation strings were skipped because of disallowed or malformed HTML. See the log for details.'); } drupal_set_message($message, 'warning'); $logger->warning('@count disallowed HTML string(s) in files: @files.', array('@count' => $skips, '@files' => implode(',', $skipped_files))); diff --git a/core/modules/locale/locale.pages.inc b/core/modules/locale/locale.pages.inc index 3ff2a15..1934956 100644 --- a/core/modules/locale/locale.pages.inc +++ b/core/modules/locale/locale.pages.inc @@ -118,7 +118,7 @@ function template_preprocess_locale_translation_update_info(&$variables) { // Build output for updates not found. if (isset($variables['not_found'])) { $releases = array(); - $variables['missing_updates_status'] = format_plural(count($variables['not_found']), 'Missing translations for one project', 'Missing translations for @count projects'); + $variables['missing_updates_status'] = \Drupal::translation()->formatPlural(count($variables['not_found']), 'Missing translations for one project', 'Missing translations for @count projects'); if ($variables['not_found']) { foreach ($variables['not_found'] as $update) { $version = $update['version'] ? $update['version'] : t('no version'); diff --git a/core/modules/locale/src/Form/TranslateEditForm.php b/core/modules/locale/src/Form/TranslateEditForm.php index 131612f..b3d04bf 100644 --- a/core/modules/locale/src/Form/TranslateEditForm.php +++ b/core/modules/locale/src/Form/TranslateEditForm.php @@ -117,7 +117,7 @@ public function buildForm(array $form, FormStateInterface $form_state) { for ($i = 0; $i < $plural_formulas[$langcode]['plurals']; $i++) { $form['strings'][$string->lid]['translations'][$i] = array( '#type' => 'textarea', - '#title' => ($i == 0 ? $this->t('Singular form') : format_plural($i, 'First plural form', '@count. plural form')), + '#title' => ($i == 0 ? $this->t('Singular form') : \Drupal::translation()->formatPlural($i, 'First plural form', '@count. plural form')), '#rows' => $rows, '#default_value' => isset($translation_array[$i]) ? $translation_array[$i] : '', '#attributes' => array('lang' => $langcode), diff --git a/core/modules/locale/src/Tests/LocalePluralFormatTest.php b/core/modules/locale/src/Tests/LocalePluralFormatTest.php index 7d9f1dc..f11e9a8 100644 --- a/core/modules/locale/src/Tests/LocalePluralFormatTest.php +++ b/core/modules/locale/src/Tests/LocalePluralFormatTest.php @@ -34,7 +34,7 @@ protected function setUp() { } /** - * Tests locale_get_plural() and format_plural() functionality. + * Tests locale_get_plural() and \Drupal::translation()->formatPlural() functionality. */ public function testGetPluralFormat() { // Import some .po files with formulas to set up the environment. @@ -129,7 +129,7 @@ public function testGetPluralFormat() { // expected index as per the logic for translation lookups. $expected_plural_index = ($count == 1) ? 0 : $expected_plural_index; $expected_plural_string = str_replace('@count', $count, $plural_strings[$langcode][$expected_plural_index]); - $this->assertIdentical(format_plural($count, '1 hour', '@count hours', array(), array('langcode' => $langcode)), $expected_plural_string, 'Plural translation of 1 hours / @count hours for count ' . $count . ' in ' . $langcode . ' is ' . $expected_plural_string); + $this->assertIdentical(\Drupal::translation()->formatPlural($count, '1 hour', '@count hours', array(), array('langcode' => $langcode)), $expected_plural_string, 'Plural translation of 1 hours / @count hours for count ' . $count . ' in ' . $langcode . ' is ' . $expected_plural_string); } } } @@ -217,7 +217,7 @@ public function testPluralEditExport() { // langcode here because the language will be English by default and will // not save our source string for performance optimization if we do not ask // specifically for a language. - format_plural(1, '1 day', '@count days', array(), array('langcode' => 'fr')); + \Drupal::translation()->formatPlural(1, '1 day', '@count days', array(), array('langcode' => 'fr')); $lid = db_query("SELECT lid FROM {locales_source} WHERE source = :source AND context = ''", array(':source' => "1 day" . LOCALE_PLURAL_DELIMITER . "@count days"))->fetchField(); // Look up editing page for this plural string and check fields. $search = array( diff --git a/core/modules/menu_ui/src/Form/MenuDeleteForm.php b/core/modules/menu_ui/src/Form/MenuDeleteForm.php index 2d72b84..b177362 100644 --- a/core/modules/menu_ui/src/Form/MenuDeleteForm.php +++ b/core/modules/menu_ui/src/Form/MenuDeleteForm.php @@ -76,7 +76,7 @@ public function getDescription() { $caption = ''; $num_links = $this->menuLinkManager->countMenuLinks($this->entity->id()); if ($num_links) { - $caption .= '' . format_plural($num_links, 'Warning: There is currently 1 menu link in %title. It will be deleted (system-defined items will be reset).', 'Warning: There are currently @count menu links in %title. They will be deleted (system-defined links will be reset).', array('%title' => $this->entity->label())) . '
'; + $caption .= '' . \Drupal::translation()->formatPlural($num_links, 'Warning: There is currently 1 menu link in %title. It will be deleted (system-defined items will be reset).', 'Warning: There are currently @count menu links in %title. They will be deleted (system-defined links will be reset).', array('%title' => $this->entity->label())) . '
'; } $caption .= '' . t('This action cannot be undone.') . '
'; return $caption; diff --git a/core/modules/node/node.admin.inc b/core/modules/node/node.admin.inc index 9278f97..a11f903 100644 --- a/core/modules/node/node.admin.inc +++ b/core/modules/node/node.admin.inc @@ -158,7 +158,7 @@ function _node_mass_update_batch_finished($success, $results, $operations) { } else { drupal_set_message(t('An error occurred and processing did not complete.'), 'error'); - $message = format_plural(count($results), '1 item successfully processed:', '@count items successfully processed:'); + $message = \Drupal::translation()->formatPlural(count($results), '1 item successfully processed:', '@count items successfully processed:'); $item_list = array( '#theme' => 'item_list', '#items' => $results, diff --git a/core/modules/node/node.api.php b/core/modules/node/node.api.php index d42f748..2aaac50 100644 --- a/core/modules/node/node.api.php +++ b/core/modules/node/node.api.php @@ -376,7 +376,7 @@ function hook_node_access(\Drupal\node\NodeInterface $node, $op, \Drupal\Core\Se */ function hook_node_search_result(\Drupal\node\NodeInterface $node, $langcode) { $rating = db_query('SELECT SUM(points) FROM {my_rating} WHERE nid = :nid', array('nid' => $node->id()))->fetchField(); - return array('rating' => format_plural($rating, '1 point', '@count points')); + return array('rating' => \Drupal::translation()->formatPlural($rating, '1 point', '@count points')); } /** diff --git a/core/modules/node/node.install b/core/modules/node/node.install index 36c7d75..04b571a 100644 --- a/core/modules/node/node.install +++ b/core/modules/node/node.install @@ -21,7 +21,7 @@ function node_requirements($phase) { // implement hook_node_grants(). $grant_count = \Drupal::entityManager()->getAccessControlHandler('node')->countGrants(); if ($grant_count != 1 || count(\Drupal::moduleHandler()->getImplementations('node_grants')) > 0) { - $value = format_plural($grant_count, 'One permission in use', '@count permissions in use', array('@count' => $grant_count)); + $value = \Drupal::translation()->formatPlural($grant_count, 'One permission in use', '@count permissions in use', array('@count' => $grant_count)); } else { $value = t('Disabled'); diff --git a/core/modules/node/node.module b/core/modules/node/node.module index 4e3bc46..f51d39d 100644 --- a/core/modules/node/node.module +++ b/core/modules/node/node.module @@ -204,7 +204,7 @@ function node_title_list(StatementInterface $result, $title = NULL) { foreach ($result as $row) { // Do not use $node->label() or $node->urlInfo() here, because we only have // database rows, not actual nodes. - $options = !empty($row->comment_count) ? array('attributes' => array('title' => format_plural($row->comment_count, '1 comment', '@count comments'))) : array(); + $options = !empty($row->comment_count) ? array('attributes' => array('title' => \Drupal::translation()->formatPlural($row->comment_count, '1 comment', '@count comments'))) : array(); $items[] = \Drupal::l($row->title, new Url('entity.node.canonical', ['node' => $row->nid], $options)); $num_rows = TRUE; } diff --git a/core/modules/node/src/Entity/NodeType.php b/core/modules/node/src/Entity/NodeType.php index 73e1202..e94a830 100644 --- a/core/modules/node/src/Entity/NodeType.php +++ b/core/modules/node/src/Entity/NodeType.php @@ -192,7 +192,7 @@ public function postSave(EntityStorageInterface $storage, $update = TRUE) { elseif ($this->getOriginalId() != $this->id()) { $update_count = node_type_update_nodes($this->getOriginalId(), $this->id()); if ($update_count) { - drupal_set_message(format_plural($update_count, + drupal_set_message(\Drupal::translation()->formatPlural($update_count, 'Changed the content type of 1 post from %old-type to %type.', 'Changed the content type of @count posts from %old-type to %type.', array( diff --git a/core/modules/node/src/Form/DeleteMultiple.php b/core/modules/node/src/Form/DeleteMultiple.php index 7b2aced..f546b0a 100644 --- a/core/modules/node/src/Form/DeleteMultiple.php +++ b/core/modules/node/src/Form/DeleteMultiple.php @@ -76,7 +76,7 @@ public function getFormId() { * {@inheritdoc} */ public function getQuestion() { - return format_plural(count($this->nodes), 'Are you sure you want to delete this item?', 'Are you sure you want to delete these items?'); + return \Drupal::translation()->formatPlural(count($this->nodes), 'Are you sure you want to delete this item?', 'Are you sure you want to delete these items?'); } /** @@ -122,7 +122,7 @@ public function submitForm(array &$form, FormStateInterface $form_state) { $this->tempStoreFactory->get('node_multiple_delete_confirm')->delete(\Drupal::currentUser()->id()); $count = count($this->nodes); $this->logger('content')->notice('Deleted @count posts.', array('@count' => $count)); - drupal_set_message(format_plural($count, 'Deleted 1 post.', 'Deleted @count posts.')); + drupal_set_message(\Drupal::translation()->formatPlural($count, 'Deleted 1 post.', 'Deleted @count posts.')); } $form_state->setRedirect('system.admin_content'); } diff --git a/core/modules/node/src/Form/NodeTypeDeleteConfirm.php b/core/modules/node/src/Form/NodeTypeDeleteConfirm.php index 0242301..d8ec6ac 100644 --- a/core/modules/node/src/Form/NodeTypeDeleteConfirm.php +++ b/core/modules/node/src/Form/NodeTypeDeleteConfirm.php @@ -74,7 +74,7 @@ public function buildForm(array $form, FormStateInterface $form_state) { ->count() ->execute(); if ($num_nodes) { - $caption = '' . format_plural($num_nodes, '%type is used by 1 piece of content on your site. You can not remove this content type until you have removed all of the %type content.', '%type is used by @count pieces of content on your site. You may not remove %type until you have removed all of the %type content.', array('%type' => $this->entity->label())) . '
'; + $caption = '' . \Drupal::translation()->formatPlural($num_nodes, '%type is used by 1 piece of content on your site. You can not remove this content type until you have removed all of the %type content.', '%type is used by @count pieces of content on your site. You may not remove %type until you have removed all of the %type content.', array('%type' => $this->entity->label())) . '
'; $form['#title'] = $this->getQuestion(); $form['description'] = array('#markup' => $caption); return $form; diff --git a/core/modules/search/src/Plugin/views/filter/Search.php b/core/modules/search/src/Plugin/views/filter/Search.php index a061fc1..ff9814d 100644 --- a/core/modules/search/src/Plugin/views/filter/Search.php +++ b/core/modules/search/src/Plugin/views/filter/Search.php @@ -108,7 +108,7 @@ public function validateExposed(&$form, FormStateInterface $form_state) { if (!$form_state->isValueEmpty($key)) { $this->queryParseSearchExpression($form_state->getValue($key)); if (count($this->searchQuery->words()) == 0) { - $form_state->setErrorByName($key, format_plural(\Drupal::config('search.settings')->get('index.minimum_word_size'), 'You must include at least one positive keyword with 1 character or more.', 'You must include at least one positive keyword with @count characters or more.')); + $form_state->setErrorByName($key, \Drupal::translation()->formatPlural(\Drupal::config('search.settings')->get('index.minimum_word_size'), 'You must include at least one positive keyword with 1 character or more.', 'You must include at least one positive keyword with @count characters or more.')); } } } diff --git a/core/modules/search/src/SearchPageListBuilder.php b/core/modules/search/src/SearchPageListBuilder.php index 5714f0a..fb904e6 100644 --- a/core/modules/search/src/SearchPageListBuilder.php +++ b/core/modules/search/src/SearchPageListBuilder.php @@ -169,7 +169,7 @@ public function buildForm(array $form, FormStateInterface $form_state) { } $this->moduleHandler->loadAllIncludes('admin.inc'); - $count = format_plural($remaining, 'There is 1 item left to index.', 'There are @count items left to index.'); + $count = \Drupal::translation()->formatPlural($remaining, 'There is 1 item left to index.', 'There are @count items left to index.'); $done = $total - $remaining; // Use floor() to calculate the percentage, so if it is not quite 100%, it // will show as 99%, to indicate "almost done". diff --git a/core/modules/search/src/Tests/SearchMultilingualEntityTest.php b/core/modules/search/src/Tests/SearchMultilingualEntityTest.php index 832200e..904de8d 100644 --- a/core/modules/search/src/Tests/SearchMultilingualEntityTest.php +++ b/core/modules/search/src/Tests/SearchMultilingualEntityTest.php @@ -235,7 +235,7 @@ protected function assertIndexCounts($remaining, $total, $message) { $this->assertEqual($status['total'], $total, 'Total items ' . $message . ' is ' . $total); // Check text in progress section of Search settings page. Note that this - // test avoids using format_plural(), so it tests for fragments of text. + // test avoids using \Drupal::translation()->formatPlural(), so it tests for fragments of text. $indexed = $total - $remaining; $percent = ($total > 0) ? floor(100 * $indexed / $total) : 100; $this->drupalGet('admin/config/search/pages'); diff --git a/core/modules/shortcut/src/Form/ShortcutSetDeleteForm.php b/core/modules/shortcut/src/Form/ShortcutSetDeleteForm.php index 4ab3448..0a0bf1a 100644 --- a/core/modules/shortcut/src/Form/ShortcutSetDeleteForm.php +++ b/core/modules/shortcut/src/Form/ShortcutSetDeleteForm.php @@ -80,7 +80,7 @@ public function buildForm(array $form, FormStateInterface $form_state) { $number = $this->storage->countAssignedUsers($this->entity); $info = ''; if ($number) { - $info .= '' . format_plural($number, + $info .= '
' . \Drupal::translation()->formatPlural($number, '1 user has chosen or been assigned to this shortcut set.', '@count users have chosen or been assigned to this shortcut set.') . '
'; } diff --git a/core/modules/simpletest/css/simpletest.module.css b/core/modules/simpletest/css/simpletest.module.css index 71f7eea..88c4564 100644 --- a/core/modules/simpletest/css/simpletest.module.css +++ b/core/modules/simpletest/css/simpletest.module.css @@ -35,7 +35,7 @@ table#simpletest-form-table tr.simpletest-group label { display: inline; } -div.message > div.item-list { +div.message > ul { font-weight: normal; } diff --git a/core/modules/simpletest/simpletest.module b/core/modules/simpletest/simpletest.module index d45bd36..d1b2c01 100644 --- a/core/modules/simpletest/simpletest.module +++ b/core/modules/simpletest/simpletest.module @@ -530,7 +530,7 @@ function simpletest_clean_environment() { simpletest_clean_temporary_directories(); if (\Drupal::config('simpletest.settings')->get('clear_results')) { $count = simpletest_clean_results_table(); - drupal_set_message(format_plural($count, 'Removed 1 test result.', 'Removed @count test results.')); + drupal_set_message(\Drupal::translation()->formatPlural($count, 'Removed 1 test result.', 'Removed @count test results.')); } else { drupal_set_message(t('Clear results is disabled and the test results table will not be cleared.'), 'warning'); @@ -558,7 +558,7 @@ function simpletest_clean_database() { } if ($count > 0) { - drupal_set_message(format_plural($count, 'Removed 1 leftover table.', 'Removed @count leftover tables.')); + drupal_set_message(\Drupal::translation()->formatPlural($count, 'Removed 1 leftover table.', 'Removed @count leftover tables.')); } else { drupal_set_message(t('No leftover tables to remove.')); @@ -582,7 +582,7 @@ function simpletest_clean_temporary_directories() { } if ($count > 0) { - drupal_set_message(format_plural($count, 'Removed 1 temporary directory.', 'Removed @count temporary directories.')); + drupal_set_message(\Drupal::translation()->formatPlural($count, 'Removed 1 temporary directory.', 'Removed @count temporary directories.')); } else { drupal_set_message(t('No temporary directories to remove.')); diff --git a/core/modules/statistics/statistics.module b/core/modules/statistics/statistics.module index 00ca78d..c338e46 100644 --- a/core/modules/statistics/statistics.module +++ b/core/modules/statistics/statistics.module @@ -55,7 +55,7 @@ function statistics_node_links_alter(array &$node_links, NodeInterface $entity, if (\Drupal::currentUser()->hasPermission('view post access counter')) { $statistics = statistics_get($entity->id()); if ($statistics) { - $links['statistics_counter']['title'] = format_plural($statistics['totalcount'], '1 view', '@count views'); + $links['statistics_counter']['title'] = \Drupal::translation()->formatPlural($statistics['totalcount'], '1 view', '@count views'); $node_links['statistics'] = array( '#theme' => 'links__node__statistics', '#links' => $links, diff --git a/core/modules/system/css/system.theme.css b/core/modules/system/css/system.theme.css index bf14339..0f1d8ae 100644 --- a/core/modules/system/css/system.theme.css +++ b/core/modules/system/css/system.theme.css @@ -21,24 +21,6 @@ td.active { } /** - * Markup generated by theme_item_list(). - */ -.item-list .title { - font-weight: bold; -} -.item-list ul { - margin: 0 0 0.75em 0; - padding: 0; -} -.item-list ul li { - margin: 0 0 0.25em 1.5em; /* LTR */ - padding: 0; -} -[dir="rtl"] .item-list ul li { - margin: 0 1.5em 0.25em 0; -} - -/** * Markup generated by Form API. */ .form-item, diff --git a/core/modules/system/src/Form/ModulesListConfirmForm.php b/core/modules/system/src/Form/ModulesListConfirmForm.php index df7dfef..0cf869e 100644 --- a/core/modules/system/src/Form/ModulesListConfirmForm.php +++ b/core/modules/system/src/Form/ModulesListConfirmForm.php @@ -114,7 +114,7 @@ public function buildForm(array $form, FormStateInterface $form_state) { // Display a list of required modules that have to be installed as well but // were not manually selected. foreach ($this->modules['dependencies'] as $module => $dependencies) { - $items[] = format_plural(count($dependencies), 'You must enable the @required module to install @module.', 'You must enable the @required modules to install @module.', array( + $items[] = \Drupal::translation()->formatPlural(count($dependencies), 'You must enable the @required module to install @module.', 'You must enable the @required modules to install @module.', array( '@module' => $this->modules['install'][$module], '@required' => implode(', ', $dependencies), )); diff --git a/core/modules/system/src/Tests/Theme/FunctionsTest.php b/core/modules/system/src/Tests/Theme/FunctionsTest.php index c8d068c..0e55865 100644 --- a/core/modules/system/src/Tests/Theme/FunctionsTest.php +++ b/core/modules/system/src/Tests/Theme/FunctionsTest.php @@ -44,21 +44,21 @@ function testItemList() { // Verify that empty items produce the empty string. $variables = array(); $variables['empty'] = 'No items found.'; - $expected = '