Unverified Commit 0d206cf8 authored by Lauri Timmanee's avatar Lauri Timmanee
Browse files

Issue #3279703 by VIGHNESH SADAGOPAL, Binoli Lalani, Stockfoot, Maninders,... 

Issue #3279703 by VIGHNESH SADAGOPAL, Binoli Lalani, Stockfoot, Maninders, Ruturaj Chaubey, mherchel, Libbna, ckrina, longwave: Change "Welcome to <site name>" to "Welcome!" on the initial install screen

(cherry picked from commit 41761dc9)
(cherry picked from commit 7ecb8bd0)
parent b2a4aafb

core/modules/locale/tests/src/Functional/LocalePathTest.php

+1 −1
Changes for core/modules/locale/tests/src/Functional/LocalePathTest.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ public function testPathLanguageConfiguration() { 
    // Check that the "xx" front page is readily available because path prefix

    // negotiation is pre-configured.

    $this->drupalGet($prefix);

    $this->assertSession()->pageTextContains('Welcome to Drupal');

    $this->assertSession()->pageTextContains('Welcome!');



    // Create a node.

    $node = $this->drupalCreateNode(['type' => 'page']);

core/modules/node/config/optional/views.view.frontpage.yml

+1 −1
Changes for core/modules/node/config/optional/views.view.frontpage.yml: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ display: 
          plugin_id: title

          label: ''

          empty: true

          title: 'Welcome to [site:name]'

          title: 'Welcome!'

      sorts:

        sticky:

          id: sticky

core/modules/node/tests/src/Functional/Views/FrontPageTest.php

+2 −4
Changes for core/modules/node/tests/src/Functional/Views/FrontPageTest.php: 2 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 


namespace Drupal\Tests\node\Functional\Views;



use Drupal\Component\Render\FormattableMarkup;

use Drupal\Core\Cache\Cache;

use Drupal\Core\Language\LanguageInterface;

use Drupal\Core\Url;
@@ -78,7 +77,7 @@ public function testFrontPage() { 
    $this->executeView($view);

    $view->preview();



    $this->assertEquals(new FormattableMarkup('Welcome to @site_name', ['@site_name' => $site_name]), $view->getTitle(), 'The welcome title is used for the empty view.');

    $this->assertEquals('Welcome!', $view->getTitle(), 'The welcome title is used for the empty view.');

    $view->destroy();



    // Create some nodes on the frontpage view. Add more than 10 nodes in order
@@ -247,7 +246,6 @@ protected function doTestFrontPageViewCacheTags($do_assert_views_caches) { 
    ];



    $render_cache_tags = Cache::mergeTags($empty_node_listing_cache_tags, $cache_context_tags);

    $render_cache_tags = Cache::mergeTags($render_cache_tags, ['config:system.site']);

    $this->assertViewsCacheTags(

      $view,

      $empty_node_listing_cache_tags,
@@ -255,7 +253,7 @@ protected function doTestFrontPageViewCacheTags($do_assert_views_caches) { 
      $render_cache_tags

    );

    $expected_tags = Cache::mergeTags($empty_node_listing_cache_tags, $cache_context_tags);

    $expected_tags = Cache::mergeTags($expected_tags, ['http_response', 'rendered', 'config:user.role.anonymous', 'config:system.site']);

    $expected_tags = Cache::mergeTags($expected_tags, ['http_response', 'rendered', 'config:user.role.anonymous']);

    $this->assertPageCacheContextsAndTags(

      Url::fromRoute('view.frontpage.page_1'),

      $cache_contexts,

core/tests/Drupal/FunctionalTests/Installer/StandardInstallerTest.php

+1 −1
Changes for core/tests/Drupal/FunctionalTests/Installer/StandardInstallerTest.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ class StandardInstallerTest extends ConfigAfterInstallerTestBase { 
   */

  public function testInstaller() {

    // Verify that Olivero's default frontpage appears.

    $this->assertSession()->pageTextContains('Congratulations and welcome to the Drupal community!');

    $this->assertSession()->pageTextContains('Congratulations and welcome to the Drupal community.');

    $this->assertSession()->elementTextContains('css', '#block-olivero-powered', 'Powered by Drupal');

  }

core/themes/olivero/templates/includes/get-started.html.twig

+1 −1
Changes for core/themes/olivero/templates/includes/get-started.html.twig: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 


<div class="text-content">

  <p>{% trans %}<em>You haven’t created any frontpage content yet.</em>{% endtrans %}</p>

  <h2>{% trans %}Congratulations and welcome to the Drupal community!{% endtrans %}</h2>

  <h2>{% trans %}Congratulations and welcome to the Drupal community.{% endtrans %}</h2>

  <p>{% trans %}Drupal is an open source platform for building amazing digital experiences. It’s made, used, taught, documented, and marketed by the <a href="{{ drupal_community }}">Drupal community</a>. Our community is made up of people from around the world with a shared set of <a href="{{ drupal_values }}">values</a>, collaborating together in a respectful manner. As we like to say:{% endtrans %}</p>

  <blockquote>{% trans %}Come for the code, stay for the community.{% endtrans %}</blockquote>

  <h2>{% trans %}Get Started{% endtrans %}</h2>